From ac26611e05928c7edff3c2a4a66e06977d7165f1 Mon Sep 17 00:00:00 2001 From: Silke Meyer Date: Wed, 3 Feb 2016 20:39:50 +0100 Subject: [PATCH 001/352] Updated docs about Let's Encrypt --- doc/SSL.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/SSL.md b/doc/SSL.md index a72eec2a16..bcff929fe5 100644 --- a/doc/SSL.md +++ b/doc/SSL.md @@ -90,8 +90,8 @@ If you run your own server, upload the files and check out the Mozilla wiki link Let's encrypt --- -If you run your own server and you control your name server, the "Let's encrypt" initiative might become an interesting alternative. -Their offer is not ready, yet. +If you run your own server, the "Let's encrypt" initiative might become an interesting alternative. +Their offer is in public beta right now. Check out [their website](https://letsencrypt.org/) for status updates. Web server settings From 5559c02662e48daea1fdb78ae5797959ee379b4d Mon Sep 17 00:00:00 2001 From: Silke Meyer Date: Wed, 3 Feb 2016 21:49:07 +0100 Subject: [PATCH 002/352] Revert "Updated docs about Let's Encrypt" This reverts commit ac26611e05928c7edff3c2a4a66e06977d7165f1. --- doc/SSL.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/SSL.md b/doc/SSL.md index bcff929fe5..a72eec2a16 100644 --- a/doc/SSL.md +++ b/doc/SSL.md @@ -90,8 +90,8 @@ If you run your own server, upload the files and check out the Mozilla wiki link Let's encrypt --- -If you run your own server, the "Let's encrypt" initiative might become an interesting alternative. -Their offer is in public beta right now. +If you run your own server and you control your name server, the "Let's encrypt" initiative might become an interesting alternative. +Their offer is not ready, yet. Check out [their website](https://letsencrypt.org/) for status updates. Web server settings From 320751660d7f17cd80aa2c5360d25d167b331854 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Wed, 27 Jul 2016 19:53:22 +0200 Subject: [PATCH 003/352] frio: intro notifications + some restructuring in core for notifications --- mod/notifications.php | 958 ++++++++++---------- view/templates/intros.tpl | 2 +- view/templates/notifications.tpl | 15 +- view/theme/frio/css/style.css | 50 +- view/theme/frio/js/modal.js | 13 + view/theme/frio/templates/intros.tpl | 54 ++ view/theme/frio/templates/notifications.tpl | 25 + 7 files changed, 643 insertions(+), 474 deletions(-) create mode 100644 view/theme/frio/templates/intros.tpl create mode 100644 view/theme/frio/templates/notifications.tpl diff --git a/mod/notifications.php b/mod/notifications.php index e0f07118f7..ae27de864c 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -59,10 +59,6 @@ function notifications_post(&$a) { } } - - - - function notifications_content(&$a) { if(! local_user()) { @@ -76,6 +72,491 @@ function notifications_content(&$a) { $o = ''; + // get the nav tabs for the notification pages + $tabs = notifications_tabs($a); + $notif_content = array(); + + if( (($a->argc > 1) && ($a->argv[1] == 'intros')) || (($a->argc == 1))) { + nav_set_selected('introductions'); + if(($a->argc > 2) && ($a->argv[2] == 'all')) + $sql_extra = ''; + else + $sql_extra = " AND `ignore` = 0 "; + + $notif_tpl = get_markup_template('notifications.tpl'); + + $notif_ignored_lnk .= '' + . ((strlen($sql_extra)) ? t('Show Ignored Requests') : t('Hide Ignored Requests')) . '' . "\r\n"; + + $r = q("SELECT COUNT(*) AS `total` FROM `intro` + WHERE `intro`.`uid` = %d $sql_extra AND `intro`.`blocked` = 0 ", + intval($_SESSION['uid']) + ); + if($r && count($r)) { + $a->set_pager_total($r[0]['total']); + $a->set_pager_itemspage(20); + } + + /// @todo Fetch contact details by "get_contact_details_by_url" instead of queries to contact, fcontact and gcontact + + $r = q("SELECT `intro`.`id` AS `intro_id`, `intro`.*, `contact`.*, `fcontact`.`name` AS `fname`,`fcontact`.`url` AS `furl`,`fcontact`.`photo` AS `fphoto`,`fcontact`.`request` AS `frequest`, + `gcontact`.`location` AS `glocation`, `gcontact`.`about` AS `gabout`, + `gcontact`.`keywords` AS `gkeywords`, `gcontact`.`gender` AS `ggender`, + `gcontact`.`network` AS `gnetwork` + FROM `intro` + LEFT JOIN `contact` ON `contact`.`id` = `intro`.`contact-id` + LEFT JOIN `gcontact` ON `gcontact`.`nurl` = `contact`.`nurl` + LEFT JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id` + WHERE `intro`.`uid` = %d $sql_extra AND `intro`.`blocked` = 0 ", + intval($_SESSION['uid'])); + + if(($r !== false) && (count($r))) { + + $sugg = get_markup_template('suggestions.tpl'); + $tpl = get_markup_template("intros.tpl"); + + foreach($r as $rr) { + + if($rr['fid']) { + + $return_addr = bin2hex($a->user['nickname'] . '@' . $a->get_hostname() . (($a->path) ? '/' . $a->path : '')); + + $notif_content[] = replace_macros($sugg, array( + '$str_notifytype' => t('Notification type: '), + '$notify_type' => t('Friend Suggestion'), + '$intro_id' => $rr['intro_id'], + '$madeby' => sprintf( t('suggested by %s'),$rr['name']), + '$contact_id' => $rr['contact-id'], + '$photo' => ((x($rr,'fphoto')) ? proxy_url($rr['fphoto'], false, PROXY_SIZE_SMALL) : "images/person-175.jpg"), + '$fullname' => $rr['fname'], + '$url' => zrl($rr['furl']), + '$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''), + '$activity' => array('activity', t('Post a new friend activity'), (intval(get_pconfig(local_user(),'system','post_newfriend')) ? '1' : 0), t('if applicable')), + + '$knowyou' => $knowyou, + '$approve' => t('Approve'), + '$note' => $rr['note'], + '$request' => $rr['frequest'] . '?addr=' . $return_addr, + '$ignore' => t('Ignore'), + '$discard' => t('Discard'), + + )); + + continue; + + } + $friend_selected = (($rr['network'] !== NETWORK_OSTATUS) ? ' checked="checked" ' : ' disabled '); + $fan_selected = (($rr['network'] === NETWORK_OSTATUS) ? ' checked="checked" disabled ' : ''); + $dfrn_tpl = get_markup_template('netfriend.tpl'); + + $knowyou = ''; + $dfrn_text = ''; + + if($rr['network'] === NETWORK_DFRN || $rr['network'] === NETWORK_DIASPORA) { + if($rr['network'] === NETWORK_DFRN) { + $lbl_knowyou = t('Claims to be known to you: '); + $knowyou = (($rr['knowyou']) ? t('yes') : t('no')); + $helptext = t('Shall your connection be bidirectional or not? "Friend" implies that you allow to read and you subscribe to their posts. "Fan/Admirer" means that you allow to read but you do not want to read theirs. Approve as: '); + } else { + $knowyou = ''; + $helptext = t('Shall your connection be bidirectional or not? "Friend" implies that you allow to read and you subscribe to their posts. "Sharer" means that you allow to read but you do not want to read theirs. Approve as: '); + } + + $dfrn_text = replace_macros($dfrn_tpl,array( + '$intro_id' => $rr['intro_id'], + '$friend_selected' => $friend_selected, + '$fan_selected' => $fan_selected, + '$approve_as' => $helptext, + '$as_friend' => t('Friend'), + '$as_fan' => (($rr['network'] == NETWORK_DIASPORA) ? t('Sharer') : t('Fan/Admirer')) + )); + } + + $header = $rr["name"]; + + $ret = probe_url($rr["url"]); + + if ($rr['gnetwork'] == "") + $rr['gnetwork'] = $ret["network"]; + + if ($ret["addr"] != "") + $header .= " <".$ret["addr"].">"; + + $header .= " (".network_to_name($rr['gnetwork'], $rr['url']).")"; + + // Don't show these data until you are connected. Diaspora is doing the same. + if($rr['gnetwork'] === NETWORK_DIASPORA) { + $rr['glocation'] = ""; + $rr['gabout'] = ""; + $rr['ggender'] = ""; + } + + $notif_content[] = replace_macros($tpl, array( + '$header' => htmlentities($header), + '$str_notifytype' => t('Notification type: '), + '$notify_type' => (($rr['network'] !== NETWORK_OSTATUS) ? t('Friend/Connect Request') : t('New Follower')), + '$dfrn_text' => $dfrn_text, + '$dfrn_id' => $rr['issued-id'], + '$uid' => $_SESSION['uid'], + '$intro_id' => $rr['intro_id'], + '$contact_id' => $rr['contact-id'], + '$photo' => ((x($rr,'photo')) ? proxy_url($rr['photo'], false, PROXY_SIZE_SMALL) : "images/person-175.jpg"), + '$fullname' => $rr['name'], + '$location' => bbcode($rr['glocation'], false, false), + '$location_label' => t('Location:'), + '$about' => bbcode($rr['gabout'], false, false), + '$about_label' => t('About:'), + '$keywords' => $rr['gkeywords'], + '$keywords_label' => t('Tags:'), + '$gender' => $rr['ggender'], + '$gender_label' => t('Gender:'), + '$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''), + '$activity' => array('activity', t('Post a new friend activity'), (intval(get_pconfig(local_user(),'system','post_newfriend')) ? '1' : 0), t('if applicable')), + '$url' => $rr['url'], + '$zrl' => zrl($rr['url']), + '$url_label' => t('Profile URL'), + '$addr' => $rr['addr'], + '$lbl_knowyou' => $lbl_knowyou, + '$lbl_network' => t('Network:'), + '$network' => network_to_name($rr['gnetwork'], $rr['url']), + '$knowyou' => $knowyou, + '$approve' => t('Approve'), + '$note' => $rr['note'], + '$ignore' => t('Ignore'), + '$discard' => t('Discard'), + + )); + } + } + else + info( t('No introductions.') . EOL); + + $o .= replace_macros($notif_tpl, array( + '$notif_header' => t('Notifications'), + '$tabs' => $tabs, + '$notif_ignored_lnk' => $notif_ignored_lnk, + '$notif_content' => $notif_content, + )); + + $o .= paginate($a); + return $o; + + } else if (($a->argc > 1) && ($a->argv[1] == 'network')) { + + $notif_tpl = get_markup_template('notifications.tpl'); + + $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, + `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` as `object`, + `pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink`, `pitem`.`guid` as `pguid` + FROM `item` INNER JOIN `item` as `pitem` ON `pitem`.`id`=`item`.`parent` + WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND `pitem`.`parent` != 0 AND + `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0 ORDER BY `item`.`created` DESC" , + intval(local_user()) + ); + + $tpl_item_likes = get_markup_template('notifications_likes_item.tpl'); + $tpl_item_dislikes = get_markup_template('notifications_dislikes_item.tpl'); + $tpl_item_friends = get_markup_template('notifications_friends_item.tpl'); + $tpl_item_comments = get_markup_template('notifications_comments_item.tpl'); + $tpl_item_posts = get_markup_template('notifications_posts_item.tpl'); + + $notif_content = array(); + + if ($r) { + + foreach ($r as $it) { + switch($it['verb']){ + case ACTIVITY_LIKE: + $notif_content[] = replace_macros($tpl_item_likes,array( + //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], + '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], + '$item_image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), + '$item_text' => sprintf( t("%s liked %s's post"), $it['author-name'], $it['pname']), + '$item_when' => relative_date($it['created']) + )); + break; + + case ACTIVITY_DISLIKE: + $notif_content[] = replace_macros($tpl_item_dislikes,array( + //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], + '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], + '$item_image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), + '$item_text' => sprintf( t("%s disliked %s's post"), $it['author-name'], $it['pname']), + '$item_when' => relative_date($it['created']) + )); + break; + + case ACTIVITY_FRIEND: + + $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; + $obj = parse_xml_string($xmlhead.$it['object']); + $it['fname'] = $obj->title; + + $notif_content[] = replace_macros($tpl_item_friends,array( + //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], + '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], + '$item_image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), + '$item_text' => sprintf( t("%s is now friends with %s"), $it['author-name'], $it['fname']), + '$item_when' => relative_date($it['created']) + )); + break; + + default: + $item_text = (($it['id'] == $it['parent']) + ? sprintf( t("%s created a new post"), $it['author-name']) + : sprintf( t("%s commented on %s's post"), $it['author-name'], $it['pname'])); + $tpl = (($it['id'] == $it['parent']) ? $tpl_item_posts : $tpl_item_comments); + + $notif_content[] = replace_macros($tpl,array( + //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], + '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], + '$item_image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), + '$item_text' => $item_text, + '$item_when' => relative_date($it['created']) + )); + } + } + + } else { + + $notif_nocontent = t('No more network notifications.'); + } + + $o .= replace_macros($notif_tpl, array( + '$notif_header' => t('Network Notifications'), + '$tabs' => $tabs, + '$notif_content' => $notif_content, + '$notif_nocontent' => $notif_nocontent, + )); + + } else if (($a->argc > 1) && ($a->argv[1] == 'system')) { + + $notif_tpl = get_markup_template('notifications.tpl'); + + $not_tpl = get_markup_template('notify.tpl'); + require_once('include/bbcode.php'); + + $r = q("SELECT * from notify where uid = %d and seen = 0 order by date desc", + intval(local_user()) + ); + + if (count($r) > 0) { + foreach ($r as $it) { + $notif_content[] = replace_macros($not_tpl,array( + '$item_link' => $a->get_baseurl(true).'/notify/view/'. $it['id'], + '$item_image' => proxy_url($it['photo'], false, PROXY_SIZE_MICRO), + '$item_text' => strip_tags(bbcode($it['msg'])), + '$item_when' => relative_date($it['date']) + )); + } + } else { + $notif_nocontent = t('No more system notifications.'); + } + + $o .= replace_macros($notif_tpl, array( + '$notif_header' => t('System Notifications'), + '$tabs' => $tabs, + '$notif_content' => $notif_content, + '$notif_nocontent' => $notif_nocontent, + )); + + } else if (($a->argc > 1) && ($a->argv[1] == 'personal')) { + + $notif_tpl = get_markup_template('notifications.tpl'); + + $myurl = $a->get_baseurl(true) . '/profile/'. $a->user['nickname']; + $myurl = substr($myurl,strpos($myurl,'://')+3); + $myurl = str_replace(array('www.','.'),array('','\\.'),$myurl); + $diasp_url = str_replace('/profile/','/u/',$myurl); + $sql_extra .= sprintf(" AND ( `item`.`author-link` regexp '%s' or `item`.`tag` regexp '%s' or `item`.`tag` regexp '%s' ) ", + dbesc($myurl . '$'), + dbesc($myurl . '\\]'), + dbesc($diasp_url . '\\]') + ); + + + $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, + `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` as `object`, + `pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink`, `pitem`.`guid` as `pguid` + FROM `item` INNER JOIN `item` as `pitem` ON `pitem`.`id`=`item`.`parent` + WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 + $sql_extra + AND `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0 ORDER BY `item`.`created` DESC" , + intval(local_user()) + ); + + $tpl_item_likes = get_markup_template('notifications_likes_item.tpl'); + $tpl_item_dislikes = get_markup_template('notifications_dislikes_item.tpl'); + $tpl_item_friends = get_markup_template('notifications_friends_item.tpl'); + $tpl_item_comments = get_markup_template('notifications_comments_item.tpl'); + $tpl_item_posts = get_markup_template('notifications_posts_item.tpl'); + + $notif_content = array(); + + if (count($r) > 0) { + + foreach ($r as $it) { + switch($it['verb']){ + case ACTIVITY_LIKE: + $notif_content[] = replace_macros($tpl_item_likes,array( + //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], + '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], + '$item_image' => $it['author-avatar'], + '$item_text' => sprintf( t("%s liked %s's post"), $it['author-name'], $it['pname']), + '$item_when' => relative_date($it['created']) + )); + break; + + case ACTIVITY_DISLIKE: + $notif_content[] = replace_macros($tpl_item_dislikes,array( + //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], + '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], + '$item_image' => $it['author-avatar'], + '$item_text' => sprintf( t("%s disliked %s's post"), $it['author-name'], $it['pname']), + '$item_when' => relative_date($it['created']) + )); + break; + + case ACTIVITY_FRIEND: + + $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; + $obj = parse_xml_string($xmlhead.$it['object']); + $it['fname'] = $obj->title; + + $notif_content[] = replace_macros($tpl_item_friends,array( + //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], + '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], + '$item_image' => $it['author-avatar'], + '$item_text' => sprintf( t("%s is now friends with %s"), $it['author-name'], $it['fname']), + '$item_when' => relative_date($it['created']) + )); + break; + + default: + $item_text = (($it['id'] == $it['parent']) + ? sprintf( t("%s created a new post"), $it['author-name']) + : sprintf( t("%s commented on %s's post"), $it['author-name'], $it['pname'])); + $tpl = (($it['id'] == $it['parent']) ? $tpl_item_posts : $tpl_item_comments); + + $notif_content[] = replace_macros($tpl,array( + //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], + '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], + '$item_image' => $it['author-avatar'], + '$item_text' => $item_text, + '$item_when' => relative_date($it['created']) + )); + } + } + + } else { + + $notif_nocontent = t('No more personal notifications.'); + } + + $o .= replace_macros($notif_tpl, array( + '$notif_header' => t('Personal Notifications'), + '$tabs' => $tabs, + '$notif_content' => $notif_content, + '$notif_nocontent' => $notif_nocontent, + )); + + + + + + + } else if (($a->argc > 1) && ($a->argv[1] == 'home')) { + + $notif_tpl = get_markup_template('notifications.tpl'); + + $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, + `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` as `object`, + `pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink`, `pitem`.`guid` as `pguid` + FROM `item` INNER JOIN `item` as `pitem` ON `pitem`.`id`=`item`.`parent` + WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND + `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 1 ORDER BY `item`.`created` DESC", + intval(local_user()) + ); + + $tpl_item_likes = get_markup_template('notifications_likes_item.tpl'); + $tpl_item_dislikes = get_markup_template('notifications_dislikes_item.tpl'); + $tpl_item_friends = get_markup_template('notifications_friends_item.tpl'); + $tpl_item_comments = get_markup_template('notifications_comments_item.tpl'); + + $notif_content = array(); + + if (count($r) > 0) { + + foreach ($r as $it) { + switch($it['verb']){ + case ACTIVITY_LIKE: + $notif_content[] = replace_macros($tpl_item_likes,array( + //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], + '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], + '$item_image' => $it['author-avatar'], + '$item_text' => sprintf( t("%s liked %s's post"), $it['author-name'], $it['pname']), + '$item_when' => relative_date($it['created']) + )); + + break; + case ACTIVITY_DISLIKE: + $notif_content[] = replace_macros($tpl_item_dislikes,array( + //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], + '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], + '$item_image' => $it['author-avatar'], + '$item_text' => sprintf( t("%s disliked %s's post"), $it['author-name'], $it['pname']), + '$item_when' => relative_date($it['created']) + )); + + break; + case ACTIVITY_FRIEND: + + $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; + $obj = parse_xml_string($xmlhead.$it['object']); + $it['fname'] = $obj->title; + + $notif_content[] = replace_macros($tpl_item_friends,array( + //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], + '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], + '$item_image' => $it['author-avatar'], + '$item_text' => sprintf( t("%s is now friends with %s"), $it['author-name'], $it['fname']), + '$item_when' => relative_date($it['created']) + )); + + break; + default: + $notif_content[] = replace_macros($tpl_item_comments,array( + //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], + '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], + '$item_image' => $it['author-avatar'], + '$item_text' => sprintf( t("%s commented on %s's post"), $it['author-name'], $it['pname']), + '$item_when' => relative_date($it['created']) + )); + } + } + + } else { + $notif_nocontent = t('No more home notifications.'); + } + + $o .= replace_macros($notif_tpl, array( + '$notif_header' => t('Home Notifications'), + '$tabs' => $tabs, + '$notif_content' => $notif_content, + '$notif_nocontent' => $notif_nocontent, + )); + } + + $o .= paginate($a); + return $o; +} +/** + * @brief List of pages for the Notifications TabBar + * + * @param app $a The + * @return array with with notifications TabBar data + */ +function notifications_tabs($a) { $tabs = array( array( 'label' => t('System'), @@ -114,470 +595,5 @@ function notifications_content(&$a) { ),*/ /*while I can have notifications for messages, this tablist is not place for message page link */ ); - $o = ""; - - - if( (($a->argc > 1) && ($a->argv[1] == 'intros')) || (($a->argc == 1))) { - nav_set_selected('introductions'); - if(($a->argc > 2) && ($a->argv[2] == 'all')) - $sql_extra = ''; - else - $sql_extra = " AND `ignore` = 0 "; - - $notif_tpl = get_markup_template('notifications.tpl'); - - $notif_content .= '' - . ((strlen($sql_extra)) ? t('Show Ignored Requests') : t('Hide Ignored Requests')) . '' . "\r\n"; - - $r = q("SELECT COUNT(*) AS `total` FROM `intro` - WHERE `intro`.`uid` = %d $sql_extra AND `intro`.`blocked` = 0 ", - intval($_SESSION['uid']) - ); - if($r && count($r)) { - $a->set_pager_total($r[0]['total']); - $a->set_pager_itemspage(20); - } - - /// @todo Fetch contact details by "get_contact_details_by_url" instead of queries to contact, fcontact and gcontact - - $r = q("SELECT `intro`.`id` AS `intro_id`, `intro`.*, `contact`.*, `fcontact`.`name` AS `fname`,`fcontact`.`url` AS `furl`,`fcontact`.`photo` AS `fphoto`,`fcontact`.`request` AS `frequest`, - `gcontact`.`location` AS `glocation`, `gcontact`.`about` AS `gabout`, - `gcontact`.`keywords` AS `gkeywords`, `gcontact`.`gender` AS `ggender`, - `gcontact`.`network` AS `gnetwork` - FROM `intro` - LEFT JOIN `contact` ON `contact`.`id` = `intro`.`contact-id` - LEFT JOIN `gcontact` ON `gcontact`.`nurl` = `contact`.`nurl` - LEFT JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id` - WHERE `intro`.`uid` = %d $sql_extra AND `intro`.`blocked` = 0 ", - intval($_SESSION['uid'])); - - if(($r !== false) && (count($r))) { - - $sugg = get_markup_template('suggestions.tpl'); - $tpl = get_markup_template("intros.tpl"); - - foreach($r as $rr) { - - if($rr['fid']) { - - $return_addr = bin2hex($a->user['nickname'] . '@' . $a->get_hostname() . (($a->path) ? '/' . $a->path : '')); - - $notif_content .= replace_macros($sugg, array( - '$str_notifytype' => t('Notification type: '), - '$notify_type' => t('Friend Suggestion'), - '$intro_id' => $rr['intro_id'], - '$madeby' => sprintf( t('suggested by %s'),$rr['name']), - '$contact_id' => $rr['contact-id'], - '$photo' => ((x($rr,'fphoto')) ? proxy_url($rr['fphoto'], false, PROXY_SIZE_SMALL) : "images/person-175.jpg"), - '$fullname' => $rr['fname'], - '$url' => zrl($rr['furl']), - '$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''), - '$activity' => array('activity', t('Post a new friend activity'), (intval(get_pconfig(local_user(),'system','post_newfriend')) ? '1' : 0), t('if applicable')), - - '$knowyou' => $knowyou, - '$approve' => t('Approve'), - '$note' => $rr['note'], - '$request' => $rr['frequest'] . '?addr=' . $return_addr, - '$ignore' => t('Ignore'), - '$discard' => t('Discard'), - - )); - - continue; - - } - $friend_selected = (($rr['network'] !== NETWORK_OSTATUS) ? ' checked="checked" ' : ' disabled '); - $fan_selected = (($rr['network'] === NETWORK_OSTATUS) ? ' checked="checked" disabled ' : ''); - $dfrn_tpl = get_markup_template('netfriend.tpl'); - - $knowyou = ''; - $dfrn_text = ''; - - if($rr['network'] === NETWORK_DFRN || $rr['network'] === NETWORK_DIASPORA) { - if($rr['network'] === NETWORK_DFRN) { - $knowyou = t('Claims to be known to you: ') . (($rr['knowyou']) ? t('yes') : t('no')); - $helptext = t('Shall your connection be bidirectional or not? "Friend" implies that you allow to read and you subscribe to their posts. "Fan/Admirer" means that you allow to read but you do not want to read theirs. Approve as: '); - } else { - $knowyou = ''; - $helptext = t('Shall your connection be bidirectional or not? "Friend" implies that you allow to read and you subscribe to their posts. "Sharer" means that you allow to read but you do not want to read theirs. Approve as: '); - } - - $dfrn_text = replace_macros($dfrn_tpl,array( - '$intro_id' => $rr['intro_id'], - '$friend_selected' => $friend_selected, - '$fan_selected' => $fan_selected, - '$approve_as' => $helptext, - '$as_friend' => t('Friend'), - '$as_fan' => (($rr['network'] == NETWORK_DIASPORA) ? t('Sharer') : t('Fan/Admirer')) - )); - } - - $header = $rr["name"]; - - $ret = probe_url($rr["url"]); - - if ($rr['gnetwork'] == "") - $rr['gnetwork'] = $ret["network"]; - - if ($ret["addr"] != "") - $header .= " <".$ret["addr"].">"; - - $header .= " (".network_to_name($rr['gnetwork'], $rr['url']).")"; - - // Don't show these data until you are connected. Diaspora is doing the same. - if($rr['gnetwork'] === NETWORK_DIASPORA) { - $rr['glocation'] = ""; - $rr['gabout'] = ""; - $rr['ggender'] = ""; - } - - $notif_content .= replace_macros($tpl, array( - '$header' => htmlentities($header), - '$str_notifytype' => t('Notification type: '), - '$notify_type' => (($rr['network'] !== NETWORK_OSTATUS) ? t('Friend/Connect Request') : t('New Follower')), - '$dfrn_text' => $dfrn_text, - '$dfrn_id' => $rr['issued-id'], - '$uid' => $_SESSION['uid'], - '$intro_id' => $rr['intro_id'], - '$contact_id' => $rr['contact-id'], - '$photo' => ((x($rr,'photo')) ? proxy_url($rr['photo'], false, PROXY_SIZE_SMALL) : "images/person-175.jpg"), - '$fullname' => $rr['name'], - '$location' => bbcode($rr['glocation'], false, false), - '$location_label' => t('Location:'), - '$about' => bbcode($rr['gabout'], false, false), - '$about_label' => t('About:'), - '$keywords' => $rr['gkeywords'], - '$keywords_label' => t('Tags:'), - '$gender' => $rr['ggender'], - '$gender_label' => t('Gender:'), - '$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''), - '$activity' => array('activity', t('Post a new friend activity'), (intval(get_pconfig(local_user(),'system','post_newfriend')) ? '1' : 0), t('if applicable')), - '$url' => $rr['url'], - '$zrl' => zrl($rr['url']), - '$url_label' => t('Profile URL'), - '$knowyou' => $knowyou, - '$approve' => t('Approve'), - '$note' => $rr['note'], - '$ignore' => t('Ignore'), - '$discard' => t('Discard'), - - )); - } - } - else - info( t('No introductions.') . EOL); - - $o .= replace_macros($notif_tpl, array( - '$notif_header' => t('Notifications'), - '$tabs' => $tabs, - '$notif_content' => $notif_content, - )); - - $o .= paginate($a); - return $o; - - } else if (($a->argc > 1) && ($a->argv[1] == 'network')) { - - $notif_tpl = get_markup_template('notifications.tpl'); - - $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, - `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` as `object`, - `pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink`, `pitem`.`guid` as `pguid` - FROM `item` INNER JOIN `item` as `pitem` ON `pitem`.`id`=`item`.`parent` - WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND `pitem`.`parent` != 0 AND - `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0 ORDER BY `item`.`created` DESC" , - intval(local_user()) - ); - - $tpl_item_likes = get_markup_template('notifications_likes_item.tpl'); - $tpl_item_dislikes = get_markup_template('notifications_dislikes_item.tpl'); - $tpl_item_friends = get_markup_template('notifications_friends_item.tpl'); - $tpl_item_comments = get_markup_template('notifications_comments_item.tpl'); - $tpl_item_posts = get_markup_template('notifications_posts_item.tpl'); - - $notif_content = ''; - - if ($r) { - - foreach ($r as $it) { - switch($it['verb']){ - case ACTIVITY_LIKE: - $notif_content .= replace_macros($tpl_item_likes,array( - //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], - '$item_image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), - '$item_text' => sprintf( t("%s liked %s's post"), $it['author-name'], $it['pname']), - '$item_when' => relative_date($it['created']) - )); - break; - - case ACTIVITY_DISLIKE: - $notif_content .= replace_macros($tpl_item_dislikes,array( - //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], - '$item_image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), - '$item_text' => sprintf( t("%s disliked %s's post"), $it['author-name'], $it['pname']), - '$item_when' => relative_date($it['created']) - )); - break; - - case ACTIVITY_FRIEND: - - $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; - $obj = parse_xml_string($xmlhead.$it['object']); - $it['fname'] = $obj->title; - - $notif_content .= replace_macros($tpl_item_friends,array( - //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], - '$item_image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), - '$item_text' => sprintf( t("%s is now friends with %s"), $it['author-name'], $it['fname']), - '$item_when' => relative_date($it['created']) - )); - break; - - default: - $item_text = (($it['id'] == $it['parent']) - ? sprintf( t("%s created a new post"), $it['author-name']) - : sprintf( t("%s commented on %s's post"), $it['author-name'], $it['pname'])); - $tpl = (($it['id'] == $it['parent']) ? $tpl_item_posts : $tpl_item_comments); - - $notif_content .= replace_macros($tpl,array( - //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], - '$item_image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), - '$item_text' => $item_text, - '$item_when' => relative_date($it['created']) - )); - } - } - - } else { - - $notif_content = t('No more network notifications.'); - } - - $o .= replace_macros($notif_tpl, array( - '$notif_header' => t('Network Notifications'), - '$tabs' => $tabs, - '$notif_content' => $notif_content, - )); - - } else if (($a->argc > 1) && ($a->argv[1] == 'system')) { - - $notif_tpl = get_markup_template('notifications.tpl'); - - $not_tpl = get_markup_template('notify.tpl'); - require_once('include/bbcode.php'); - - $r = q("SELECT * from notify where uid = %d and seen = 0 order by date desc", - intval(local_user()) - ); - - if (count($r) > 0) { - foreach ($r as $it) { - $notif_content .= replace_macros($not_tpl,array( - '$item_link' => $a->get_baseurl(true).'/notify/view/'. $it['id'], - '$item_image' => proxy_url($it['photo'], false, PROXY_SIZE_MICRO), - '$item_text' => strip_tags(bbcode($it['msg'])), - '$item_when' => relative_date($it['date']) - )); - } - } else { - $notif_content .= t('No more system notifications.'); - } - - $o .= replace_macros($notif_tpl, array( - '$notif_header' => t('System Notifications'), - '$tabs' => $tabs, - '$notif_content' => $notif_content, - )); - - } else if (($a->argc > 1) && ($a->argv[1] == 'personal')) { - - $notif_tpl = get_markup_template('notifications.tpl'); - - $myurl = $a->get_baseurl(true) . '/profile/'. $a->user['nickname']; - $myurl = substr($myurl,strpos($myurl,'://')+3); - $myurl = str_replace(array('www.','.'),array('','\\.'),$myurl); - $diasp_url = str_replace('/profile/','/u/',$myurl); - $sql_extra .= sprintf(" AND ( `item`.`author-link` regexp '%s' or `item`.`tag` regexp '%s' or `item`.`tag` regexp '%s' ) ", - dbesc($myurl . '$'), - dbesc($myurl . '\\]'), - dbesc($diasp_url . '\\]') - ); - - - $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, - `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` as `object`, - `pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink`, `pitem`.`guid` as `pguid` - FROM `item` INNER JOIN `item` as `pitem` ON `pitem`.`id`=`item`.`parent` - WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 - $sql_extra - AND `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0 ORDER BY `item`.`created` DESC" , - intval(local_user()) - ); - - $tpl_item_likes = get_markup_template('notifications_likes_item.tpl'); - $tpl_item_dislikes = get_markup_template('notifications_dislikes_item.tpl'); - $tpl_item_friends = get_markup_template('notifications_friends_item.tpl'); - $tpl_item_comments = get_markup_template('notifications_comments_item.tpl'); - $tpl_item_posts = get_markup_template('notifications_posts_item.tpl'); - - $notif_content = ''; - - if (count($r) > 0) { - - foreach ($r as $it) { - switch($it['verb']){ - case ACTIVITY_LIKE: - $notif_content .= replace_macros($tpl_item_likes,array( - //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], - '$item_image' => $it['author-avatar'], - '$item_text' => sprintf( t("%s liked %s's post"), $it['author-name'], $it['pname']), - '$item_when' => relative_date($it['created']) - )); - break; - - case ACTIVITY_DISLIKE: - $notif_content .= replace_macros($tpl_item_dislikes,array( - //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], - '$item_image' => $it['author-avatar'], - '$item_text' => sprintf( t("%s disliked %s's post"), $it['author-name'], $it['pname']), - '$item_when' => relative_date($it['created']) - )); - break; - - case ACTIVITY_FRIEND: - - $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; - $obj = parse_xml_string($xmlhead.$it['object']); - $it['fname'] = $obj->title; - - $notif_content .= replace_macros($tpl_item_friends,array( - //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], - '$item_image' => $it['author-avatar'], - '$item_text' => sprintf( t("%s is now friends with %s"), $it['author-name'], $it['fname']), - '$item_when' => relative_date($it['created']) - )); - break; - - default: - $item_text = (($it['id'] == $it['parent']) - ? sprintf( t("%s created a new post"), $it['author-name']) - : sprintf( t("%s commented on %s's post"), $it['author-name'], $it['pname'])); - $tpl = (($it['id'] == $it['parent']) ? $tpl_item_posts : $tpl_item_comments); - - $notif_content .= replace_macros($tpl,array( - //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], - '$item_image' => $it['author-avatar'], - '$item_text' => $item_text, - '$item_when' => relative_date($it['created']) - )); - } - } - - } else { - - $notif_content = t('No more personal notifications.'); - } - - $o .= replace_macros($notif_tpl, array( - '$notif_header' => t('Personal Notifications'), - '$tabs' => $tabs, - '$notif_content' => $notif_content, - )); - - - - - - - } else if (($a->argc > 1) && ($a->argv[1] == 'home')) { - - $notif_tpl = get_markup_template('notifications.tpl'); - - $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, - `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` as `object`, - `pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink`, `pitem`.`guid` as `pguid` - FROM `item` INNER JOIN `item` as `pitem` ON `pitem`.`id`=`item`.`parent` - WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND - `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 1 ORDER BY `item`.`created` DESC", - intval(local_user()) - ); - - $tpl_item_likes = get_markup_template('notifications_likes_item.tpl'); - $tpl_item_dislikes = get_markup_template('notifications_dislikes_item.tpl'); - $tpl_item_friends = get_markup_template('notifications_friends_item.tpl'); - $tpl_item_comments = get_markup_template('notifications_comments_item.tpl'); - - $notif_content = ''; - - if (count($r) > 0) { - - foreach ($r as $it) { - switch($it['verb']){ - case ACTIVITY_LIKE: - $notif_content .= replace_macros($tpl_item_likes,array( - //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], - '$item_image' => $it['author-avatar'], - '$item_text' => sprintf( t("%s liked %s's post"), $it['author-name'], $it['pname']), - '$item_when' => relative_date($it['created']) - )); - - break; - case ACTIVITY_DISLIKE: - $notif_content .= replace_macros($tpl_item_dislikes,array( - //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], - '$item_image' => $it['author-avatar'], - '$item_text' => sprintf( t("%s disliked %s's post"), $it['author-name'], $it['pname']), - '$item_when' => relative_date($it['created']) - )); - - break; - case ACTIVITY_FRIEND: - - $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; - $obj = parse_xml_string($xmlhead.$it['object']); - $it['fname'] = $obj->title; - - $notif_content .= replace_macros($tpl_item_friends,array( - //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], - '$item_image' => $it['author-avatar'], - '$item_text' => sprintf( t("%s is now friends with %s"), $it['author-name'], $it['fname']), - '$item_when' => relative_date($it['created']) - )); - - break; - default: - $notif_content .= replace_macros($tpl_item_comments,array( - //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], - '$item_image' => $it['author-avatar'], - '$item_text' => sprintf( t("%s commented on %s's post"), $it['author-name'], $it['pname']), - '$item_when' => relative_date($it['created']) - )); - } - } - - } else { - $notif_content = t('No more home notifications.'); - } - - $o .= replace_macros($notif_tpl, array( - '$notif_header' => t('Home Notifications'), - '$tabs' => $tabs, - '$notif_content' => $notif_content, - )); - } - - $o .= paginate($a); - return $o; -} + return $tabs; +} \ No newline at end of file diff --git a/view/templates/intros.tpl b/view/templates/intros.tpl index b9f7f15418..fa823ca71a 100644 --- a/view/templates/intros.tpl +++ b/view/templates/intros.tpl @@ -9,7 +9,7 @@ {{if $gender}}
{{$gender_label}}
{{$gender}}
{{/if}} {{if $keywords}}
{{$keywords_label}}
{{$keywords}}
{{/if}} {{if $about}}
{{$about_label}}
{{$about}}
{{/if}} -
{{$knowyou}}
+
{{$lbl_knowyou}} {{$knowyou}}
{{$note}}
diff --git a/view/templates/notifications.tpl b/view/templates/notifications.tpl index 54f9de0c7a..9c671c2a5b 100644 --- a/view/templates/notifications.tpl +++ b/view/templates/notifications.tpl @@ -5,5 +5,18 @@ {{if $tabs }}{{include file="common_tabs.tpl"}}{{/if}}
- {{$notif_content}} + {{* The "show ignored" link *}} + {{if $notif_ignored_lnk}}{{$notif_ignored_lnk}}{{/if}} + + {{* The notifications *}} + {{if $notif_content}} + {{foreach $notif_content as $notification}} + {{$notification}} + {{/foreach}} + {{/if}} + + {{* If no notifications messages available *}} + {{if $notif_nocontent}} +
{{$notif_nocontent}}
+ {{/if}}
diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index ed264ac2d5..67b209f9ec 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -1798,7 +1798,7 @@ ul.dropdown-menu li:hover { .suggest-content-wrapper, .common-content-wrapper, .allfriends-content-wrapper, .match-content-wrapper, .dirfind-content-wrapper, .directory-content-wrapper, .manage-content-wrapper, .notes-content-wrapper, -.message-content-wrapper, .apps-content-wrapper, .notifications-content-wrapper, +.message-content-wrapper, .apps-content-wrapper, .admin-content-wrapper, .group-content-wrapper, .viewcontacts-content-wrapper { min-height: calc(100vh - 150px); padding: 15px; @@ -2149,6 +2149,54 @@ td.fc-day { .group { margin-left: 20px; } + +/* Notifications */ +ul.notif-network-list { + margin-left: -15px; + margin-right: -15px; +} +ul.notif-network-list > li { + padding-left: 15px; + padding-right: 15px; +} +.intro-wrapper.media { + overflow: visible; + word-wrap: break-word; + margin-top: 0; +} +.intro-photo-wrapper img.intro-photo { + height:80px; + width: 80px; + border-radius: 4px; +} +.intro-actions { + display: flex; +} +.intro-enty-name h4 { + font-size: 15px !important; +} +.intro-wrapper button.intro-action-link { + opacity: 0.1; + transition: all 0.25s ease-in-out; +} +.intro-wrapper button.intro-action-link, +.intro-wrapper button.intro-action-link:hover { + padding-right: 5px; + padding-left: 5px; + color: #555; +} +ul li:hover .intro-wrapper button.intro-action-link { + opacity: 0.8; + transition: all 0.25s ease-in-out; +} +ul li:hover .intro-wrapper button.intro-action-link:hover { + opacity: 1; +} +.intro-desc-label, .intro-url-label, .intro-network-label, +.intro-location-label, .intro-gender-label, .intro-keywords-label, +.intro-about-label, .intro-knowyou-label { + font-weight: bold; +} /* * Overwriting for transparency and other colors */ diff --git a/view/theme/frio/js/modal.js b/view/theme/frio/js/modal.js index b58288318d..b29b8d4caa 100644 --- a/view/theme/frio/js/modal.js +++ b/view/theme/frio/js/modal.js @@ -204,6 +204,19 @@ function addToModal(url) { }); } +// Add a element (by it's id) to a bootstrap modal +function addElmToModal(id) { + var elm = $(id).html(); + var modal = $('#modal').modal(); + + modal + .find('#modal-body') + .append(elm) + .modal.show; + + loadModalTitle(); +} + // function to load the html from the edit post page into // the jot modal function editpost(url) { diff --git a/view/theme/frio/templates/intros.tpl b/view/theme/frio/templates/intros.tpl new file mode 100644 index 0000000000..0b09c2dccb --- /dev/null +++ b/view/theme/frio/templates/intros.tpl @@ -0,0 +1,54 @@ + +
+ + {{* Contact Photo *}} +
+ {{$fullname|escape:'html'}} +
+ +
+ {{* The intro actions like approve, ignore, discard intro*}} + +

{{$fullname}}

+
{{$str_notifytype}}{{$notify_type}}
+ + {{* Additional information of the contact *}} +
{{$url_label}}: {{$url}}
+ {{if $network}}
{{$lbl_network}} {{$network}}
{{/if}} + {{if $location}}
{{$location_label}} {{$location}}
{{/if}} + {{if $gender}}
{{$gender_label}} {{$gender}}
{{/if}} + {{if $keywords}}
{{$keywords_label}} {{$keywords}}
{{/if}} + {{if $about}}
{{$about_label}} {{$about}}
{{/if}} +
{{$lbl_knowyou}}{{$knowyou}}
+
{{$note}}
+ + {{* This sections contains special settings for contact approval. We hide it by default and load this section in + a bootstrap modal in the case of approval *}} + +
+
+
diff --git a/view/theme/frio/templates/notifications.tpl b/view/theme/frio/templates/notifications.tpl new file mode 100644 index 0000000000..3729e6f8c2 --- /dev/null +++ b/view/theme/frio/templates/notifications.tpl @@ -0,0 +1,25 @@ + +
+ {{include file="section_title.tpl" title=$notif_header}} + + {{if $tabs }}{{include file="common_tabs.tpl"}}{{/if}} + +
+ {{* The "show ignored" link *}} + {{if $notif_ignored_lnk}}{{$notif_ignored_lnk}}{{/if}} + + {{* The notifications *}} + {{if $notif_content}} +
    + {{foreach $notif_content as $notification}} +
  • {{$notification}}
    • + {{/foreach}} +
+ {{/if}} + + {{* If no notifications messages available *}} + {{if $notif_nocontent}} +
{{$notif_nocontent}}
+ {{/if}} +
+
From 819b374401b54c6506ec8905aa8dc653c3202548 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Wed, 27 Jul 2016 21:07:54 +0200 Subject: [PATCH 004/352] notifications.php - move some template creation to the end of the file --- mod/notifications.php | 61 +++++++++---------------------------------- 1 file changed, 13 insertions(+), 48 deletions(-) diff --git a/mod/notifications.php b/mod/notifications.php index ae27de864c..fa2c78cf67 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -78,11 +78,13 @@ function notifications_content(&$a) { if( (($a->argc > 1) && ($a->argv[1] == 'intros')) || (($a->argc == 1))) { nav_set_selected('introductions'); + if(($a->argc > 2) && ($a->argv[2] == 'all')) $sql_extra = ''; else $sql_extra = " AND `ignore` = 0 "; + $notif_header = t('Notifications'); $notif_tpl = get_markup_template('notifications.tpl'); $notif_ignored_lnk .= '' @@ -231,18 +233,9 @@ function notifications_content(&$a) { else info( t('No introductions.') . EOL); - $o .= replace_macros($notif_tpl, array( - '$notif_header' => t('Notifications'), - '$tabs' => $tabs, - '$notif_ignored_lnk' => $notif_ignored_lnk, - '$notif_content' => $notif_content, - )); - - $o .= paginate($a); - return $o; - } else if (($a->argc > 1) && ($a->argv[1] == 'network')) { + $notif_header = t('Network Notifications'); $notif_tpl = get_markup_template('notifications.tpl'); $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, @@ -260,8 +253,6 @@ function notifications_content(&$a) { $tpl_item_comments = get_markup_template('notifications_comments_item.tpl'); $tpl_item_posts = get_markup_template('notifications_posts_item.tpl'); - $notif_content = array(); - if ($r) { foreach ($r as $it) { @@ -322,15 +313,9 @@ function notifications_content(&$a) { $notif_nocontent = t('No more network notifications.'); } - $o .= replace_macros($notif_tpl, array( - '$notif_header' => t('Network Notifications'), - '$tabs' => $tabs, - '$notif_content' => $notif_content, - '$notif_nocontent' => $notif_nocontent, - )); - } else if (($a->argc > 1) && ($a->argv[1] == 'system')) { + $notif_header = t('System Notifications'); $notif_tpl = get_markup_template('notifications.tpl'); $not_tpl = get_markup_template('notify.tpl'); @@ -353,15 +338,9 @@ function notifications_content(&$a) { $notif_nocontent = t('No more system notifications.'); } - $o .= replace_macros($notif_tpl, array( - '$notif_header' => t('System Notifications'), - '$tabs' => $tabs, - '$notif_content' => $notif_content, - '$notif_nocontent' => $notif_nocontent, - )); - } else if (($a->argc > 1) && ($a->argv[1] == 'personal')) { + $notif_header = t('Personal Notifications'); $notif_tpl = get_markup_template('notifications.tpl'); $myurl = $a->get_baseurl(true) . '/profile/'. $a->user['nickname']; @@ -391,8 +370,6 @@ function notifications_content(&$a) { $tpl_item_comments = get_markup_template('notifications_comments_item.tpl'); $tpl_item_posts = get_markup_template('notifications_posts_item.tpl'); - $notif_content = array(); - if (count($r) > 0) { foreach ($r as $it) { @@ -453,20 +430,9 @@ function notifications_content(&$a) { $notif_nocontent = t('No more personal notifications.'); } - $o .= replace_macros($notif_tpl, array( - '$notif_header' => t('Personal Notifications'), - '$tabs' => $tabs, - '$notif_content' => $notif_content, - '$notif_nocontent' => $notif_nocontent, - )); - - - - - - } else if (($a->argc > 1) && ($a->argv[1] == 'home')) { + $notif_header = t('Home Notifications'); $notif_tpl = get_markup_template('notifications.tpl'); $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, @@ -483,8 +449,6 @@ function notifications_content(&$a) { $tpl_item_friends = get_markup_template('notifications_friends_item.tpl'); $tpl_item_comments = get_markup_template('notifications_comments_item.tpl'); - $notif_content = array(); - if (count($r) > 0) { foreach ($r as $it) { @@ -539,14 +503,15 @@ function notifications_content(&$a) { $notif_nocontent = t('No more home notifications.'); } - $o .= replace_macros($notif_tpl, array( - '$notif_header' => t('Home Notifications'), - '$tabs' => $tabs, - '$notif_content' => $notif_content, - '$notif_nocontent' => $notif_nocontent, - )); } + $o .= replace_macros($notif_tpl, array( + '$notif_header' => $notif_header, + '$tabs' => $tabs, + '$notif_content' => $notif_content, + '$notif_nocontent' => $notif_nocontent, + '$notif_ignored_lnk' => $notif_ignored_lnk, + )); $o .= paginate($a); return $o; } From 867ebeb66183eee7f96c15301a82a0bfc1d123c2 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Thu, 28 Jul 2016 08:59:16 +0200 Subject: [PATCH 005/352] PHP7 needs an integer value for the length --- library/asn1.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/library/asn1.php b/library/asn1.php index e84398bf62..ac14a5b16f 100644 --- a/library/asn1.php +++ b/library/asn1.php @@ -4,6 +4,7 @@ // Attribution: http://www.krisbailey.com // license: unknown // modified: Mike Macgrivin mike@macgirvin.com 6-oct-2010 to support Salmon auto-discovery +// modified: Tobias Diekershoff 28-jul-2016 adding an intval in line 162 to make PHP7 happy // from openssl public keys @@ -159,7 +160,7 @@ class ASN_BASE { } $length = $tempLength; } - $data = substr($string, $p, $length); + $data = substr($string, $p, intval($length)); $parsed[] = self::parseASNData($type, $data, $level, $maxLevels); $p = $p + $length; } From f09cd571655bfd9966dd4529d4fb10256246a81c Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Thu, 28 Jul 2016 11:39:09 +0200 Subject: [PATCH 006/352] notifications.php - move duplicated code in an own function --- mod/notifications.php | 486 +++++++++++++++++++++++++++--------------- 1 file changed, 316 insertions(+), 170 deletions(-) diff --git a/mod/notifications.php b/mod/notifications.php index fa2c78cf67..ae4c97f83a 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -247,66 +247,71 @@ function notifications_content(&$a) { intval(local_user()) ); - $tpl_item_likes = get_markup_template('notifications_likes_item.tpl'); - $tpl_item_dislikes = get_markup_template('notifications_dislikes_item.tpl'); - $tpl_item_friends = get_markup_template('notifications_friends_item.tpl'); - $tpl_item_comments = get_markup_template('notifications_comments_item.tpl'); - $tpl_item_posts = get_markup_template('notifications_posts_item.tpl'); +// $tpl_item_likes = get_markup_template('notifications_likes_item.tpl'); +// $tpl_item_dislikes = get_markup_template('notifications_dislikes_item.tpl'); +// $tpl_item_friends = get_markup_template('notifications_friends_item.tpl'); +// $tpl_item_comments = get_markup_template('notifications_comments_item.tpl'); +// $tpl_item_posts = get_markup_template('notifications_posts_item.tpl'); if ($r) { - foreach ($r as $it) { - switch($it['verb']){ - case ACTIVITY_LIKE: - $notif_content[] = replace_macros($tpl_item_likes,array( - //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], - '$item_image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), - '$item_text' => sprintf( t("%s liked %s's post"), $it['author-name'], $it['pname']), - '$item_when' => relative_date($it['created']) - )); - break; + $notifs = array( + 'notifications' => $r, + 'ident' => 'network', + ); - case ACTIVITY_DISLIKE: - $notif_content[] = replace_macros($tpl_item_dislikes,array( - //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], - '$item_image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), - '$item_text' => sprintf( t("%s disliked %s's post"), $it['author-name'], $it['pname']), - '$item_when' => relative_date($it['created']) - )); - break; - - case ACTIVITY_FRIEND: - - $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; - $obj = parse_xml_string($xmlhead.$it['object']); - $it['fname'] = $obj->title; - - $notif_content[] = replace_macros($tpl_item_friends,array( - //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], - '$item_image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), - '$item_text' => sprintf( t("%s is now friends with %s"), $it['author-name'], $it['fname']), - '$item_when' => relative_date($it['created']) - )); - break; - - default: - $item_text = (($it['id'] == $it['parent']) - ? sprintf( t("%s created a new post"), $it['author-name']) - : sprintf( t("%s commented on %s's post"), $it['author-name'], $it['pname'])); - $tpl = (($it['id'] == $it['parent']) ? $tpl_item_posts : $tpl_item_comments); - - $notif_content[] = replace_macros($tpl,array( - //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], - '$item_image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), - '$item_text' => $item_text, - '$item_when' => relative_date($it['created']) - )); - } - } +// foreach ($r as $it) { +// switch($it['verb']){ +// case ACTIVITY_LIKE: +// $notif_content[] = replace_macros($tpl_item_likes,array( +// //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], +// '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], +// '$item_image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), +// '$item_text' => sprintf( t("%s liked %s's post"), $it['author-name'], $it['pname']), +// '$item_when' => relative_date($it['created']) +// )); +// break; +// +// case ACTIVITY_DISLIKE: +// $notif_content[] = replace_macros($tpl_item_dislikes,array( +// //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], +// '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], +// '$item_image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), +// '$item_text' => sprintf( t("%s disliked %s's post"), $it['author-name'], $it['pname']), +// '$item_when' => relative_date($it['created']) +// )); +// break; +// +// case ACTIVITY_FRIEND: +// +// $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; +// $obj = parse_xml_string($xmlhead.$it['object']); +// $it['fname'] = $obj->title; +// +// $notif_content[] = replace_macros($tpl_item_friends,array( +// //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], +// '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], +// '$item_image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), +// '$item_text' => sprintf( t("%s is now friends with %s"), $it['author-name'], $it['fname']), +// '$item_when' => relative_date($it['created']) +// )); +// break; +// +// default: +// $item_text = (($it['id'] == $it['parent']) +// ? sprintf( t("%s created a new post"), $it['author-name']) +// : sprintf( t("%s commented on %s's post"), $it['author-name'], $it['pname'])); +// $tpl = (($it['id'] == $it['parent']) ? $tpl_item_posts : $tpl_item_comments); +// +// $notif_content[] = replace_macros($tpl,array( +// //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], +// '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], +// '$item_image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), +// '$item_text' => $item_text, +// '$item_when' => relative_date($it['created']) +// )); +// } +// } } else { @@ -326,14 +331,19 @@ function notifications_content(&$a) { ); if (count($r) > 0) { - foreach ($r as $it) { - $notif_content[] = replace_macros($not_tpl,array( - '$item_link' => $a->get_baseurl(true).'/notify/view/'. $it['id'], - '$item_image' => proxy_url($it['photo'], false, PROXY_SIZE_MICRO), - '$item_text' => strip_tags(bbcode($it['msg'])), - '$item_when' => relative_date($it['date']) - )); - } +// foreach ($r as $it) { +// $notif_content[] = replace_macros($not_tpl,array( +// '$item_link' => $a->get_baseurl(true).'/notify/view/'. $it['id'], +// '$item_image' => proxy_url($it['photo'], false, PROXY_SIZE_MICRO), +// '$item_text' => strip_tags(bbcode($it['msg'])), +// '$item_when' => relative_date($it['date']) +// )); +// } + $notifs = array( + 'notifications' => $r, + 'ident' => 'system', + ); + } else { $notif_nocontent = t('No more system notifications.'); } @@ -364,66 +374,71 @@ function notifications_content(&$a) { intval(local_user()) ); - $tpl_item_likes = get_markup_template('notifications_likes_item.tpl'); - $tpl_item_dislikes = get_markup_template('notifications_dislikes_item.tpl'); - $tpl_item_friends = get_markup_template('notifications_friends_item.tpl'); - $tpl_item_comments = get_markup_template('notifications_comments_item.tpl'); - $tpl_item_posts = get_markup_template('notifications_posts_item.tpl'); +// $tpl_item_likes = get_markup_template('notifications_likes_item.tpl'); +// $tpl_item_dislikes = get_markup_template('notifications_dislikes_item.tpl'); +// $tpl_item_friends = get_markup_template('notifications_friends_item.tpl'); +// $tpl_item_comments = get_markup_template('notifications_comments_item.tpl'); +// $tpl_item_posts = get_markup_template('notifications_posts_item.tpl'); if (count($r) > 0) { + $notifs =array( + 'notifications' => $r, + 'ident' => 'personal' + ); - foreach ($r as $it) { - switch($it['verb']){ - case ACTIVITY_LIKE: - $notif_content[] = replace_macros($tpl_item_likes,array( - //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], - '$item_image' => $it['author-avatar'], - '$item_text' => sprintf( t("%s liked %s's post"), $it['author-name'], $it['pname']), - '$item_when' => relative_date($it['created']) - )); - break; - case ACTIVITY_DISLIKE: - $notif_content[] = replace_macros($tpl_item_dislikes,array( - //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], - '$item_image' => $it['author-avatar'], - '$item_text' => sprintf( t("%s disliked %s's post"), $it['author-name'], $it['pname']), - '$item_when' => relative_date($it['created']) - )); - break; - - case ACTIVITY_FRIEND: - - $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; - $obj = parse_xml_string($xmlhead.$it['object']); - $it['fname'] = $obj->title; - - $notif_content[] = replace_macros($tpl_item_friends,array( - //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], - '$item_image' => $it['author-avatar'], - '$item_text' => sprintf( t("%s is now friends with %s"), $it['author-name'], $it['fname']), - '$item_when' => relative_date($it['created']) - )); - break; - - default: - $item_text = (($it['id'] == $it['parent']) - ? sprintf( t("%s created a new post"), $it['author-name']) - : sprintf( t("%s commented on %s's post"), $it['author-name'], $it['pname'])); - $tpl = (($it['id'] == $it['parent']) ? $tpl_item_posts : $tpl_item_comments); - - $notif_content[] = replace_macros($tpl,array( - //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], - '$item_image' => $it['author-avatar'], - '$item_text' => $item_text, - '$item_when' => relative_date($it['created']) - )); - } - } +// foreach ($r as $it) { +// switch($it['verb']){ +// case ACTIVITY_LIKE: +// $notif_content[] = replace_macros($tpl_item_likes,array( +// //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], +// '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], +// '$item_image' => $it['author-avatar'], +// '$item_text' => sprintf( t("%s liked %s's post"), $it['author-name'], $it['pname']), +// '$item_when' => relative_date($it['created']) +// )); +// break; +// +// case ACTIVITY_DISLIKE: +// $notif_content[] = replace_macros($tpl_item_dislikes,array( +// //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], +// '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], +// '$item_image' => $it['author-avatar'], +// '$item_text' => sprintf( t("%s disliked %s's post"), $it['author-name'], $it['pname']), +// '$item_when' => relative_date($it['created']) +// )); +// break; +// +// case ACTIVITY_FRIEND: +// +// $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; +// $obj = parse_xml_string($xmlhead.$it['object']); +// $it['fname'] = $obj->title; +// +// $notif_content[] = replace_macros($tpl_item_friends,array( +// //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], +// '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], +// '$item_image' => $it['author-avatar'], +// '$item_text' => sprintf( t("%s is now friends with %s"), $it['author-name'], $it['fname']), +// '$item_when' => relative_date($it['created']) +// )); +// break; +// +// default: +// $item_text = (($it['id'] == $it['parent']) +// ? sprintf( t("%s created a new post"), $it['author-name']) +// : sprintf( t("%s commented on %s's post"), $it['author-name'], $it['pname'])); +// $tpl = (($it['id'] == $it['parent']) ? $tpl_item_posts : $tpl_item_comments); +// +// $notif_content[] = replace_macros($tpl,array( +// //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], +// '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], +// '$item_image' => $it['author-avatar'], +// '$item_text' => $item_text, +// '$item_when' => relative_date($it['created']) +// )); +// } +// } } else { @@ -444,60 +459,65 @@ function notifications_content(&$a) { intval(local_user()) ); - $tpl_item_likes = get_markup_template('notifications_likes_item.tpl'); - $tpl_item_dislikes = get_markup_template('notifications_dislikes_item.tpl'); - $tpl_item_friends = get_markup_template('notifications_friends_item.tpl'); - $tpl_item_comments = get_markup_template('notifications_comments_item.tpl'); +// $tpl_item_likes = get_markup_template('notifications_likes_item.tpl'); +// $tpl_item_dislikes = get_markup_template('notifications_dislikes_item.tpl'); +// $tpl_item_friends = get_markup_template('notifications_friends_item.tpl'); +// $tpl_item_comments = get_markup_template('notifications_comments_item.tpl'); if (count($r) > 0) { - foreach ($r as $it) { - switch($it['verb']){ - case ACTIVITY_LIKE: - $notif_content[] = replace_macros($tpl_item_likes,array( - //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], - '$item_image' => $it['author-avatar'], - '$item_text' => sprintf( t("%s liked %s's post"), $it['author-name'], $it['pname']), - '$item_when' => relative_date($it['created']) - )); + $notifs = array( + 'notifications' => $r, + 'ident' => 'home', + ); - break; - case ACTIVITY_DISLIKE: - $notif_content[] = replace_macros($tpl_item_dislikes,array( - //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], - '$item_image' => $it['author-avatar'], - '$item_text' => sprintf( t("%s disliked %s's post"), $it['author-name'], $it['pname']), - '$item_when' => relative_date($it['created']) - )); - - break; - case ACTIVITY_FRIEND: - - $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; - $obj = parse_xml_string($xmlhead.$it['object']); - $it['fname'] = $obj->title; - - $notif_content[] = replace_macros($tpl_item_friends,array( - //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], - '$item_image' => $it['author-avatar'], - '$item_text' => sprintf( t("%s is now friends with %s"), $it['author-name'], $it['fname']), - '$item_when' => relative_date($it['created']) - )); - - break; - default: - $notif_content[] = replace_macros($tpl_item_comments,array( - //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], - '$item_image' => $it['author-avatar'], - '$item_text' => sprintf( t("%s commented on %s's post"), $it['author-name'], $it['pname']), - '$item_when' => relative_date($it['created']) - )); - } - } +// foreach ($r as $it) { +// switch($it['verb']){ +// case ACTIVITY_LIKE: +// $notif_content[] = replace_macros($tpl_item_likes,array( +// //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], +// '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], +// '$item_image' => $it['author-avatar'], +// '$item_text' => sprintf( t("%s liked %s's post"), $it['author-name'], $it['pname']), +// '$item_when' => relative_date($it['created']) +// )); +// +// break; +// case ACTIVITY_DISLIKE: +// $notif_content[] = replace_macros($tpl_item_dislikes,array( +// //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], +// '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], +// '$item_image' => $it['author-avatar'], +// '$item_text' => sprintf( t("%s disliked %s's post"), $it['author-name'], $it['pname']), +// '$item_when' => relative_date($it['created']) +// )); +// +// break; +// case ACTIVITY_FRIEND: +// +// $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; +// $obj = parse_xml_string($xmlhead.$it['object']); +// $it['fname'] = $obj->title; +// +// $notif_content[] = replace_macros($tpl_item_friends,array( +// //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], +// '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], +// '$item_image' => $it['author-avatar'], +// '$item_text' => sprintf( t("%s is now friends with %s"), $it['author-name'], $it['fname']), +// '$item_when' => relative_date($it['created']) +// )); +// +// break; +// default: +// $notif_content[] = replace_macros($tpl_item_comments,array( +// //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], +// '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], +// '$item_image' => $it['author-avatar'], +// '$item_text' => sprintf( t("%s commented on %s's post"), $it['author-name'], $it['pname']), +// '$item_when' => relative_date($it['created']) +// )); +// } +// } } else { $notif_nocontent = t('No more home notifications.'); @@ -505,6 +525,9 @@ function notifications_content(&$a) { } + if(count($notifs['notifications']) > 0 ) + $notif_content = format_notifiations ($a, $notifs); + $o .= replace_macros($notif_tpl, array( '$notif_header' => $notif_header, '$tabs' => $tabs, @@ -512,6 +535,7 @@ function notifications_content(&$a) { '$notif_nocontent' => $notif_nocontent, '$notif_ignored_lnk' => $notif_ignored_lnk, )); + $o .= paginate($a); return $o; } @@ -561,4 +585,126 @@ function notifications_tabs($a) { ); return $tabs; +} + +function format_notifiations(&$a, $notifs) { + + $notif_content = array(); + + // The template files we need in different cases for formatting the content + $tpl_item_likes = get_markup_template('notifications_likes_item.tpl'); + $tpl_item_dislikes = get_markup_template('notifications_dislikes_item.tpl'); + $tpl_item_friends = get_markup_template('notifications_friends_item.tpl'); + $tpl_item_comments = get_markup_template('notifications_comments_item.tpl'); + $tpl_item_posts = get_markup_template('notifications_posts_item.tpl'); + $tpl_notify = get_markup_template('notify.tpl'); + + if (count($notifs['notifications']) > 0) { +// switch ($notifs['ident']) { +// case 'system': +// $default_item_link = app::get_baseurl(true).'/notify/view/'. $it['id']; +// $default_item_image = proxy_url($it['photo'], false, PROXY_SIZE_MICRO); +// $default_item_text = strip_tags(bbcode($it['msg'])); +// $default_item_when = relative_date($it['date']); +// $default_tpl = $tpl_notify; +// break; +// +// case 'home': +// $default_item_link = app::get_baseurl(true).'/display/'.$it['pguid']; +// $default_item_image = proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO); +// $default_item_text = sprintf( t("%s commented on %s's post"), $it['author-name'], $it['pname']); +// $default_item_when = relative_date($it['created']); +// $default_tpl = $tpl_item_comments; +// break; +// +// default: +// $default_item_link = app::get_baseurl(true).'/display/'.$it['pguid']; +// $default_item_image = proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO); +// $default_item_text = (($it['id'] == $it['parent']) +// ? sprintf( t("%s created a new post"), $it['author-name']) +// : sprintf( t("%s commented on %s's post"), $it['author-name'], $it['pname'])); +// $default_item_when = relative_date($it['created']); +// $default_tpl = (($it['id'] == $it['parent']) ? $tpl_item_posts : $tpl_item_comments); +// +// } + + foreach ($notifs['notifications'] as $it) { + + switch ($notifs['ident']) { + case 'system': + $default_item_link = app::get_baseurl(true).'notify/view/'. $it['id']; + $default_item_image = proxy_url($it['photo'], false, PROXY_SIZE_MICRO); + $default_item_text = strip_tags(bbcode($it['msg'])); + $default_item_when = relative_date($it['date']); + $default_tpl = $tpl_notify; + break; + + case 'home': + $default_item_link = app::get_baseurl(true).'/display/'.$it['pguid']; + $default_item_image = proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO); + $default_item_text = sprintf( t("%s commented on %s's post"), $it['author-name'], $it['pname']); + $default_item_when = relative_date($it['created']); + $default_tpl = $tpl_item_comments; + break; + + default: + $default_item_link = app::get_baseurl(true).'/display/'.$it['pguid']; + $default_item_image = proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO); + $default_item_text = (($it['id'] == $it['parent']) + ? sprintf( t("%s created a new post"), $it['author-name']) + : sprintf( t("%s commented on %s's post"), $it['author-name'], $it['pname'])); + $default_item_when = relative_date($it['created']); + $default_tpl = (($it['id'] == $it['parent']) ? $tpl_item_posts : $tpl_item_comments); + + } + + switch($it['verb']){ + case ACTIVITY_LIKE: + $notif_content[] = replace_macros($tpl_item_likes,array( + //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], + '$item_link' => app::get_baseurl(true).'/display/'.$it['pguid'], + '$item_image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), + '$item_text' => sprintf( t("%s liked %s's post"), $it['author-name'], $it['pname']), + '$item_when' => relative_date($it['created']) + )); + break; + + case ACTIVITY_DISLIKE: + $notif_content[] = replace_macros($tpl_item_dislikes,array( + //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], + '$item_link' => app::get_baseurl(true).'/display/'.$it['pguid'], + '$item_image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), + '$item_text' => sprintf( t("%s disliked %s's post"), $it['author-name'], $it['pname']), + '$item_when' => relative_date($it['created']) + )); + break; + + case ACTIVITY_FRIEND: + $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; + $obj = parse_xml_string($xmlhead.$it['object']); + $it['fname'] = $obj->title; + + $notif_content[] = replace_macros($tpl_item_friends,array( + //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], + '$item_link' => app::get_baseurl(true).'/display/'.$it['pguid'], + '$item_image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), + '$item_text' => sprintf( t("%s is now friends with %s"), $it['author-name'], $it['fname']), + '$item_when' => relative_date($it['created']) + )); + break; + + default: + $notif_content[] = replace_macros($default_tpl,array( + //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], + '$item_link' => $default_item_link, + '$item_image' => $default_item_image, + '$item_text' => $default_item_text, + '$item_when' => $default_item_when + )); + } + } + } + + return $notif_content; + } \ No newline at end of file From e74da01276177923948708174aca9e52254034db Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Thu, 28 Jul 2016 11:45:41 +0200 Subject: [PATCH 007/352] frio: contac_edit.tpl was missing a bracket --- view/theme/frio/templates/contact_edit.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/theme/frio/templates/contact_edit.tpl b/view/theme/frio/templates/contact_edit.tpl index b4217aa436..6170dcef82 100644 --- a/view/theme/frio/templates/contact_edit.tpl +++ b/view/theme/frio/templates/contact_edit.tpl @@ -91,7 +91,7 @@ {{if $keywords}}
-
{$keywords_label}}
+
{{$keywords_label}}
{{$keywords}}
{{/if}} From c9dee2947f7c5c994cba9741c1b363a0f5998299 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Thu, 28 Jul 2016 15:41:25 +0200 Subject: [PATCH 008/352] quickfix for worker delivery problems --- boot.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/boot.php b/boot.php index 056e47b7d2..cad4094c7d 100644 --- a/boot.php +++ b/boot.php @@ -1801,9 +1801,13 @@ function proc_run($cmd){ $priority = 2; if (!$found) - q("INSERT INTO `workerqueue` (`function`, `parameter`, `created`, `priority`) - VALUES ('%s', '%s', '%s', %d)", - dbesc($funcname), + // quickfix for the delivery problems, 2106-07-28 + /// @todo find better solution + //q("INSERT INTO `workerqueue` (`function`, `parameter`, `created`, `priority`) + // VALUES ('%s', '%s', '%s', %d)", + // dbesc($funcname), + q("INSERT INTO `workerqueue` (`parameter`, `created`, `priority`) + VALUES ('%s', '%s', %d)", dbesc($parameters), dbesc(datetime_convert()), intval($priority)); From 52f641904bab4c79c1138e237f3de8eb6864839a Mon Sep 17 00:00:00 2001 From: trebor Date: Sat, 30 Jul 2016 10:51:21 +0200 Subject: [PATCH 009/352] notifications.php: reduce code duplication --- include/NotificationsManager.php | 380 ++++++++++++++++++++++--------- mod/notifications.php | 175 +------------- 2 files changed, 279 insertions(+), 276 deletions(-) diff --git a/include/NotificationsManager.php b/include/NotificationsManager.php index 5f8211eb87..cbf8986d09 100644 --- a/include/NotificationsManager.php +++ b/include/NotificationsManager.php @@ -10,12 +10,12 @@ require_once("include/bbcode.php"); * @brief Read and write notifications from/to database */ class NotificationsManager { - private $a; - - public function __construct() { - $this->a = get_app(); - } - + private $a; + + public function __construct() { + $this->a = get_app(); + } + /** * @brief set some extra note properties * @@ -28,109 +28,279 @@ class NotificationsManager { * - msg_html: message as html string * - msg_plain: message as plain text string */ - private function _set_extra($notes) { - $rets = array(); - foreach($notes as $n) { - $local_time = datetime_convert('UTC',date_default_timezone_get(),$n['date']); - $n['timestamp'] = strtotime($local_time); - $n['date_rel'] = relative_date($n['date']); - $n['msg_html'] = bbcode($n['msg'], false, false, false, false); - $n['msg_plain'] = explode("\n",trim(html2plain($n['msg_html'], 0)))[0]; - - $rets[] = $n; - } - return $rets; - } + private function _set_extra($notes) { + $rets = array(); + foreach($notes as $n) { + $local_time = datetime_convert('UTC',date_default_timezone_get(),$n['date']); + $n['timestamp'] = strtotime($local_time); + $n['date_rel'] = relative_date($n['date']); + $n['msg_html'] = bbcode($n['msg'], false, false, false, false); + $n['msg_plain'] = explode("\n",trim(html2plain($n['msg_html'], 0)))[0]; + + $rets[] = $n; + } + return $rets; + } - /** - * @brief get all notifications for local_user() - * - * @param array $filter optional Array "column name"=>value: filter query by columns values - * @param string $order optional Space separated list of column to sort by. prepend name with "+" to sort ASC, "-" to sort DESC. Default to "-date" - * @param string $limit optional Query limits - * - * @return array of results or false on errors - */ - public function getAll($filter = array(), $order="-date", $limit="") { - $filter_str = array(); - $filter_sql = ""; - foreach($filter as $column => $value) { - $filter_str[] = sprintf("`%s` = '%s'", $column, dbesc($value)); - } - if (count($filter_str)>0) { - $filter_sql = "AND ".implode(" AND ", $filter_str); - } - - $aOrder = explode(" ", $order); - $asOrder = array(); - foreach($aOrder as $o) { - $dir = "asc"; - if ($o[0]==="-") { - $dir = "desc"; - $o = substr($o,1); - } - if ($o[0]==="+") { - $dir = "asc"; - $o = substr($o,1); - } - $asOrder[] = "$o $dir"; - } - $order_sql = implode(", ", $asOrder); - - if ($limit!="") $limit = " LIMIT ".$limit; - - $r = q("SELECT * FROM `notify` WHERE `uid` = %d $filter_sql ORDER BY $order_sql $limit", + /** + * @brief get all notifications for local_user() + * + * @param array $filter optional Array "column name"=>value: filter query by columns values + * @param string $order optional Space separated list of column to sort by. prepend name with "+" to sort ASC, "-" to sort DESC. Default to "-date" + * @param string $limit optional Query limits + * + * @return array of results or false on errors + */ + public function getAll($filter = array(), $order="-date", $limit="") { + $filter_str = array(); + $filter_sql = ""; + foreach($filter as $column => $value) { + $filter_str[] = sprintf("`%s` = '%s'", $column, dbesc($value)); + } + if (count($filter_str)>0) { + $filter_sql = "AND ".implode(" AND ", $filter_str); + } + + $aOrder = explode(" ", $order); + $asOrder = array(); + foreach($aOrder as $o) { + $dir = "asc"; + if ($o[0]==="-") { + $dir = "desc"; + $o = substr($o,1); + } + if ($o[0]==="+") { + $dir = "asc"; + $o = substr($o,1); + } + $asOrder[] = "$o $dir"; + } + $order_sql = implode(", ", $asOrder); + + if ($limit!="") $limit = " LIMIT ".$limit; + + $r = q("SELECT * FROM `notify` WHERE `uid` = %d $filter_sql ORDER BY $order_sql $limit", + intval(local_user()) + ); + if ($r!==false && count($r)>0) return $this->_set_extra($r); + return false; + } + + /** + * @brief get one note for local_user() by $id value + * + * @param int $id + * @return array note values or null if not found + */ + public function getByID($id) { + $r = q("SELECT * FROM `notify` WHERE `id` = %d AND `uid` = %d LIMIT 1", + intval($id), intval(local_user()) ); - if ($r!==false && count($r)>0) return $this->_set_extra($r); - return false; - } - - /** - * @brief get one note for local_user() by $id value - * - * @param int $id - * @return array note values or null if not found - */ - public function getByID($id) { - $r = q("SELECT * FROM `notify` WHERE `id` = %d AND `uid` = %d LIMIT 1", - intval($id), - intval(local_user()) - ); - if($r!==false && count($r)>0) { - return $this->_set_extra($r)[0]; - } - return null; - } - - /** - * @brief set seen state of $note of local_user() - * - * @param array $note - * @param bool $seen optional true or false, default true - * @return bool true on success, false on errors - */ - public function setSeen($note, $seen = true) { - return q("UPDATE `notify` SET `seen` = %d WHERE ( `link` = '%s' OR ( `parent` != 0 AND `parent` = %d AND `otype` = '%s' )) AND `uid` = %d", - intval($seen), - dbesc($note['link']), - intval($note['parent']), - dbesc($note['otype']), - intval(local_user()) - ); - } - - /** - * @brief set seen state of all notifications of local_user() - * - * @param bool $seen optional true or false. default true - * @return bool true on success, false on error - */ - public function setAllSeen($seen = true) { - return q("UPDATE `notify` SET `seen` = %d WHERE `uid` = %d", - intval($seen), + if($r!==false && count($r)>0) { + return $this->_set_extra($r)[0]; + } + return null; + } + + /** + * @brief set seen state of $note of local_user() + * + * @param array $note + * @param bool $seen optional true or false, default true + * @return bool true on success, false on errors + */ + public function setSeen($note, $seen = true) { + return q("UPDATE `notify` SET `seen` = %d WHERE ( `link` = '%s' OR ( `parent` != 0 AND `parent` = %d AND `otype` = '%s' )) AND `uid` = %d", + intval($seen), + dbesc($note['link']), + intval($note['parent']), + dbesc($note['otype']), intval(local_user()) ); - } + } + + /** + * @brief set seen state of all notifications of local_user() + * + * @param bool $seen optional true or false. default true + * @return bool true on success, false on error + */ + public function setAllSeen($seen = true) { + return q("UPDATE `notify` SET `seen` = %d WHERE `uid` = %d", + intval($seen), + intval(local_user()) + ); + } + + /** + * @brief List of pages for the Notifications TabBar + * + * @param app $a The + * @return array with with notifications TabBar data + */ + public function getTabs() { + $tabs = array( + array( + 'label' => t('System'), + 'url'=>'notifications/system', + 'sel'=> (($this->a->argv[1] == 'system') ? 'active' : ''), + 'accesskey' => 'y', + ), + array( + 'label' => t('Network'), + 'url'=>'notifications/network', + 'sel'=> (($this->a->argv[1] == 'network') ? 'active' : ''), + 'accesskey' => 'w', + ), + array( + 'label' => t('Personal'), + 'url'=>'notifications/personal', + 'sel'=> (($this->a->argv[1] == 'personal') ? 'active' : ''), + 'accesskey' => 'r', + ), + array( + 'label' => t('Home'), + 'url' => 'notifications/home', + 'sel'=> (($this->a->argv[1] == 'home') ? 'active' : ''), + 'accesskey' => 'h', + ), + array( + 'label' => t('Introductions'), + 'url' => 'notifications/intros', + 'sel'=> (($this->a->argv[1] == 'intros') ? 'active' : ''), + 'accesskey' => 'i', + ), + /*array( + 'label' => t('Messages'), + 'url' => 'message', + 'sel'=> '', + ),*/ /*while I can have notifications for messages, this tablist is not place for message page link */ + ); + + return $tabs; + } + + public function format($notifs) { + + $notif_content = array(); + + // The template files we need in different cases for formatting the content + $tpl_item_likes = get_markup_template('notifications_likes_item.tpl'); + $tpl_item_dislikes = get_markup_template('notifications_dislikes_item.tpl'); + $tpl_item_friends = get_markup_template('notifications_friends_item.tpl'); + $tpl_item_comments = get_markup_template('notifications_comments_item.tpl'); + $tpl_item_posts = get_markup_template('notifications_posts_item.tpl'); + $tpl_notify = get_markup_template('notify.tpl'); + + if (count($notifs['notifications']) > 0) { + // switch ($notifs['ident']) { + // case 'system': + // $default_item_link = app::get_baseurl(true).'/notify/view/'. $it['id']; + // $default_item_image = proxy_url($it['photo'], false, PROXY_SIZE_MICRO); + // $default_item_text = strip_tags(bbcode($it['msg'])); + // $default_item_when = relative_date($it['date']); + // $default_tpl = $tpl_notify; + // break; + // + // case 'home': + // $default_item_link = app::get_baseurl(true).'/display/'.$it['pguid']; + // $default_item_image = proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO); + // $default_item_text = sprintf( t("%s commented on %s's post"), $it['author-name'], $it['pname']); + // $default_item_when = relative_date($it['created']); + // $default_tpl = $tpl_item_comments; + // break; + // + // default: + // $default_item_link = app::get_baseurl(true).'/display/'.$it['pguid']; + // $default_item_image = proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO); + // $default_item_text = (($it['id'] == $it['parent']) + // ? sprintf( t("%s created a new post"), $it['author-name']) + // : sprintf( t("%s commented on %s's post"), $it['author-name'], $it['pname'])); + // $default_item_when = relative_date($it['created']); + // $default_tpl = (($it['id'] == $it['parent']) ? $tpl_item_posts : $tpl_item_comments); + // + // } + + foreach ($notifs['notifications'] as $it) { + + switch ($notifs['ident']) { + case 'system': + $default_item_link = app::get_baseurl(true).'/notify/view/'. $it['id']; + $default_item_image = proxy_url($it['photo'], false, PROXY_SIZE_MICRO); + $default_item_text = strip_tags(bbcode($it['msg'])); + $default_item_when = relative_date($it['date']); + $default_tpl = $tpl_notify; + break; + + case 'home': + $default_item_link = app::get_baseurl(true).'/display/'.$it['pguid']; + $default_item_image = proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO); + $default_item_text = sprintf( t("%s commented on %s's post"), $it['author-name'], $it['pname']); + $default_item_when = relative_date($it['created']); + $default_tpl = $tpl_item_comments; + break; + + default: + $default_item_link = app::get_baseurl(true).'/display/'.$it['pguid']; + $default_item_image = proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO); + $default_item_text = (($it['id'] == $it['parent']) + ? sprintf( t("%s created a new post"), $it['author-name']) + : sprintf( t("%s commented on %s's post"), $it['author-name'], $it['pname'])); + $default_item_when = relative_date($it['created']); + $default_tpl = (($it['id'] == $it['parent']) ? $tpl_item_posts : $tpl_item_comments); + + } + + switch($it['verb']){ + case ACTIVITY_LIKE: + $notif_content[] = replace_macros($tpl_item_likes,array( + //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], + '$item_link' => app::get_baseurl(true).'/display/'.$it['pguid'], + '$item_image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), + '$item_text' => sprintf( t("%s liked %s's post"), $it['author-name'], $it['pname']), + '$item_when' => relative_date($it['created']) + )); + break; + + case ACTIVITY_DISLIKE: + $notif_content[] = replace_macros($tpl_item_dislikes,array( + //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], + '$item_link' => app::get_baseurl(true).'/display/'.$it['pguid'], + '$item_image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), + '$item_text' => sprintf( t("%s disliked %s's post"), $it['author-name'], $it['pname']), + '$item_when' => relative_date($it['created']) + )); + break; + + case ACTIVITY_FRIEND: + $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; + $obj = parse_xml_string($xmlhead.$it['object']); + $it['fname'] = $obj->title; + + $notif_content[] = replace_macros($tpl_item_friends,array( + //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], + '$item_link' => app::get_baseurl(true).'/display/'.$it['pguid'], + '$item_image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), + '$item_text' => sprintf( t("%s is now friends with %s"), $it['author-name'], $it['fname']), + '$item_when' => relative_date($it['created']) + )); + break; + + default: + $notif_content[] = replace_macros($default_tpl,array( + //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], + '$item_link' => $default_item_link, + '$item_image' => $default_item_image, + '$item_text' => $default_item_text, + '$item_when' => $default_item_when + )); + } + } + } + + return $notif_content; + + } } diff --git a/mod/notifications.php b/mod/notifications.php index ae4c97f83a..5a1ef51ca7 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -1,4 +1,5 @@ argc > 1 && $a->argv[$a->argc - 1] === 'json') ? true : false); + $nm = new NotificationsManager(); $o = ''; // get the nav tabs for the notification pages - $tabs = notifications_tabs($a); + $tabs = $nm->getTabs(); $notif_content = array(); if( (($a->argc > 1) && ($a->argv[1] == 'intros')) || (($a->argc == 1))) { @@ -526,7 +528,7 @@ function notifications_content(&$a) { } if(count($notifs['notifications']) > 0 ) - $notif_content = format_notifiations ($a, $notifs); + $notif_content =$nm->format ($notifs); $o .= replace_macros($notif_tpl, array( '$notif_header' => $notif_header, @@ -539,172 +541,3 @@ function notifications_content(&$a) { $o .= paginate($a); return $o; } -/** - * @brief List of pages for the Notifications TabBar - * - * @param app $a The - * @return array with with notifications TabBar data - */ -function notifications_tabs($a) { - $tabs = array( - array( - 'label' => t('System'), - 'url'=>'notifications/system', - 'sel'=> (($a->argv[1] == 'system') ? 'active' : ''), - 'accesskey' => 'y', - ), - array( - 'label' => t('Network'), - 'url'=>'notifications/network', - 'sel'=> (($a->argv[1] == 'network') ? 'active' : ''), - 'accesskey' => 'w', - ), - array( - 'label' => t('Personal'), - 'url'=>'notifications/personal', - 'sel'=> (($a->argv[1] == 'personal') ? 'active' : ''), - 'accesskey' => 'r', - ), - array( - 'label' => t('Home'), - 'url' => 'notifications/home', - 'sel'=> (($a->argv[1] == 'home') ? 'active' : ''), - 'accesskey' => 'h', - ), - array( - 'label' => t('Introductions'), - 'url' => 'notifications/intros', - 'sel'=> (($a->argv[1] == 'intros') ? 'active' : ''), - 'accesskey' => 'i', - ), - /*array( - 'label' => t('Messages'), - 'url' => 'message', - 'sel'=> '', - ),*/ /*while I can have notifications for messages, this tablist is not place for message page link */ - ); - - return $tabs; -} - -function format_notifiations(&$a, $notifs) { - - $notif_content = array(); - - // The template files we need in different cases for formatting the content - $tpl_item_likes = get_markup_template('notifications_likes_item.tpl'); - $tpl_item_dislikes = get_markup_template('notifications_dislikes_item.tpl'); - $tpl_item_friends = get_markup_template('notifications_friends_item.tpl'); - $tpl_item_comments = get_markup_template('notifications_comments_item.tpl'); - $tpl_item_posts = get_markup_template('notifications_posts_item.tpl'); - $tpl_notify = get_markup_template('notify.tpl'); - - if (count($notifs['notifications']) > 0) { -// switch ($notifs['ident']) { -// case 'system': -// $default_item_link = app::get_baseurl(true).'/notify/view/'. $it['id']; -// $default_item_image = proxy_url($it['photo'], false, PROXY_SIZE_MICRO); -// $default_item_text = strip_tags(bbcode($it['msg'])); -// $default_item_when = relative_date($it['date']); -// $default_tpl = $tpl_notify; -// break; -// -// case 'home': -// $default_item_link = app::get_baseurl(true).'/display/'.$it['pguid']; -// $default_item_image = proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO); -// $default_item_text = sprintf( t("%s commented on %s's post"), $it['author-name'], $it['pname']); -// $default_item_when = relative_date($it['created']); -// $default_tpl = $tpl_item_comments; -// break; -// -// default: -// $default_item_link = app::get_baseurl(true).'/display/'.$it['pguid']; -// $default_item_image = proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO); -// $default_item_text = (($it['id'] == $it['parent']) -// ? sprintf( t("%s created a new post"), $it['author-name']) -// : sprintf( t("%s commented on %s's post"), $it['author-name'], $it['pname'])); -// $default_item_when = relative_date($it['created']); -// $default_tpl = (($it['id'] == $it['parent']) ? $tpl_item_posts : $tpl_item_comments); -// -// } - - foreach ($notifs['notifications'] as $it) { - - switch ($notifs['ident']) { - case 'system': - $default_item_link = app::get_baseurl(true).'notify/view/'. $it['id']; - $default_item_image = proxy_url($it['photo'], false, PROXY_SIZE_MICRO); - $default_item_text = strip_tags(bbcode($it['msg'])); - $default_item_when = relative_date($it['date']); - $default_tpl = $tpl_notify; - break; - - case 'home': - $default_item_link = app::get_baseurl(true).'/display/'.$it['pguid']; - $default_item_image = proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO); - $default_item_text = sprintf( t("%s commented on %s's post"), $it['author-name'], $it['pname']); - $default_item_when = relative_date($it['created']); - $default_tpl = $tpl_item_comments; - break; - - default: - $default_item_link = app::get_baseurl(true).'/display/'.$it['pguid']; - $default_item_image = proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO); - $default_item_text = (($it['id'] == $it['parent']) - ? sprintf( t("%s created a new post"), $it['author-name']) - : sprintf( t("%s commented on %s's post"), $it['author-name'], $it['pname'])); - $default_item_when = relative_date($it['created']); - $default_tpl = (($it['id'] == $it['parent']) ? $tpl_item_posts : $tpl_item_comments); - - } - - switch($it['verb']){ - case ACTIVITY_LIKE: - $notif_content[] = replace_macros($tpl_item_likes,array( - //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_link' => app::get_baseurl(true).'/display/'.$it['pguid'], - '$item_image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), - '$item_text' => sprintf( t("%s liked %s's post"), $it['author-name'], $it['pname']), - '$item_when' => relative_date($it['created']) - )); - break; - - case ACTIVITY_DISLIKE: - $notif_content[] = replace_macros($tpl_item_dislikes,array( - //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_link' => app::get_baseurl(true).'/display/'.$it['pguid'], - '$item_image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), - '$item_text' => sprintf( t("%s disliked %s's post"), $it['author-name'], $it['pname']), - '$item_when' => relative_date($it['created']) - )); - break; - - case ACTIVITY_FRIEND: - $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; - $obj = parse_xml_string($xmlhead.$it['object']); - $it['fname'] = $obj->title; - - $notif_content[] = replace_macros($tpl_item_friends,array( - //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_link' => app::get_baseurl(true).'/display/'.$it['pguid'], - '$item_image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), - '$item_text' => sprintf( t("%s is now friends with %s"), $it['author-name'], $it['fname']), - '$item_when' => relative_date($it['created']) - )); - break; - - default: - $notif_content[] = replace_macros($default_tpl,array( - //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_link' => $default_item_link, - '$item_image' => $default_item_image, - '$item_text' => $default_item_text, - '$item_when' => $default_item_when - )); - } - } - } - - return $notif_content; - -} \ No newline at end of file From f7fa5f166b3ffc909af36902ea1b9c2075119262 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Sat, 30 Jul 2016 11:03:21 +0200 Subject: [PATCH 010/352] notifications.php: unify label strings --- mod/notifications.php | 10 +++++----- view/templates/intros.tpl | 10 +++++----- view/theme/frio/templates/intros.tpl | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/mod/notifications.php b/mod/notifications.php index fa2c78cf67..f3e7c564ab 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -205,18 +205,18 @@ function notifications_content(&$a) { '$photo' => ((x($rr,'photo')) ? proxy_url($rr['photo'], false, PROXY_SIZE_SMALL) : "images/person-175.jpg"), '$fullname' => $rr['name'], '$location' => bbcode($rr['glocation'], false, false), - '$location_label' => t('Location:'), + '$lbl_location' => t('Location:'), '$about' => bbcode($rr['gabout'], false, false), - '$about_label' => t('About:'), + '$lbl_about' => t('About:'), '$keywords' => $rr['gkeywords'], - '$keywords_label' => t('Tags:'), + '$lbl_keywords' => t('Tags:'), '$gender' => $rr['ggender'], - '$gender_label' => t('Gender:'), + '$lbl_gender' => t('Gender:'), '$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''), '$activity' => array('activity', t('Post a new friend activity'), (intval(get_pconfig(local_user(),'system','post_newfriend')) ? '1' : 0), t('if applicable')), '$url' => $rr['url'], '$zrl' => zrl($rr['url']), - '$url_label' => t('Profile URL'), + '$lbl_url' => t('Profile URL'), '$addr' => $rr['addr'], '$lbl_knowyou' => $lbl_knowyou, '$lbl_network' => t('Network:'), diff --git a/view/templates/intros.tpl b/view/templates/intros.tpl index fa823ca71a..e3933e3815 100644 --- a/view/templates/intros.tpl +++ b/view/templates/intros.tpl @@ -4,11 +4,11 @@

{{$str_notifytype}} {{$notify_type}}

{{$fullname|escape:'html'}} -
{{$url_label}}
{{$url}}
-{{if $location}}
{{$location_label}}
{{$location}}
{{/if}} -{{if $gender}}
{{$gender_label}}
{{$gender}}
{{/if}} -{{if $keywords}}
{{$keywords_label}}
{{$keywords}}
{{/if}} -{{if $about}}
{{$about_label}}
{{$about}}
{{/if}} +
{{$lbl_url}}
{{$url}}
+{{if $location}}
{{$lbl_location}}
{{$location}}
{{/if}} +{{if $gender}}
{{$lbl_gender}}
{{$gender}}
{{/if}} +{{if $keywords}}
{{$lbl_keywords}}
{{$keywords}}
{{/if}} +{{if $about}}
{{$lbl_about}}
{{$about}}
{{/if}}
{{$lbl_knowyou}} {{$knowyou}}
{{$note}}
diff --git a/view/theme/frio/templates/intros.tpl b/view/theme/frio/templates/intros.tpl index 0b09c2dccb..86c7fc342c 100644 --- a/view/theme/frio/templates/intros.tpl +++ b/view/theme/frio/templates/intros.tpl @@ -20,12 +20,12 @@
{{$str_notifytype}}{{$notify_type}}
{{* Additional information of the contact *}} -
{{$url_label}}: {{$url}}
+
{{$lbl_url}}: {{$url}}
{{if $network}}
{{$lbl_network}} {{$network}}
{{/if}} - {{if $location}}
{{$location_label}} {{$location}}
{{/if}} - {{if $gender}}
{{$gender_label}} {{$gender}}
{{/if}} - {{if $keywords}}
{{$keywords_label}} {{$keywords}}
{{/if}} - {{if $about}}
{{$about_label}} {{$about}}
{{/if}} + {{if $location}}
{{$lbl_location}} {{$location}}
{{/if}} + {{if $gender}}
{{$lbl_gender}} {{$gender}}
{{/if}} + {{if $keywords}}
{{$lbl_keywords}} {{$keywords}}
{{/if}} + {{if $about}}
{{$lbl_about}} {{$about}}
{{/if}}
{{$lbl_knowyou}}{{$knowyou}}
{{$note}}
From 84e84a0689b1a112748c2e803e49a9cb400b51dc Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Mon, 1 Aug 2016 07:22:54 +0200 Subject: [PATCH 011/352] Small performance improvements --- include/acl_selectors.php | 8 ++++---- include/text.php | 21 +++++++++++++++------ 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/include/acl_selectors.php b/include/acl_selectors.php index 76f0e0b796..71a42478ba 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -481,11 +481,11 @@ function acl_lookup(&$a, $out_type = 'json') { if ($type=='' || $type=='g'){ $r = q("SELECT `group`.`id`, `group`.`name`, GROUP_CONCAT(DISTINCT `group_member`.`contact-id` SEPARATOR ',') AS uids - FROM `group`,`group_member` - WHERE `group`.`deleted` = 0 AND `group`.`uid` = %d - AND `group_member`.`gid`=`group`.`id` + FROM `group` + INNER JOIN `group_member` ON `group_member`.`gid`=`group`.`id` AND `group_member`.`uid` = `group`.`uid` + WHERE NOT `group`.`deleted` AND `group`.`uid` = %d $sql_extra - GROUP BY `group`.`id` + GROUP BY `group`.`name` ORDER BY `group`.`name` LIMIT %d,%d", intval(local_user()), diff --git a/include/text.php b/include/text.php index 2da9a180ea..3aec42b323 100644 --- a/include/text.php +++ b/include/text.php @@ -872,7 +872,8 @@ function contact_block() { $micropro = Null; } else { - $r = q("SELECT `id`, `uid`, `addr`, `url`, `name`, `thumb`, `network` FROM `contact` + // Splitting the query in two parts makes it much faster + $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `hidden` AND NOT `archive` AND `network` IN ('%s', '%s', '%s') ORDER BY RAND() LIMIT %d", @@ -882,11 +883,19 @@ function contact_block() { dbesc(NETWORK_DIASPORA), intval($shown) ); - if(count($r)) { - $contacts = sprintf( tt('%d Contact','%d Contacts', $total),$total); - $micropro = Array(); - foreach($r as $rr) { - $micropro[] = micropro($rr,true,'mpfriend'); + if ($r) { + $contacts = ""; + foreach ($r AS $contact) + $contacts[] = $contact["id"]; + + $r = q("SELECT `id`, `uid`, `addr`, `url`, `name`, `thumb`, `network` FROM `contact` WHERE `id` IN (%s)", + dbesc(implode(",", $contacts))); + if(count($r)) { + $contacts = sprintf( tt('%d Contact','%d Contacts', $total),$total); + $micropro = Array(); + foreach($r as $rr) { + $micropro[] = micropro($rr,true,'mpfriend'); + } } } } From 39d149bf7c53c052b19d212a35c3134feb465f51 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Mon, 1 Aug 2016 07:46:21 +0200 Subject: [PATCH 012/352] regenerated master messages.po file --- util/messages.po | 4545 +++++++++++++++++++++++----------------------- 1 file changed, 2273 insertions(+), 2272 deletions(-) diff --git a/util/messages.po b/util/messages.po index e71198c698..ac303b20e4 100644 --- a/util/messages.po +++ b/util/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-08 19:22+0200\n" +"POT-Creation-Date: 2016-08-01 07:44+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,88 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" -#: boot.php:887 -msgid "Delete this item?" -msgstr "" - -#: boot.php:888 mod/content.php:727 mod/content.php:945 mod/photos.php:1616 -#: mod/photos.php:1664 mod/photos.php:1752 object/Item.php:403 -#: object/Item.php:719 -msgid "Comment" -msgstr "" - -#: boot.php:889 include/contact_widgets.php:242 include/ForumManager.php:119 -#: include/items.php:2122 mod/content.php:624 object/Item.php:432 -#: view/theme/vier/theme.php:260 -msgid "show more" -msgstr "" - -#: boot.php:890 -msgid "show fewer" -msgstr "" - -#: boot.php:1483 -#, php-format -msgid "Update %s failed. See error logs." -msgstr "" - -#: boot.php:1595 -msgid "Create a New Account" -msgstr "" - -#: boot.php:1596 include/nav.php:111 mod/register.php:280 -msgid "Register" -msgstr "" - -#: boot.php:1620 include/nav.php:75 view/theme/frio/theme.php:243 -msgid "Logout" -msgstr "" - -#: boot.php:1621 include/nav.php:94 mod/bookmarklet.php:12 -msgid "Login" -msgstr "" - -#: boot.php:1623 mod/lostpass.php:161 -msgid "Nickname or Email: " -msgstr "" - -#: boot.php:1624 -msgid "Password: " -msgstr "" - -#: boot.php:1625 -msgid "Remember me" -msgstr "" - -#: boot.php:1628 -msgid "Or login using OpenID: " -msgstr "" - -#: boot.php:1634 -msgid "Forgot your password?" -msgstr "" - -#: boot.php:1635 mod/lostpass.php:109 -msgid "Password Reset" -msgstr "" - -#: boot.php:1637 -msgid "Website Terms of Service" -msgstr "" - -#: boot.php:1638 -msgid "terms of service" -msgstr "" - -#: boot.php:1640 -msgid "Website Privacy Policy" -msgstr "" - -#: boot.php:1641 -msgid "privacy policy" -msgstr "" - -#: include/datetime.php:57 include/datetime.php:59 mod/profiles.php:698 +#: include/datetime.php:57 include/datetime.php:59 mod/profiles.php:699 msgid "Miscellaneous" msgstr "" @@ -107,7 +26,7 @@ msgstr "" msgid "Birthday:" msgstr "" -#: include/datetime.php:185 mod/profiles.php:721 +#: include/datetime.php:185 mod/profiles.php:722 msgid "Age: " msgstr "" @@ -231,8 +150,8 @@ msgstr "" #: include/contact_widgets.php:32 include/conversation.php:978 #: include/Contact.php:324 mod/dirfind.php:204 mod/match.php:72 -#: mod/allfriends.php:66 mod/contacts.php:600 mod/follow.php:103 -#: mod/suggest.php:83 +#: mod/allfriends.php:66 mod/follow.php:103 mod/suggest.php:83 +#: mod/contacts.php:602 msgid "Connect/Follow" msgstr "" @@ -240,7 +159,7 @@ msgstr "" msgid "Examples: Robert Morgenstein, Fishing" msgstr "" -#: include/contact_widgets.php:34 mod/directory.php:212 mod/contacts.php:791 +#: include/contact_widgets.php:34 mod/directory.php:212 mod/contacts.php:796 msgid "Find" msgstr "" @@ -290,6 +209,12 @@ msgid_plural "%d contacts in common" msgstr[0] "" msgstr[1] "" +#: include/contact_widgets.php:242 include/ForumManager.php:119 +#: include/items.php:2122 mod/content.php:624 object/Item.php:432 +#: view/theme/vier/theme.php:260 boot.php:889 +msgid "show more" +msgstr "" + #: include/enotify.php:24 msgid "Friendica Notification" msgstr "" @@ -586,18 +511,6 @@ msgstr "" msgid "Please visit %s to approve or reject the request." msgstr "" -#: include/plugin.php:522 include/plugin.php:524 -msgid "Click here to upgrade." -msgstr "" - -#: include/plugin.php:530 -msgid "This action exceeds the limits set by your subscription plan." -msgstr "" - -#: include/plugin.php:535 -msgid "This action is not available under your subscription plan." -msgstr "" - #: include/ForumManager.php:114 include/text.php:998 include/nav.php:130 #: view/theme/vier/theme.php:255 msgid "Forums" @@ -607,28 +520,6 @@ msgstr "" msgid "External link to forum" msgstr "" -#: include/diaspora.php:1379 include/conversation.php:141 include/like.php:182 -#: view/theme/diabook/theme.php:480 -#, php-format -msgid "%1$s likes %2$s's %3$s" -msgstr "" - -#: include/diaspora.php:1383 include/conversation.php:125 -#: include/conversation.php:134 include/conversation.php:261 -#: include/conversation.php:270 include/like.php:163 mod/tagger.php:62 -#: mod/subthread.php:87 view/theme/diabook/theme.php:466 -#: view/theme/diabook/theme.php:475 -msgid "status" -msgstr "" - -#: include/diaspora.php:1909 -msgid "Sharing notification from Diaspora network" -msgstr "" - -#: include/diaspora.php:2801 -msgid "Attachments:" -msgstr "" - #: include/dfrn.php:1110 #, php-format msgid "%s\\'s birthday" @@ -688,8 +579,8 @@ msgid "Finishes:" msgstr "" #: include/event.php:39 include/event.php:63 include/identity.php:329 -#: include/bb2diaspora.php:170 mod/notifications.php:246 mod/events.php:495 -#: mod/directory.php:145 mod/contacts.php:624 +#: include/bb2diaspora.php:170 mod/events.php:495 mod/directory.php:145 +#: mod/contacts.php:628 mod/notifications.php:208 msgid "Location:" msgstr "" @@ -1121,7 +1012,7 @@ msgstr "" msgid "Ask me" msgstr "" -#: include/items.php:1447 mod/dfrn_confirm.php:725 mod/dfrn_request.php:744 +#: include/items.php:1447 mod/dfrn_confirm.php:726 mod/dfrn_request.php:745 msgid "[Name Withheld]" msgstr "" @@ -1135,45 +1026,45 @@ msgstr "" msgid "Do you really want to delete this item?" msgstr "" -#: include/items.php:1846 mod/profiles.php:641 mod/profiles.php:644 -#: mod/profiles.php:670 mod/contacts.php:441 mod/follow.php:110 -#: mod/suggest.php:29 mod/dfrn_request.php:860 mod/register.php:238 -#: mod/settings.php:1113 mod/settings.php:1119 mod/settings.php:1127 -#: mod/settings.php:1131 mod/settings.php:1136 mod/settings.php:1142 -#: mod/settings.php:1148 mod/settings.php:1154 mod/settings.php:1180 -#: mod/settings.php:1181 mod/settings.php:1182 mod/settings.php:1183 -#: mod/settings.php:1184 mod/api.php:105 mod/message.php:217 +#: include/items.php:1846 mod/follow.php:110 mod/suggest.php:29 +#: mod/register.php:238 mod/settings.php:1113 mod/settings.php:1119 +#: mod/settings.php:1127 mod/settings.php:1131 mod/settings.php:1136 +#: mod/settings.php:1142 mod/settings.php:1148 mod/settings.php:1154 +#: mod/settings.php:1180 mod/settings.php:1181 mod/settings.php:1182 +#: mod/settings.php:1183 mod/settings.php:1184 mod/api.php:105 +#: mod/message.php:217 mod/contacts.php:442 mod/dfrn_request.php:861 +#: mod/profiles.php:642 mod/profiles.php:645 mod/profiles.php:671 msgid "Yes" msgstr "" #: include/items.php:1849 include/conversation.php:1274 mod/fbrowser.php:101 #: mod/fbrowser.php:136 mod/tagrm.php:11 mod/tagrm.php:94 mod/videos.php:131 -#: mod/photos.php:247 mod/photos.php:336 mod/contacts.php:444 #: mod/follow.php:121 mod/suggest.php:32 mod/editpost.php:148 -#: mod/dfrn_request.php:874 mod/settings.php:664 mod/settings.php:690 -#: mod/message.php:220 +#: mod/settings.php:664 mod/settings.php:690 mod/message.php:220 +#: mod/contacts.php:445 mod/dfrn_request.php:875 mod/photos.php:248 +#: mod/photos.php:337 msgid "Cancel" msgstr "" -#: include/items.php:2011 index.php:397 mod/regmod.php:110 mod/dirfind.php:11 -#: mod/notifications.php:69 mod/dfrn_confirm.php:56 mod/wall_upload.php:77 -#: mod/wall_upload.php:80 mod/fsuggest.php:78 mod/notes.php:22 -#: mod/events.php:190 mod/uimport.php:23 mod/nogroup.php:25 mod/invite.php:15 -#: mod/invite.php:101 mod/viewcontacts.php:45 mod/crepair.php:100 +#: include/items.php:2011 mod/regmod.php:110 mod/dirfind.php:11 +#: mod/wall_upload.php:77 mod/wall_upload.php:80 mod/fsuggest.php:78 +#: mod/notes.php:22 mod/events.php:190 mod/uimport.php:23 mod/nogroup.php:25 +#: mod/invite.php:15 mod/invite.php:101 mod/viewcontacts.php:45 #: mod/wall_attach.php:67 mod/wall_attach.php:70 mod/allfriends.php:12 #: mod/cal.php:308 mod/repair_ostatus.php:9 mod/delegate.php:12 -#: mod/profiles.php:165 mod/profiles.php:598 mod/poke.php:150 -#: mod/photos.php:171 mod/photos.php:1092 mod/attach.php:33 -#: mod/contacts.php:350 mod/follow.php:11 mod/follow.php:73 mod/follow.php:155 -#: mod/suggest.php:58 mod/display.php:474 mod/common.php:18 mod/mood.php:114 -#: mod/editpost.php:10 mod/network.php:4 mod/group.php:19 +#: mod/poke.php:150 mod/attach.php:33 mod/follow.php:11 mod/follow.php:73 +#: mod/follow.php:155 mod/suggest.php:58 mod/display.php:474 mod/common.php:18 +#: mod/mood.php:114 mod/editpost.php:10 mod/network.php:4 mod/group.php:19 #: mod/profile_photo.php:19 mod/profile_photo.php:175 #: mod/profile_photo.php:186 mod/profile_photo.php:199 mod/register.php:42 #: mod/settings.php:22 mod/settings.php:128 mod/settings.php:650 #: mod/wallmessage.php:9 mod/wallmessage.php:33 mod/wallmessage.php:79 #: mod/wallmessage.php:103 mod/api.php:26 mod/api.php:31 mod/item.php:185 #: mod/item.php:197 mod/ostatus_subscribe.php:9 mod/message.php:46 -#: mod/message.php:182 mod/manage.php:96 +#: mod/message.php:182 mod/manage.php:96 mod/contacts.php:350 +#: mod/crepair.php:100 mod/dfrn_confirm.php:57 mod/photos.php:172 +#: mod/photos.php:1093 mod/profiles.php:166 mod/profiles.php:599 +#: mod/notifications.php:65 index.php:397 msgid "Permission denied." msgstr "" @@ -1250,7 +1141,7 @@ msgstr "" #: include/text.php:995 include/identity.php:781 include/identity.php:784 #: include/nav.php:127 include/nav.php:193 mod/viewcontacts.php:116 -#: mod/contacts.php:785 mod/contacts.php:846 view/theme/frio/theme.php:257 +#: mod/contacts.php:790 mod/contacts.php:851 view/theme/frio/theme.php:257 #: view/theme/diabook/theme.php:125 msgid "Contacts" msgstr "" @@ -1403,15 +1294,14 @@ msgstr "" msgid "view on separate page" msgstr "" -#: include/text.php:1779 include/conversation.php:122 -#: include/conversation.php:258 include/like.php:165 -#: view/theme/diabook/theme.php:463 +#: include/text.php:1779 include/like.php:165 include/conversation.php:122 +#: include/conversation.php:258 view/theme/diabook/theme.php:463 msgid "event" msgstr "" -#: include/text.php:1781 include/conversation.php:130 -#: include/conversation.php:266 include/like.php:163 mod/tagger.php:62 -#: mod/subthread.php:87 view/theme/diabook/theme.php:471 +#: include/text.php:1781 include/like.php:163 include/conversation.php:130 +#: include/conversation.php:266 mod/tagger.php:62 mod/subthread.php:87 +#: view/theme/diabook/theme.php:471 msgid "photo" msgstr "" @@ -1434,415 +1324,6 @@ msgstr "" msgid "Item filed" msgstr "" -#: include/conversation.php:144 include/like.php:184 -#, php-format -msgid "%1$s doesn't like %2$s's %3$s" -msgstr "" - -#: include/conversation.php:147 -#, php-format -msgid "%1$s attends %2$s's %3$s" -msgstr "" - -#: include/conversation.php:150 -#, php-format -msgid "%1$s doesn't attend %2$s's %3$s" -msgstr "" - -#: include/conversation.php:153 -#, php-format -msgid "%1$s attends maybe %2$s's %3$s" -msgstr "" - -#: include/conversation.php:185 mod/dfrn_confirm.php:472 -#, php-format -msgid "%1$s is now friends with %2$s" -msgstr "" - -#: include/conversation.php:219 -#, php-format -msgid "%1$s poked %2$s" -msgstr "" - -#: include/conversation.php:239 mod/mood.php:62 -#, php-format -msgid "%1$s is currently %2$s" -msgstr "" - -#: include/conversation.php:278 mod/tagger.php:95 -#, php-format -msgid "%1$s tagged %2$s's %3$s with %4$s" -msgstr "" - -#: include/conversation.php:303 -msgid "post/item" -msgstr "" - -#: include/conversation.php:304 -#, php-format -msgid "%1$s marked %2$s's %3$s as favorite" -msgstr "" - -#: include/conversation.php:587 mod/content.php:372 mod/profiles.php:344 -#: mod/photos.php:1634 -msgid "Likes" -msgstr "" - -#: include/conversation.php:587 mod/content.php:372 mod/profiles.php:348 -#: mod/photos.php:1634 -msgid "Dislikes" -msgstr "" - -#: include/conversation.php:588 include/conversation.php:1471 -#: mod/content.php:373 mod/photos.php:1635 -msgid "Attending" -msgid_plural "Attending" -msgstr[0] "" -msgstr[1] "" - -#: include/conversation.php:588 mod/content.php:373 mod/photos.php:1635 -msgid "Not attending" -msgstr "" - -#: include/conversation.php:588 mod/content.php:373 mod/photos.php:1635 -msgid "Might attend" -msgstr "" - -#: include/conversation.php:710 mod/content.php:453 mod/content.php:758 -#: mod/photos.php:1709 object/Item.php:133 -msgid "Select" -msgstr "" - -#: include/conversation.php:711 mod/admin.php:1388 mod/content.php:454 -#: mod/content.php:759 mod/photos.php:1710 mod/contacts.php:801 -#: mod/contacts.php:1016 mod/group.php:171 mod/settings.php:726 -#: object/Item.php:134 -msgid "Delete" -msgstr "" - -#: include/conversation.php:755 mod/content.php:487 mod/content.php:910 -#: mod/content.php:911 object/Item.php:367 object/Item.php:368 -#, php-format -msgid "View %s's profile @ %s" -msgstr "" - -#: include/conversation.php:767 object/Item.php:355 -msgid "Categories:" -msgstr "" - -#: include/conversation.php:768 object/Item.php:356 -msgid "Filed under:" -msgstr "" - -#: include/conversation.php:775 mod/content.php:497 mod/content.php:923 -#: object/Item.php:381 -#, php-format -msgid "%s from %s" -msgstr "" - -#: include/conversation.php:791 mod/content.php:513 -msgid "View in context" -msgstr "" - -#: include/conversation.php:793 include/conversation.php:1255 -#: mod/content.php:515 mod/content.php:948 mod/photos.php:1597 -#: mod/editpost.php:124 mod/wallmessage.php:156 mod/message.php:356 -#: mod/message.php:548 object/Item.php:406 -msgid "Please wait" -msgstr "" - -#: include/conversation.php:872 -msgid "remove" -msgstr "" - -#: include/conversation.php:876 -msgid "Delete Selected Items" -msgstr "" - -#: include/conversation.php:964 -msgid "Follow Thread" -msgstr "" - -#: include/conversation.php:965 include/Contact.php:364 -msgid "View Status" -msgstr "" - -#: include/conversation.php:966 include/conversation.php:980 -#: include/Contact.php:310 include/Contact.php:323 include/Contact.php:365 -#: mod/dirfind.php:203 mod/directory.php:163 mod/match.php:71 -#: mod/allfriends.php:65 mod/suggest.php:82 -msgid "View Profile" -msgstr "" - -#: include/conversation.php:967 include/Contact.php:366 -msgid "View Photos" -msgstr "" - -#: include/conversation.php:968 include/Contact.php:367 -msgid "Network Posts" -msgstr "" - -#: include/conversation.php:969 include/Contact.php:368 -msgid "Edit Contact" -msgstr "" - -#: include/conversation.php:970 include/Contact.php:370 -msgid "Send PM" -msgstr "" - -#: include/conversation.php:974 include/Contact.php:371 -msgid "Poke" -msgstr "" - -#: include/conversation.php:1088 -#, php-format -msgid "%s likes this." -msgstr "" - -#: include/conversation.php:1091 -#, php-format -msgid "%s doesn't like this." -msgstr "" - -#: include/conversation.php:1094 -#, php-format -msgid "%s attends." -msgstr "" - -#: include/conversation.php:1097 -#, php-format -msgid "%s doesn't attend." -msgstr "" - -#: include/conversation.php:1100 -#, php-format -msgid "%s attends maybe." -msgstr "" - -#: include/conversation.php:1110 -msgid "and" -msgstr "" - -#: include/conversation.php:1116 -#, php-format -msgid ", and %d other people" -msgstr "" - -#: include/conversation.php:1125 -#, php-format -msgid "%2$d people like this" -msgstr "" - -#: include/conversation.php:1126 -#, php-format -msgid "%s like this." -msgstr "" - -#: include/conversation.php:1129 -#, php-format -msgid "%2$d people don't like this" -msgstr "" - -#: include/conversation.php:1130 -#, php-format -msgid "%s don't like this." -msgstr "" - -#: include/conversation.php:1133 -#, php-format -msgid "%2$d people attend" -msgstr "" - -#: include/conversation.php:1134 -#, php-format -msgid "%s attend." -msgstr "" - -#: include/conversation.php:1137 -#, php-format -msgid "%2$d people don't attend" -msgstr "" - -#: include/conversation.php:1138 -#, php-format -msgid "%s don't attend." -msgstr "" - -#: include/conversation.php:1141 -#, php-format -msgid "%2$d people anttend maybe" -msgstr "" - -#: include/conversation.php:1142 -#, php-format -msgid "%s anttend maybe." -msgstr "" - -#: include/conversation.php:1181 include/conversation.php:1199 -msgid "Visible to everybody" -msgstr "" - -#: include/conversation.php:1182 include/conversation.php:1200 -#: mod/wallmessage.php:127 mod/wallmessage.php:135 mod/message.php:291 -#: mod/message.php:299 mod/message.php:442 mod/message.php:450 -msgid "Please enter a link URL:" -msgstr "" - -#: include/conversation.php:1183 include/conversation.php:1201 -msgid "Please enter a video link/URL:" -msgstr "" - -#: include/conversation.php:1184 include/conversation.php:1202 -msgid "Please enter an audio link/URL:" -msgstr "" - -#: include/conversation.php:1185 include/conversation.php:1203 -msgid "Tag term:" -msgstr "" - -#: include/conversation.php:1186 include/conversation.php:1204 -#: mod/filer.php:30 -msgid "Save to Folder:" -msgstr "" - -#: include/conversation.php:1187 include/conversation.php:1205 -msgid "Where are you right now?" -msgstr "" - -#: include/conversation.php:1188 -msgid "Delete item(s)?" -msgstr "" - -#: include/conversation.php:1236 mod/photos.php:1596 -msgid "Share" -msgstr "" - -#: include/conversation.php:1237 mod/editpost.php:110 mod/wallmessage.php:154 -#: mod/message.php:354 mod/message.php:545 -msgid "Upload photo" -msgstr "" - -#: include/conversation.php:1238 mod/editpost.php:111 -msgid "upload photo" -msgstr "" - -#: include/conversation.php:1239 mod/editpost.php:112 -msgid "Attach file" -msgstr "" - -#: include/conversation.php:1240 mod/editpost.php:113 -msgid "attach file" -msgstr "" - -#: include/conversation.php:1241 mod/editpost.php:114 mod/wallmessage.php:155 -#: mod/message.php:355 mod/message.php:546 -msgid "Insert web link" -msgstr "" - -#: include/conversation.php:1242 mod/editpost.php:115 -msgid "web link" -msgstr "" - -#: include/conversation.php:1243 mod/editpost.php:116 -msgid "Insert video link" -msgstr "" - -#: include/conversation.php:1244 mod/editpost.php:117 -msgid "video link" -msgstr "" - -#: include/conversation.php:1245 mod/editpost.php:118 -msgid "Insert audio link" -msgstr "" - -#: include/conversation.php:1246 mod/editpost.php:119 -msgid "audio link" -msgstr "" - -#: include/conversation.php:1247 mod/editpost.php:120 -msgid "Set your location" -msgstr "" - -#: include/conversation.php:1248 mod/editpost.php:121 -msgid "set location" -msgstr "" - -#: include/conversation.php:1249 mod/editpost.php:122 -msgid "Clear browser location" -msgstr "" - -#: include/conversation.php:1250 mod/editpost.php:123 -msgid "clear location" -msgstr "" - -#: include/conversation.php:1252 mod/editpost.php:137 -msgid "Set title" -msgstr "" - -#: include/conversation.php:1254 mod/editpost.php:139 -msgid "Categories (comma-separated list)" -msgstr "" - -#: include/conversation.php:1256 mod/editpost.php:125 -msgid "Permission settings" -msgstr "" - -#: include/conversation.php:1257 mod/editpost.php:154 -msgid "permissions" -msgstr "" - -#: include/conversation.php:1265 mod/editpost.php:134 -msgid "Public post" -msgstr "" - -#: include/conversation.php:1270 mod/events.php:505 mod/content.php:737 -#: mod/photos.php:1618 mod/photos.php:1666 mod/photos.php:1754 -#: mod/editpost.php:145 object/Item.php:729 -msgid "Preview" -msgstr "" - -#: include/conversation.php:1280 -msgid "Post to Groups" -msgstr "" - -#: include/conversation.php:1281 -msgid "Post to Contacts" -msgstr "" - -#: include/conversation.php:1282 -msgid "Private post" -msgstr "" - -#: include/conversation.php:1287 include/identity.php:250 mod/editpost.php:152 -msgid "Message" -msgstr "" - -#: include/conversation.php:1288 mod/editpost.php:153 -msgid "Browser" -msgstr "" - -#: include/conversation.php:1443 -msgid "View all" -msgstr "" - -#: include/conversation.php:1465 -msgid "Like" -msgid_plural "Likes" -msgstr[0] "" -msgstr[1] "" - -#: include/conversation.php:1468 -msgid "Dislike" -msgid_plural "Dislikes" -msgstr[0] "" -msgstr[1] "" - -#: include/conversation.php:1474 -msgid "Not Attending" -msgid_plural "Not Attending" -msgstr[0] "" -msgstr[1] "" - #: include/identity.php:42 msgid "Requested account is not available." msgstr "" @@ -1859,6 +1340,10 @@ msgstr "" msgid "Atom feed" msgstr "" +#: include/identity.php:250 include/conversation.php:1287 mod/editpost.php:152 +msgid "Message" +msgstr "" + #: include/identity.php:276 include/nav.php:191 msgid "Profiles" msgstr "" @@ -1867,36 +1352,36 @@ msgstr "" msgid "Manage/edit profiles" msgstr "" -#: include/identity.php:281 include/identity.php:307 mod/profiles.php:787 +#: include/identity.php:281 include/identity.php:307 mod/profiles.php:788 msgid "Change profile photo" msgstr "" -#: include/identity.php:282 mod/profiles.php:788 +#: include/identity.php:282 mod/profiles.php:789 msgid "Create New Profile" msgstr "" -#: include/identity.php:292 mod/profiles.php:777 +#: include/identity.php:292 mod/profiles.php:778 msgid "Profile Image" msgstr "" -#: include/identity.php:295 mod/profiles.php:779 +#: include/identity.php:295 mod/profiles.php:780 msgid "visible to everybody" msgstr "" -#: include/identity.php:296 mod/profiles.php:684 mod/profiles.php:780 +#: include/identity.php:296 mod/profiles.php:685 mod/profiles.php:781 msgid "Edit visibility" msgstr "" #: include/identity.php:319 mod/dirfind.php:223 mod/directory.php:174 #: mod/match.php:84 mod/viewcontacts.php:105 mod/allfriends.php:79 -#: mod/cal.php:44 mod/videos.php:37 mod/photos.php:41 mod/contacts.php:51 -#: mod/contacts.php:948 mod/suggest.php:98 mod/hovercard.php:80 -#: mod/common.php:123 mod/network.php:517 +#: mod/cal.php:44 mod/videos.php:37 mod/suggest.php:98 mod/hovercard.php:80 +#: mod/common.php:123 mod/network.php:517 mod/contacts.php:51 +#: mod/contacts.php:626 mod/contacts.php:953 mod/photos.php:42 msgid "Forum" msgstr "" -#: include/identity.php:331 include/identity.php:614 mod/notifications.php:252 -#: mod/directory.php:147 +#: include/identity.php:331 include/identity.php:614 mod/directory.php:147 +#: mod/notifications.php:214 msgid "Gender:" msgstr "" @@ -1908,12 +1393,12 @@ msgstr "" msgid "Homepage:" msgstr "" -#: include/identity.php:338 include/identity.php:655 mod/notifications.php:248 -#: mod/directory.php:153 mod/contacts.php:626 +#: include/identity.php:338 include/identity.php:655 mod/directory.php:153 +#: mod/contacts.php:630 mod/notifications.php:210 msgid "About:" msgstr "" -#: include/identity.php:420 mod/contacts.php:50 +#: include/identity.php:420 mod/contacts.php:50 mod/notifications.php:222 msgid "Network:" msgstr "" @@ -1950,8 +1435,8 @@ msgid "Events this week:" msgstr "" #: include/identity.php:603 include/identity.php:689 include/identity.php:720 -#: include/nav.php:79 mod/profperm.php:104 mod/contacts.php:834 -#: mod/newmember.php:32 view/theme/frio/theme.php:247 +#: include/nav.php:79 mod/profperm.php:104 mod/newmember.php:32 +#: mod/contacts.php:637 mod/contacts.php:839 view/theme/frio/theme.php:247 #: view/theme/diabook/theme.php:124 msgid "Profile" msgstr "" @@ -1977,20 +1462,20 @@ msgstr "" msgid "for %1$d %2$s" msgstr "" -#: include/identity.php:643 mod/profiles.php:703 +#: include/identity.php:643 mod/profiles.php:704 msgid "Sexual Preference:" msgstr "" -#: include/identity.php:647 mod/profiles.php:729 +#: include/identity.php:647 mod/profiles.php:730 msgid "Hometown:" msgstr "" -#: include/identity.php:649 mod/notifications.php:250 mod/contacts.php:628 -#: mod/follow.php:134 +#: include/identity.php:649 mod/follow.php:134 mod/contacts.php:632 +#: mod/notifications.php:212 msgid "Tags:" msgstr "" -#: include/identity.php:651 mod/profiles.php:730 +#: include/identity.php:651 mod/profiles.php:731 msgid "Political Views:" msgstr "" @@ -2002,11 +1487,11 @@ msgstr "" msgid "Hobbies/Interests:" msgstr "" -#: include/identity.php:659 mod/profiles.php:734 +#: include/identity.php:659 mod/profiles.php:735 msgid "Likes:" msgstr "" -#: include/identity.php:661 mod/profiles.php:735 +#: include/identity.php:661 mod/profiles.php:736 msgid "Dislikes:" msgstr "" @@ -2051,20 +1536,20 @@ msgid "Basic" msgstr "" #: include/identity.php:691 mod/events.php:509 mod/admin.php:928 -#: mod/contacts.php:863 +#: mod/contacts.php:868 msgid "Advanced" msgstr "" -#: include/identity.php:712 include/nav.php:78 mod/contacts.php:631 -#: mod/contacts.php:826 view/theme/frio/theme.php:246 +#: include/identity.php:712 include/nav.php:78 mod/contacts.php:635 +#: mod/contacts.php:831 view/theme/frio/theme.php:246 msgid "Status" msgstr "" -#: include/identity.php:715 mod/contacts.php:829 mod/follow.php:143 +#: include/identity.php:715 mod/follow.php:143 mod/contacts.php:834 msgid "Status Messages and Posts" msgstr "" -#: include/identity.php:723 mod/contacts.php:837 +#: include/identity.php:723 mod/contacts.php:842 msgid "Profile Details" msgstr "" @@ -2073,7 +1558,7 @@ msgstr "" msgid "Photos" msgstr "" -#: include/identity.php:731 mod/photos.php:99 +#: include/identity.php:731 mod/photos.php:100 msgid "Photo Albums" msgstr "" @@ -2102,11 +1587,7 @@ msgstr "" msgid "Only You Can See This" msgstr "" -#: include/Scrape.php:656 -msgid " on Last.fm" -msgstr "" - -#: include/follow.php:77 mod/dfrn_request.php:506 +#: include/follow.php:77 mod/dfrn_request.php:507 msgid "Disallowed profile URL." msgstr "" @@ -2165,14 +1646,6 @@ msgstr "" msgid "following" msgstr "" -#: include/Contact.php:119 -msgid "stopped following" -msgstr "" - -#: include/Contact.php:369 -msgid "Drop Contact" -msgstr "" - #: include/oembed.php:229 msgid "Embedded content" msgstr "" @@ -2198,150 +1671,6 @@ msgstr "" msgid "Encrypted content" msgstr "" -#: include/contact_selectors.php:32 -msgid "Unknown | Not categorised" -msgstr "" - -#: include/contact_selectors.php:33 -msgid "Block immediately" -msgstr "" - -#: include/contact_selectors.php:34 -msgid "Shady, spammer, self-marketer" -msgstr "" - -#: include/contact_selectors.php:35 -msgid "Known to me, but no opinion" -msgstr "" - -#: include/contact_selectors.php:36 -msgid "OK, probably harmless" -msgstr "" - -#: include/contact_selectors.php:37 -msgid "Reputable, has my trust" -msgstr "" - -#: include/contact_selectors.php:56 mod/admin.php:859 -msgid "Frequently" -msgstr "" - -#: include/contact_selectors.php:57 mod/admin.php:860 -msgid "Hourly" -msgstr "" - -#: include/contact_selectors.php:58 mod/admin.php:861 -msgid "Twice daily" -msgstr "" - -#: include/contact_selectors.php:59 mod/admin.php:862 -msgid "Daily" -msgstr "" - -#: include/contact_selectors.php:60 -msgid "Weekly" -msgstr "" - -#: include/contact_selectors.php:61 -msgid "Monthly" -msgstr "" - -#: include/contact_selectors.php:76 mod/dfrn_request.php:866 -msgid "Friendica" -msgstr "" - -#: include/contact_selectors.php:77 -msgid "OStatus" -msgstr "" - -#: include/contact_selectors.php:78 -msgid "RSS/Atom" -msgstr "" - -#: include/contact_selectors.php:79 include/contact_selectors.php:86 -#: mod/admin.php:1371 mod/admin.php:1384 mod/admin.php:1396 mod/admin.php:1414 -msgid "Email" -msgstr "" - -#: include/contact_selectors.php:80 mod/dfrn_request.php:868 -#: mod/settings.php:827 -msgid "Diaspora" -msgstr "" - -#: include/contact_selectors.php:81 -msgid "Facebook" -msgstr "" - -#: include/contact_selectors.php:82 -msgid "Zot!" -msgstr "" - -#: include/contact_selectors.php:83 -msgid "LinkedIn" -msgstr "" - -#: include/contact_selectors.php:84 -msgid "XMPP/IM" -msgstr "" - -#: include/contact_selectors.php:85 -msgid "MySpace" -msgstr "" - -#: include/contact_selectors.php:87 -msgid "Google+" -msgstr "" - -#: include/contact_selectors.php:88 -msgid "pump.io" -msgstr "" - -#: include/contact_selectors.php:89 -msgid "Twitter" -msgstr "" - -#: include/contact_selectors.php:90 -msgid "Diaspora Connector" -msgstr "" - -#: include/contact_selectors.php:91 -msgid "GNU Social" -msgstr "" - -#: include/contact_selectors.php:92 -msgid "App.net" -msgstr "" - -#: include/contact_selectors.php:103 -msgid "Hubzilla/Redmatrix" -msgstr "" - -#: include/dbstructure.php:26 -#, php-format -msgid "" -"\n" -"\t\t\tThe friendica developers released update %s recently,\n" -"\t\t\tbut when I tried to install it, something went terribly wrong.\n" -"\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n" -"\t\t\tfriendica developer if you can not help me on your own. My database " -"might be invalid." -msgstr "" - -#: include/dbstructure.php:31 -#, php-format -msgid "" -"The error message is\n" -"[pre]%s[/pre]" -msgstr "" - -#: include/dbstructure.php:153 -msgid "Errors encountered creating database tables." -msgstr "" - -#: include/dbstructure.php:230 -msgid "Errors encountered performing database changes." -msgstr "" - #: include/auth.php:45 msgid "Logged out." msgstr "" @@ -2360,10 +1689,6 @@ msgstr "" msgid "The error message was:" msgstr "" -#: include/network.php:913 -msgid "view full size" -msgstr "" - #: include/group.php:25 msgid "" "A deleted group with this name was revived. Existing item permissions " @@ -2496,11 +1821,11 @@ msgid "An error occurred creating your default profile. Please try again." msgstr "" #: include/user.php:345 include/user.php:352 include/user.php:359 -#: mod/photos.php:78 mod/photos.php:192 mod/photos.php:769 mod/photos.php:1232 -#: mod/photos.php:1255 mod/photos.php:1849 mod/profile_photo.php:74 -#: mod/profile_photo.php:81 mod/profile_photo.php:88 mod/profile_photo.php:210 -#: mod/profile_photo.php:302 mod/profile_photo.php:311 -#: view/theme/diabook/theme.php:500 +#: mod/profile_photo.php:74 mod/profile_photo.php:81 mod/profile_photo.php:88 +#: mod/profile_photo.php:210 mod/profile_photo.php:302 +#: mod/profile_photo.php:311 mod/photos.php:79 mod/photos.php:193 +#: mod/photos.php:770 mod/photos.php:1233 mod/photos.php:1256 +#: mod/photos.php:1850 view/theme/diabook/theme.php:500 msgid "Profile Photos" msgstr "" @@ -2553,21 +1878,6 @@ msgstr "" msgid "Registration details for %s" msgstr "" -#: include/api.php:905 -#, php-format -msgid "Daily posting limit of %d posts reached. The post was rejected." -msgstr "" - -#: include/api.php:925 -#, php-format -msgid "Weekly posting limit of %d posts reached. The post was rejected." -msgstr "" - -#: include/api.php:946 -#, php-format -msgid "Monthly posting limit of %d posts reached. The post was rejected." -msgstr "" - #: include/features.php:63 msgid "General Features" msgstr "" @@ -2779,6 +2089,10 @@ msgstr "" msgid "Clear notifications" msgstr "" +#: include/nav.php:75 view/theme/frio/theme.php:243 boot.php:1620 +msgid "Logout" +msgstr "" + #: include/nav.php:75 view/theme/frio/theme.php:243 msgid "End this session" msgstr "" @@ -2815,11 +2129,15 @@ msgstr "" msgid "Your personal notes" msgstr "" +#: include/nav.php:94 mod/bookmarklet.php:12 boot.php:1621 +msgid "Login" +msgstr "" + #: include/nav.php:94 msgid "Sign in" msgstr "" -#: include/nav.php:107 include/nav.php:163 mod/notifications.php:99 +#: include/nav.php:107 include/nav.php:163 mod/notifications.php:545 #: view/theme/diabook/theme.php:123 msgid "Home" msgstr "" @@ -2828,6 +2146,10 @@ msgstr "" msgid "Home Page" msgstr "" +#: include/nav.php:111 mod/register.php:280 boot.php:1596 +msgid "Register" +msgstr "" + #: include/nav.php:111 msgid "Create an account" msgstr "" @@ -2881,7 +2203,7 @@ msgstr "" msgid "Information about this friendica instance" msgstr "" -#: include/nav.php:160 mod/notifications.php:87 mod/admin.php:402 +#: include/nav.php:160 mod/admin.php:402 mod/notifications.php:533 #: view/theme/frio/theme.php:253 msgid "Network" msgstr "" @@ -2898,7 +2220,7 @@ msgstr "" msgid "Load Network page with no filters" msgstr "" -#: include/nav.php:168 mod/notifications.php:105 +#: include/nav.php:168 mod/notifications.php:551 msgid "Introductions" msgstr "" @@ -2906,7 +2228,7 @@ msgstr "" msgid "Friend Requests" msgstr "" -#: include/nav.php:171 mod/notifications.php:271 +#: include/nav.php:171 mod/notifications.php:87 msgid "Notifications" msgstr "" @@ -2992,6 +2314,25 @@ msgstr "" msgid "Site map" msgstr "" +#: include/like.php:163 include/conversation.php:125 +#: include/conversation.php:134 include/conversation.php:261 +#: include/conversation.php:270 include/diaspora.php:1402 mod/tagger.php:62 +#: mod/subthread.php:87 view/theme/diabook/theme.php:466 +#: view/theme/diabook/theme.php:475 +msgid "status" +msgstr "" + +#: include/like.php:182 include/conversation.php:141 include/diaspora.php:1398 +#: view/theme/diabook/theme.php:480 +#, php-format +msgid "%1$s likes %2$s's %3$s" +msgstr "" + +#: include/like.php:184 include/conversation.php:144 +#, php-format +msgid "%1$s doesn't like %2$s's %3$s" +msgstr "" + #: include/like.php:186 #, php-format msgid "%1$s is attending %2$s's %3$s" @@ -3007,6 +2348,10 @@ msgstr "" msgid "%1$s may attend %2$s's %3$s" msgstr "" +#: include/message.php:15 include/message.php:173 +msgid "[no subject]" +msgstr "" + #: include/acl_selectors.php:327 msgid "Post to Email" msgstr "" @@ -3042,7 +2387,7 @@ msgstr "" msgid "Example: bob@example.com, mary@example.com" msgstr "" -#: include/acl_selectors.php:349 mod/photos.php:1177 mod/photos.php:1562 +#: include/acl_selectors.php:349 mod/photos.php:1178 mod/photos.php:1563 msgid "Permissions" msgstr "" @@ -3050,29 +2395,595 @@ msgstr "" msgid "Close" msgstr "" -#: include/message.php:15 include/message.php:173 -msgid "[no subject]" +#: include/contact_selectors.php:32 +msgid "Unknown | Not categorised" msgstr "" -#: index.php:240 mod/apps.php:7 -msgid "You must be logged in to use addons. " +#: include/contact_selectors.php:33 +msgid "Block immediately" msgstr "" -#: index.php:284 mod/help.php:53 mod/p.php:16 mod/p.php:43 mod/p.php:52 -#: mod/fetch.php:12 mod/fetch.php:39 mod/fetch.php:48 -msgid "Not Found" +#: include/contact_selectors.php:34 +msgid "Shady, spammer, self-marketer" msgstr "" -#: index.php:287 mod/help.php:56 -msgid "Page not found." +#: include/contact_selectors.php:35 +msgid "Known to me, but no opinion" msgstr "" -#: index.php:396 mod/profperm.php:19 mod/group.php:72 -msgid "Permission denied" +#: include/contact_selectors.php:36 +msgid "OK, probably harmless" msgstr "" -#: index.php:447 -msgid "toggle mobile" +#: include/contact_selectors.php:37 +msgid "Reputable, has my trust" +msgstr "" + +#: include/contact_selectors.php:56 mod/admin.php:859 +msgid "Frequently" +msgstr "" + +#: include/contact_selectors.php:57 mod/admin.php:860 +msgid "Hourly" +msgstr "" + +#: include/contact_selectors.php:58 mod/admin.php:861 +msgid "Twice daily" +msgstr "" + +#: include/contact_selectors.php:59 mod/admin.php:862 +msgid "Daily" +msgstr "" + +#: include/contact_selectors.php:60 +msgid "Weekly" +msgstr "" + +#: include/contact_selectors.php:61 +msgid "Monthly" +msgstr "" + +#: include/contact_selectors.php:76 mod/dfrn_request.php:867 +msgid "Friendica" +msgstr "" + +#: include/contact_selectors.php:77 +msgid "OStatus" +msgstr "" + +#: include/contact_selectors.php:78 +msgid "RSS/Atom" +msgstr "" + +#: include/contact_selectors.php:79 include/contact_selectors.php:86 +#: mod/admin.php:1371 mod/admin.php:1384 mod/admin.php:1396 mod/admin.php:1414 +msgid "Email" +msgstr "" + +#: include/contact_selectors.php:80 mod/settings.php:827 +#: mod/dfrn_request.php:869 +msgid "Diaspora" +msgstr "" + +#: include/contact_selectors.php:81 +msgid "Facebook" +msgstr "" + +#: include/contact_selectors.php:82 +msgid "Zot!" +msgstr "" + +#: include/contact_selectors.php:83 +msgid "LinkedIn" +msgstr "" + +#: include/contact_selectors.php:84 +msgid "XMPP/IM" +msgstr "" + +#: include/contact_selectors.php:85 +msgid "MySpace" +msgstr "" + +#: include/contact_selectors.php:87 +msgid "Google+" +msgstr "" + +#: include/contact_selectors.php:88 +msgid "pump.io" +msgstr "" + +#: include/contact_selectors.php:89 +msgid "Twitter" +msgstr "" + +#: include/contact_selectors.php:90 +msgid "Diaspora Connector" +msgstr "" + +#: include/contact_selectors.php:91 +msgid "GNU Social" +msgstr "" + +#: include/contact_selectors.php:92 +msgid "App.net" +msgstr "" + +#: include/contact_selectors.php:103 +msgid "Hubzilla/Redmatrix" +msgstr "" + +#: include/conversation.php:147 +#, php-format +msgid "%1$s attends %2$s's %3$s" +msgstr "" + +#: include/conversation.php:150 +#, php-format +msgid "%1$s doesn't attend %2$s's %3$s" +msgstr "" + +#: include/conversation.php:153 +#, php-format +msgid "%1$s attends maybe %2$s's %3$s" +msgstr "" + +#: include/conversation.php:185 mod/dfrn_confirm.php:473 +#, php-format +msgid "%1$s is now friends with %2$s" +msgstr "" + +#: include/conversation.php:219 +#, php-format +msgid "%1$s poked %2$s" +msgstr "" + +#: include/conversation.php:239 mod/mood.php:62 +#, php-format +msgid "%1$s is currently %2$s" +msgstr "" + +#: include/conversation.php:278 mod/tagger.php:95 +#, php-format +msgid "%1$s tagged %2$s's %3$s with %4$s" +msgstr "" + +#: include/conversation.php:303 +msgid "post/item" +msgstr "" + +#: include/conversation.php:304 +#, php-format +msgid "%1$s marked %2$s's %3$s as favorite" +msgstr "" + +#: include/conversation.php:587 mod/photos.php:1635 mod/profiles.php:345 +#: mod/content.php:372 +msgid "Likes" +msgstr "" + +#: include/conversation.php:587 mod/photos.php:1635 mod/profiles.php:349 +#: mod/content.php:372 +msgid "Dislikes" +msgstr "" + +#: include/conversation.php:588 include/conversation.php:1471 +#: mod/photos.php:1636 mod/content.php:373 +msgid "Attending" +msgid_plural "Attending" +msgstr[0] "" +msgstr[1] "" + +#: include/conversation.php:588 mod/photos.php:1636 mod/content.php:373 +msgid "Not attending" +msgstr "" + +#: include/conversation.php:588 mod/photos.php:1636 mod/content.php:373 +msgid "Might attend" +msgstr "" + +#: include/conversation.php:710 mod/photos.php:1710 mod/content.php:453 +#: mod/content.php:758 object/Item.php:133 +msgid "Select" +msgstr "" + +#: include/conversation.php:711 mod/admin.php:1388 mod/group.php:171 +#: mod/settings.php:726 mod/contacts.php:806 mod/contacts.php:1021 +#: mod/photos.php:1711 mod/content.php:454 mod/content.php:759 +#: object/Item.php:134 +msgid "Delete" +msgstr "" + +#: include/conversation.php:755 mod/content.php:487 mod/content.php:910 +#: mod/content.php:911 object/Item.php:367 object/Item.php:368 +#, php-format +msgid "View %s's profile @ %s" +msgstr "" + +#: include/conversation.php:767 object/Item.php:355 +msgid "Categories:" +msgstr "" + +#: include/conversation.php:768 object/Item.php:356 +msgid "Filed under:" +msgstr "" + +#: include/conversation.php:775 mod/content.php:497 mod/content.php:923 +#: object/Item.php:381 +#, php-format +msgid "%s from %s" +msgstr "" + +#: include/conversation.php:791 mod/content.php:513 +msgid "View in context" +msgstr "" + +#: include/conversation.php:793 include/conversation.php:1255 +#: mod/editpost.php:124 mod/wallmessage.php:156 mod/message.php:356 +#: mod/message.php:548 mod/photos.php:1598 mod/content.php:515 +#: mod/content.php:948 object/Item.php:406 +msgid "Please wait" +msgstr "" + +#: include/conversation.php:872 +msgid "remove" +msgstr "" + +#: include/conversation.php:876 +msgid "Delete Selected Items" +msgstr "" + +#: include/conversation.php:964 +msgid "Follow Thread" +msgstr "" + +#: include/conversation.php:965 include/Contact.php:364 +msgid "View Status" +msgstr "" + +#: include/conversation.php:966 include/conversation.php:980 +#: include/Contact.php:310 include/Contact.php:323 include/Contact.php:365 +#: mod/dirfind.php:203 mod/directory.php:163 mod/match.php:71 +#: mod/allfriends.php:65 mod/suggest.php:82 +msgid "View Profile" +msgstr "" + +#: include/conversation.php:967 include/Contact.php:366 +msgid "View Photos" +msgstr "" + +#: include/conversation.php:968 include/Contact.php:367 +msgid "Network Posts" +msgstr "" + +#: include/conversation.php:969 include/Contact.php:368 +msgid "Edit Contact" +msgstr "" + +#: include/conversation.php:970 include/Contact.php:370 +msgid "Send PM" +msgstr "" + +#: include/conversation.php:974 include/Contact.php:371 +msgid "Poke" +msgstr "" + +#: include/conversation.php:1088 +#, php-format +msgid "%s likes this." +msgstr "" + +#: include/conversation.php:1091 +#, php-format +msgid "%s doesn't like this." +msgstr "" + +#: include/conversation.php:1094 +#, php-format +msgid "%s attends." +msgstr "" + +#: include/conversation.php:1097 +#, php-format +msgid "%s doesn't attend." +msgstr "" + +#: include/conversation.php:1100 +#, php-format +msgid "%s attends maybe." +msgstr "" + +#: include/conversation.php:1110 +msgid "and" +msgstr "" + +#: include/conversation.php:1116 +#, php-format +msgid ", and %d other people" +msgstr "" + +#: include/conversation.php:1125 +#, php-format +msgid "%2$d people like this" +msgstr "" + +#: include/conversation.php:1126 +#, php-format +msgid "%s like this." +msgstr "" + +#: include/conversation.php:1129 +#, php-format +msgid "%2$d people don't like this" +msgstr "" + +#: include/conversation.php:1130 +#, php-format +msgid "%s don't like this." +msgstr "" + +#: include/conversation.php:1133 +#, php-format +msgid "%2$d people attend" +msgstr "" + +#: include/conversation.php:1134 +#, php-format +msgid "%s attend." +msgstr "" + +#: include/conversation.php:1137 +#, php-format +msgid "%2$d people don't attend" +msgstr "" + +#: include/conversation.php:1138 +#, php-format +msgid "%s don't attend." +msgstr "" + +#: include/conversation.php:1141 +#, php-format +msgid "%2$d people anttend maybe" +msgstr "" + +#: include/conversation.php:1142 +#, php-format +msgid "%s anttend maybe." +msgstr "" + +#: include/conversation.php:1181 include/conversation.php:1199 +msgid "Visible to everybody" +msgstr "" + +#: include/conversation.php:1182 include/conversation.php:1200 +#: mod/wallmessage.php:127 mod/wallmessage.php:135 mod/message.php:291 +#: mod/message.php:299 mod/message.php:442 mod/message.php:450 +msgid "Please enter a link URL:" +msgstr "" + +#: include/conversation.php:1183 include/conversation.php:1201 +msgid "Please enter a video link/URL:" +msgstr "" + +#: include/conversation.php:1184 include/conversation.php:1202 +msgid "Please enter an audio link/URL:" +msgstr "" + +#: include/conversation.php:1185 include/conversation.php:1203 +msgid "Tag term:" +msgstr "" + +#: include/conversation.php:1186 include/conversation.php:1204 +#: mod/filer.php:30 +msgid "Save to Folder:" +msgstr "" + +#: include/conversation.php:1187 include/conversation.php:1205 +msgid "Where are you right now?" +msgstr "" + +#: include/conversation.php:1188 +msgid "Delete item(s)?" +msgstr "" + +#: include/conversation.php:1236 mod/photos.php:1597 +msgid "Share" +msgstr "" + +#: include/conversation.php:1237 mod/editpost.php:110 mod/wallmessage.php:154 +#: mod/message.php:354 mod/message.php:545 +msgid "Upload photo" +msgstr "" + +#: include/conversation.php:1238 mod/editpost.php:111 +msgid "upload photo" +msgstr "" + +#: include/conversation.php:1239 mod/editpost.php:112 +msgid "Attach file" +msgstr "" + +#: include/conversation.php:1240 mod/editpost.php:113 +msgid "attach file" +msgstr "" + +#: include/conversation.php:1241 mod/editpost.php:114 mod/wallmessage.php:155 +#: mod/message.php:355 mod/message.php:546 +msgid "Insert web link" +msgstr "" + +#: include/conversation.php:1242 mod/editpost.php:115 +msgid "web link" +msgstr "" + +#: include/conversation.php:1243 mod/editpost.php:116 +msgid "Insert video link" +msgstr "" + +#: include/conversation.php:1244 mod/editpost.php:117 +msgid "video link" +msgstr "" + +#: include/conversation.php:1245 mod/editpost.php:118 +msgid "Insert audio link" +msgstr "" + +#: include/conversation.php:1246 mod/editpost.php:119 +msgid "audio link" +msgstr "" + +#: include/conversation.php:1247 mod/editpost.php:120 +msgid "Set your location" +msgstr "" + +#: include/conversation.php:1248 mod/editpost.php:121 +msgid "set location" +msgstr "" + +#: include/conversation.php:1249 mod/editpost.php:122 +msgid "Clear browser location" +msgstr "" + +#: include/conversation.php:1250 mod/editpost.php:123 +msgid "clear location" +msgstr "" + +#: include/conversation.php:1252 mod/editpost.php:137 +msgid "Set title" +msgstr "" + +#: include/conversation.php:1254 mod/editpost.php:139 +msgid "Categories (comma-separated list)" +msgstr "" + +#: include/conversation.php:1256 mod/editpost.php:125 +msgid "Permission settings" +msgstr "" + +#: include/conversation.php:1257 mod/editpost.php:154 +msgid "permissions" +msgstr "" + +#: include/conversation.php:1265 mod/editpost.php:134 +msgid "Public post" +msgstr "" + +#: include/conversation.php:1270 mod/events.php:505 mod/editpost.php:145 +#: mod/photos.php:1619 mod/photos.php:1667 mod/photos.php:1755 +#: mod/content.php:737 object/Item.php:729 +msgid "Preview" +msgstr "" + +#: include/conversation.php:1280 +msgid "Post to Groups" +msgstr "" + +#: include/conversation.php:1281 +msgid "Post to Contacts" +msgstr "" + +#: include/conversation.php:1282 +msgid "Private post" +msgstr "" + +#: include/conversation.php:1288 mod/editpost.php:153 +msgid "Browser" +msgstr "" + +#: include/conversation.php:1443 +msgid "View all" +msgstr "" + +#: include/conversation.php:1465 +msgid "Like" +msgid_plural "Likes" +msgstr[0] "" +msgstr[1] "" + +#: include/conversation.php:1468 +msgid "Dislike" +msgid_plural "Dislikes" +msgstr[0] "" +msgstr[1] "" + +#: include/conversation.php:1474 +msgid "Not Attending" +msgid_plural "Not Attending" +msgstr[0] "" +msgstr[1] "" + +#: include/diaspora.php:1954 +msgid "Sharing notification from Diaspora network" +msgstr "" + +#: include/diaspora.php:2854 +msgid "Attachments:" +msgstr "" + +#: include/network.php:595 +msgid "view full size" +msgstr "" + +#: include/plugin.php:522 include/plugin.php:524 +msgid "Click here to upgrade." +msgstr "" + +#: include/plugin.php:530 +msgid "This action exceeds the limits set by your subscription plan." +msgstr "" + +#: include/plugin.php:535 +msgid "This action is not available under your subscription plan." +msgstr "" + +#: include/Contact.php:119 +msgid "stopped following" +msgstr "" + +#: include/Contact.php:369 +msgid "Drop Contact" +msgstr "" + +#: include/api.php:974 +#, php-format +msgid "Daily posting limit of %d posts reached. The post was rejected." +msgstr "" + +#: include/api.php:994 +#, php-format +msgid "Weekly posting limit of %d posts reached. The post was rejected." +msgstr "" + +#: include/api.php:1015 +#, php-format +msgid "Monthly posting limit of %d posts reached. The post was rejected." +msgstr "" + +#: include/dbstructure.php:26 +#, php-format +msgid "" +"\n" +"\t\t\tThe friendica developers released update %s recently,\n" +"\t\t\tbut when I tried to install it, something went terribly wrong.\n" +"\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n" +"\t\t\tfriendica developer if you can not help me on your own. My database " +"might be invalid." +msgstr "" + +#: include/dbstructure.php:31 +#, php-format +msgid "" +"The error message is\n" +"[pre]%s[/pre]" +msgstr "" + +#: include/dbstructure.php:153 +msgid "Errors encountered creating database tables." +msgstr "" + +#: include/dbstructure.php:230 +msgid "Errors encountered performing database changes." msgstr "" #: mod/regmod.php:55 @@ -3121,11 +3032,11 @@ msgstr "" msgid "Welcome to %s" msgstr "" -#: mod/notify.php:60 mod/notifications.php:387 +#: mod/notify.php:60 mod/notifications.php:338 msgid "No more system notifications." msgstr "" -#: mod/notify.php:64 mod/notifications.php:391 +#: mod/notify.php:64 mod/notifications.php:318 msgid "System Notifications" msgstr "" @@ -3134,8 +3045,8 @@ msgid "Remove term" msgstr "" #: mod/search.php:93 mod/search.php:99 mod/directory.php:37 -#: mod/viewcontacts.php:35 mod/videos.php:197 mod/photos.php:963 -#: mod/display.php:199 mod/community.php:22 mod/dfrn_request.php:789 +#: mod/viewcontacts.php:35 mod/videos.php:197 mod/display.php:199 +#: mod/community.php:22 mod/dfrn_request.php:790 mod/photos.php:964 msgid "Public access denied." msgstr "" @@ -3160,263 +3071,11 @@ msgstr "" msgid "Items tagged with: %s" msgstr "" -#: mod/search.php:232 mod/contacts.php:790 mod/network.php:146 +#: mod/search.php:232 mod/network.php:146 mod/contacts.php:795 #, php-format msgid "Results for: %s" msgstr "" -#: mod/notifications.php:29 -msgid "Invalid request identifier." -msgstr "" - -#: mod/notifications.php:38 mod/notifications.php:182 -#: mod/notifications.php:262 -msgid "Discard" -msgstr "" - -#: mod/notifications.php:54 mod/notifications.php:181 -#: mod/notifications.php:261 mod/contacts.php:604 mod/contacts.php:799 -#: mod/contacts.php:1000 -msgid "Ignore" -msgstr "" - -#: mod/notifications.php:81 -msgid "System" -msgstr "" - -#: mod/notifications.php:93 mod/profiles.php:696 mod/network.php:844 -msgid "Personal" -msgstr "" - -#: mod/notifications.php:130 -msgid "Show Ignored Requests" -msgstr "" - -#: mod/notifications.php:130 -msgid "Hide Ignored Requests" -msgstr "" - -#: mod/notifications.php:166 mod/notifications.php:236 -msgid "Notification type: " -msgstr "" - -#: mod/notifications.php:167 -msgid "Friend Suggestion" -msgstr "" - -#: mod/notifications.php:169 -#, php-format -msgid "suggested by %s" -msgstr "" - -#: mod/notifications.php:174 mod/notifications.php:253 mod/contacts.php:610 -msgid "Hide this contact from others" -msgstr "" - -#: mod/notifications.php:175 mod/notifications.php:254 -msgid "Post a new friend activity" -msgstr "" - -#: mod/notifications.php:175 mod/notifications.php:254 -msgid "if applicable" -msgstr "" - -#: mod/notifications.php:178 mod/notifications.php:259 mod/admin.php:1386 -msgid "Approve" -msgstr "" - -#: mod/notifications.php:198 -msgid "Claims to be known to you: " -msgstr "" - -#: mod/notifications.php:198 -msgid "yes" -msgstr "" - -#: mod/notifications.php:198 -msgid "no" -msgstr "" - -#: mod/notifications.php:199 -msgid "" -"Shall your connection be bidirectional or not? \"Friend\" implies that you " -"allow to read and you subscribe to their posts. \"Fan/Admirer\" means that " -"you allow to read but you do not want to read theirs. Approve as: " -msgstr "" - -#: mod/notifications.php:202 -msgid "" -"Shall your connection be bidirectional or not? \"Friend\" implies that you " -"allow to read and you subscribe to their posts. \"Sharer\" means that you " -"allow to read but you do not want to read theirs. Approve as: " -msgstr "" - -#: mod/notifications.php:210 -msgid "Friend" -msgstr "" - -#: mod/notifications.php:211 -msgid "Sharer" -msgstr "" - -#: mod/notifications.php:211 -msgid "Fan/Admirer" -msgstr "" - -#: mod/notifications.php:237 -msgid "Friend/Connect Request" -msgstr "" - -#: mod/notifications.php:237 -msgid "New Follower" -msgstr "" - -#: mod/notifications.php:257 mod/contacts.php:621 mod/follow.php:126 -msgid "Profile URL" -msgstr "" - -#: mod/notifications.php:268 -msgid "No introductions." -msgstr "" - -#: mod/notifications.php:309 mod/notifications.php:438 -#: mod/notifications.php:529 -#, php-format -msgid "%s liked %s's post" -msgstr "" - -#: mod/notifications.php:319 mod/notifications.php:448 -#: mod/notifications.php:539 -#, php-format -msgid "%s disliked %s's post" -msgstr "" - -#: mod/notifications.php:334 mod/notifications.php:463 -#: mod/notifications.php:554 -#, php-format -msgid "%s is now friends with %s" -msgstr "" - -#: mod/notifications.php:341 mod/notifications.php:470 -#, php-format -msgid "%s created a new post" -msgstr "" - -#: mod/notifications.php:342 mod/notifications.php:471 -#: mod/notifications.php:564 -#, php-format -msgid "%s commented on %s's post" -msgstr "" - -#: mod/notifications.php:357 -msgid "No more network notifications." -msgstr "" - -#: mod/notifications.php:361 -msgid "Network Notifications" -msgstr "" - -#: mod/notifications.php:486 -msgid "No more personal notifications." -msgstr "" - -#: mod/notifications.php:490 -msgid "Personal Notifications" -msgstr "" - -#: mod/notifications.php:571 -msgid "No more home notifications." -msgstr "" - -#: mod/notifications.php:575 -msgid "Home Notifications" -msgstr "" - -#: mod/dfrn_confirm.php:65 mod/profiles.php:18 mod/profiles.php:133 -#: mod/profiles.php:179 mod/profiles.php:610 -msgid "Profile not found." -msgstr "" - -#: mod/dfrn_confirm.php:121 mod/fsuggest.php:20 mod/fsuggest.php:92 -#: mod/crepair.php:114 -msgid "Contact not found." -msgstr "" - -#: mod/dfrn_confirm.php:122 -msgid "" -"This may occasionally happen if contact was requested by both persons and it " -"has already been approved." -msgstr "" - -#: mod/dfrn_confirm.php:241 -msgid "Response from remote site was not understood." -msgstr "" - -#: mod/dfrn_confirm.php:250 mod/dfrn_confirm.php:255 -msgid "Unexpected response from remote site: " -msgstr "" - -#: mod/dfrn_confirm.php:264 -msgid "Confirmation completed successfully." -msgstr "" - -#: mod/dfrn_confirm.php:266 mod/dfrn_confirm.php:280 mod/dfrn_confirm.php:287 -msgid "Remote site reported: " -msgstr "" - -#: mod/dfrn_confirm.php:278 -msgid "Temporary failure. Please wait and try again." -msgstr "" - -#: mod/dfrn_confirm.php:285 -msgid "Introduction failed or was revoked." -msgstr "" - -#: mod/dfrn_confirm.php:414 -msgid "Unable to set contact photo." -msgstr "" - -#: mod/dfrn_confirm.php:552 -#, php-format -msgid "No user record found for '%s' " -msgstr "" - -#: mod/dfrn_confirm.php:562 -msgid "Our site encryption key is apparently messed up." -msgstr "" - -#: mod/dfrn_confirm.php:573 -msgid "Empty site URL was provided or URL could not be decrypted by us." -msgstr "" - -#: mod/dfrn_confirm.php:594 -msgid "Contact record was not found for you on our site." -msgstr "" - -#: mod/dfrn_confirm.php:608 -#, php-format -msgid "Site public key not available in contact record for URL %s." -msgstr "" - -#: mod/dfrn_confirm.php:628 -msgid "" -"The ID provided by your system is a duplicate on our system. It should work " -"if you try again." -msgstr "" - -#: mod/dfrn_confirm.php:639 -msgid "Unable to set your contact credentials on our system." -msgstr "" - -#: mod/dfrn_confirm.php:698 -msgid "Unable to update your contact profile details on our system" -msgstr "" - -#: mod/dfrn_confirm.php:770 -#, php-format -msgid "%1$s has joined %2$s" -msgstr "" - #: mod/friendica.php:70 msgid "This is Friendica, version" msgstr "" @@ -3507,6 +3166,10 @@ msgid "" "Password reset failed." msgstr "" +#: mod/lostpass.php:109 boot.php:1635 +msgid "Password Reset" +msgstr "" + #: mod/lostpass.php:110 msgid "Your password has been reset as requested." msgstr "" @@ -3571,6 +3234,10 @@ msgid "" "your email for further instructions." msgstr "" +#: mod/lostpass.php:161 boot.php:1623 +msgid "Nickname or Email: " +msgstr "" + #: mod/lostpass.php:162 msgid "Reset" msgstr "" @@ -3583,25 +3250,39 @@ msgstr "" msgid "Help:" msgstr "" +#: mod/help.php:53 mod/p.php:16 mod/p.php:43 mod/p.php:52 mod/fetch.php:12 +#: mod/fetch.php:39 mod/fetch.php:48 index.php:284 +msgid "Not Found" +msgstr "" + +#: mod/help.php:56 index.php:287 +msgid "Page not found." +msgstr "" + #: 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 msgid "Invalid request." msgstr "" -#: mod/wall_upload.php:151 mod/photos.php:805 mod/profile_photo.php:150 +#: mod/wall_upload.php:151 mod/profile_photo.php:150 mod/photos.php:806 #, php-format msgid "Image exceeds size limit of %s" msgstr "" -#: mod/wall_upload.php:188 mod/photos.php:845 mod/profile_photo.php:159 +#: mod/wall_upload.php:188 mod/profile_photo.php:159 mod/photos.php:846 msgid "Unable to process image." msgstr "" -#: mod/wall_upload.php:221 mod/photos.php:872 mod/profile_photo.php:307 +#: mod/wall_upload.php:221 mod/profile_photo.php:307 mod/photos.php:873 msgid "Image upload failed." msgstr "" +#: mod/fsuggest.php:20 mod/fsuggest.php:92 mod/crepair.php:114 +#: mod/dfrn_confirm.php:122 +msgid "Contact not found." +msgstr "" + #: mod/fsuggest.php:63 msgid "Friend suggestion sent." msgstr "" @@ -3615,18 +3296,17 @@ msgstr "" msgid "Suggest a friend for %s" msgstr "" -#: mod/fsuggest.php:107 mod/events.php:507 mod/invite.php:140 -#: mod/crepair.php:179 mod/content.php:728 mod/profiles.php:681 -#: mod/poke.php:199 mod/photos.php:1124 mod/photos.php:1248 -#: mod/photos.php:1566 mod/photos.php:1617 mod/photos.php:1665 -#: mod/photos.php:1753 mod/install.php:272 mod/install.php:312 -#: mod/contacts.php:575 mod/mood.php:137 mod/localtime.php:45 -#: mod/message.php:357 mod/message.php:547 mod/manage.php:143 -#: object/Item.php:720 view/theme/frio/config.php:59 -#: view/theme/cleanzero/config.php:80 view/theme/quattro/config.php:64 -#: view/theme/dispy/config.php:70 view/theme/vier/config.php:107 -#: view/theme/diabook/theme.php:633 view/theme/diabook/config.php:148 -#: view/theme/duepuntozero/config.php:59 +#: mod/fsuggest.php:107 mod/events.php:507 mod/invite.php:140 mod/poke.php:199 +#: mod/install.php:272 mod/install.php:312 mod/mood.php:137 +#: mod/localtime.php:45 mod/message.php:357 mod/message.php:547 +#: mod/manage.php:143 mod/contacts.php:577 mod/crepair.php:154 +#: mod/photos.php:1125 mod/photos.php:1249 mod/photos.php:1567 +#: mod/photos.php:1618 mod/photos.php:1666 mod/photos.php:1754 +#: mod/profiles.php:682 mod/content.php:728 object/Item.php:720 +#: view/theme/frio/config.php:59 view/theme/cleanzero/config.php:80 +#: view/theme/quattro/config.php:64 view/theme/dispy/config.php:70 +#: view/theme/vier/config.php:107 view/theme/diabook/theme.php:633 +#: view/theme/diabook/config.php:148 view/theme/duepuntozero/config.php:59 msgid "Submit" msgstr "" @@ -3674,7 +3354,7 @@ msgstr "" msgid "Event Starts:" msgstr "" -#: mod/events.php:485 mod/events.php:497 mod/profiles.php:709 +#: mod/events.php:485 mod/events.php:497 mod/profiles.php:710 msgid "Required" msgstr "" @@ -3773,13 +3453,13 @@ msgid "" "select \"Export account\"" msgstr "" -#: mod/nogroup.php:41 mod/viewcontacts.php:97 mod/contacts.php:584 -#: mod/contacts.php:939 +#: mod/nogroup.php:41 mod/viewcontacts.php:97 mod/contacts.php:586 +#: mod/contacts.php:944 #, php-format msgid "Visit %s's profile [%s]" msgstr "" -#: mod/nogroup.php:42 mod/contacts.php:940 +#: mod/nogroup.php:42 mod/contacts.php:945 msgid "Edit contact" msgstr "" @@ -3921,9 +3601,9 @@ msgid "" "important, please visit http://friendica.com" msgstr "" -#: mod/fbrowser.php:41 mod/fbrowser.php:62 mod/photos.php:62 -#: mod/photos.php:192 mod/photos.php:1106 mod/photos.php:1232 -#: mod/photos.php:1255 mod/photos.php:1825 mod/photos.php:1837 +#: mod/fbrowser.php:41 mod/fbrowser.php:62 mod/photos.php:63 +#: mod/photos.php:193 mod/photos.php:1107 mod/photos.php:1233 +#: mod/photos.php:1256 mod/photos.php:1826 mod/photos.php:1838 #: view/theme/diabook/theme.php:499 msgid "Contact Photos" msgstr "" @@ -3936,6 +3616,10 @@ msgstr "" msgid "System down for maintenance" msgstr "" +#: mod/profperm.php:19 mod/group.php:72 index.php:396 +msgid "Permission denied" +msgstr "" + #: mod/profperm.php:25 mod/profperm.php:56 msgid "Invalid profile identifier." msgstr "" @@ -3960,98 +3644,6 @@ msgstr "" msgid "No contacts." msgstr "" -#: mod/crepair.php:87 -msgid "Contact settings applied." -msgstr "" - -#: mod/crepair.php:89 -msgid "Contact update failed." -msgstr "" - -#: mod/crepair.php:120 -msgid "" -"WARNING: This is highly advanced and if you enter incorrect " -"information your communications with this contact may stop working." -msgstr "" - -#: mod/crepair.php:121 -msgid "" -"Please use your browser 'Back' button now if you are " -"uncertain what to do on this page." -msgstr "" - -#: mod/crepair.php:134 mod/crepair.php:136 -msgid "No mirroring" -msgstr "" - -#: mod/crepair.php:134 -msgid "Mirror as forwarded posting" -msgstr "" - -#: mod/crepair.php:134 mod/crepair.php:136 -msgid "Mirror as my own posting" -msgstr "" - -#: mod/crepair.php:150 -msgid "Return to contact editor" -msgstr "" - -#: mod/crepair.php:152 -msgid "Refetch contact data" -msgstr "" - -#: mod/crepair.php:153 mod/admin.php:1371 mod/admin.php:1384 -#: mod/admin.php:1396 mod/admin.php:1412 mod/settings.php:665 -#: mod/settings.php:691 -msgid "Name" -msgstr "" - -#: mod/crepair.php:154 -msgid "Account Nickname" -msgstr "" - -#: mod/crepair.php:155 -msgid "@Tagname - overrides Name/Nickname" -msgstr "" - -#: mod/crepair.php:156 -msgid "Account URL" -msgstr "" - -#: mod/crepair.php:157 -msgid "Friend Request URL" -msgstr "" - -#: mod/crepair.php:158 -msgid "Friend Confirm URL" -msgstr "" - -#: mod/crepair.php:159 -msgid "Notification Endpoint URL" -msgstr "" - -#: mod/crepair.php:160 -msgid "Poll/Feed URL" -msgstr "" - -#: mod/crepair.php:161 -msgid "New photo from this URL" -msgstr "" - -#: mod/crepair.php:162 -msgid "Remote Self" -msgstr "" - -#: mod/crepair.php:165 -msgid "Mirror postings from this contact" -msgstr "" - -#: mod/crepair.php:167 -msgid "" -"Mark this contact as remote_self, this will cause friendica to repost new " -"entries from this contact." -msgstr "" - #: mod/tagrm.php:41 msgid "Tag removed" msgstr "" @@ -4271,7 +3863,7 @@ msgstr "" msgid "Global community page" msgstr "" -#: mod/admin.php:857 mod/contacts.php:529 +#: mod/admin.php:857 mod/contacts.php:530 msgid "Never" msgstr "" @@ -4279,7 +3871,7 @@ msgstr "" msgid "At post arrival" msgstr "" -#: mod/admin.php:866 mod/contacts.php:556 +#: mod/admin.php:866 mod/contacts.php:557 msgid "Disabled" msgstr "" @@ -5223,6 +4815,11 @@ msgstr "" msgid "User '%s' blocked" msgstr "" +#: mod/admin.php:1371 mod/admin.php:1384 mod/admin.php:1396 mod/admin.php:1412 +#: mod/settings.php:665 mod/settings.php:691 mod/crepair.php:165 +msgid "Name" +msgstr "" + #: mod/admin.php:1371 mod/admin.php:1396 msgid "Register date" msgstr "" @@ -5263,17 +4860,21 @@ msgstr "" msgid "No registrations." msgstr "" +#: mod/admin.php:1386 mod/notifications.php:139 mod/notifications.php:225 +msgid "Approve" +msgstr "" + #: mod/admin.php:1387 msgid "Deny" msgstr "" -#: mod/admin.php:1389 mod/contacts.php:603 mod/contacts.php:798 -#: mod/contacts.php:992 +#: mod/admin.php:1389 mod/contacts.php:605 mod/contacts.php:803 +#: mod/contacts.php:997 msgid "Block" msgstr "" -#: mod/admin.php:1390 mod/contacts.php:603 mod/contacts.php:798 -#: mod/contacts.php:992 +#: mod/admin.php:1390 mod/contacts.php:605 mod/contacts.php:803 +#: mod/contacts.php:997 msgid "Unblock" msgstr "" @@ -5485,164 +5086,6 @@ msgstr "" msgid "calendar" msgstr "" -#: mod/content.php:119 mod/network.php:468 -msgid "No such group" -msgstr "" - -#: mod/content.php:130 mod/network.php:495 mod/group.php:193 -msgid "Group is empty" -msgstr "" - -#: mod/content.php:135 mod/network.php:499 -#, php-format -msgid "Group: %s" -msgstr "" - -#: mod/content.php:325 object/Item.php:95 -msgid "This entry was edited" -msgstr "" - -#: mod/content.php:621 object/Item.php:429 -#, php-format -msgid "%d comment" -msgid_plural "%d comments" -msgstr[0] "" -msgstr[1] "" - -#: mod/content.php:638 mod/photos.php:1405 object/Item.php:117 -msgid "Private Message" -msgstr "" - -#: mod/content.php:702 mod/photos.php:1594 object/Item.php:263 -msgid "I like this (toggle)" -msgstr "" - -#: mod/content.php:702 object/Item.php:263 -msgid "like" -msgstr "" - -#: mod/content.php:703 mod/photos.php:1595 object/Item.php:264 -msgid "I don't like this (toggle)" -msgstr "" - -#: mod/content.php:703 object/Item.php:264 -msgid "dislike" -msgstr "" - -#: mod/content.php:705 object/Item.php:266 -msgid "Share this" -msgstr "" - -#: mod/content.php:705 object/Item.php:266 -msgid "share" -msgstr "" - -#: mod/content.php:725 mod/photos.php:1614 mod/photos.php:1662 -#: mod/photos.php:1750 object/Item.php:717 -msgid "This is you" -msgstr "" - -#: mod/content.php:729 object/Item.php:721 -msgid "Bold" -msgstr "" - -#: mod/content.php:730 object/Item.php:722 -msgid "Italic" -msgstr "" - -#: mod/content.php:731 object/Item.php:723 -msgid "Underline" -msgstr "" - -#: mod/content.php:732 object/Item.php:724 -msgid "Quote" -msgstr "" - -#: mod/content.php:733 object/Item.php:725 -msgid "Code" -msgstr "" - -#: mod/content.php:734 object/Item.php:726 -msgid "Image" -msgstr "" - -#: mod/content.php:735 object/Item.php:727 -msgid "Link" -msgstr "" - -#: mod/content.php:736 object/Item.php:728 -msgid "Video" -msgstr "" - -#: mod/content.php:746 mod/settings.php:725 object/Item.php:122 -#: object/Item.php:124 -msgid "Edit" -msgstr "" - -#: mod/content.php:771 object/Item.php:227 -msgid "add star" -msgstr "" - -#: mod/content.php:772 object/Item.php:228 -msgid "remove star" -msgstr "" - -#: mod/content.php:773 object/Item.php:229 -msgid "toggle star status" -msgstr "" - -#: mod/content.php:776 object/Item.php:232 -msgid "starred" -msgstr "" - -#: mod/content.php:777 mod/content.php:798 object/Item.php:252 -msgid "add tag" -msgstr "" - -#: mod/content.php:787 object/Item.php:240 -msgid "ignore thread" -msgstr "" - -#: mod/content.php:788 object/Item.php:241 -msgid "unignore thread" -msgstr "" - -#: mod/content.php:789 object/Item.php:242 -msgid "toggle ignore status" -msgstr "" - -#: mod/content.php:792 mod/ostatus_subscribe.php:69 object/Item.php:245 -msgid "ignored" -msgstr "" - -#: mod/content.php:803 object/Item.php:137 -msgid "save to folder" -msgstr "" - -#: mod/content.php:848 object/Item.php:201 -msgid "I will attend" -msgstr "" - -#: mod/content.php:848 object/Item.php:201 -msgid "I will not attend" -msgstr "" - -#: mod/content.php:848 object/Item.php:201 -msgid "I might attend" -msgstr "" - -#: mod/content.php:912 object/Item.php:369 -msgid "to" -msgstr "" - -#: mod/content.php:913 object/Item.php:371 -msgid "Wall-to-Wall" -msgstr "" - -#: mod/content.php:914 object/Item.php:372 -msgid "via Wall-To-Wall:" -msgstr "" - #: mod/repair_ostatus.php:14 msgid "Resubscribing to OStatus contacts" msgstr "" @@ -5702,11 +5145,11 @@ msgstr "" msgid "No videos selected" msgstr "" -#: mod/videos.php:308 mod/photos.php:1074 +#: mod/videos.php:308 mod/photos.php:1075 msgid "Access to this item is restricted." msgstr "" -#: mod/videos.php:390 mod/photos.php:1877 +#: mod/videos.php:390 mod/photos.php:1878 msgid "View Album" msgstr "" @@ -5718,305 +5161,6 @@ msgstr "" msgid "Upload New Videos" msgstr "" -#: mod/profiles.php:37 -msgid "Profile deleted." -msgstr "" - -#: mod/profiles.php:55 mod/profiles.php:89 -msgid "Profile-" -msgstr "" - -#: mod/profiles.php:74 mod/profiles.php:117 -msgid "New profile created." -msgstr "" - -#: mod/profiles.php:95 -msgid "Profile unavailable to clone." -msgstr "" - -#: mod/profiles.php:189 -msgid "Profile Name is required." -msgstr "" - -#: mod/profiles.php:336 -msgid "Marital Status" -msgstr "" - -#: mod/profiles.php:340 -msgid "Romantic Partner" -msgstr "" - -#: mod/profiles.php:352 -msgid "Work/Employment" -msgstr "" - -#: mod/profiles.php:355 -msgid "Religion" -msgstr "" - -#: mod/profiles.php:359 -msgid "Political Views" -msgstr "" - -#: mod/profiles.php:363 -msgid "Gender" -msgstr "" - -#: mod/profiles.php:367 -msgid "Sexual Preference" -msgstr "" - -#: mod/profiles.php:371 -msgid "Homepage" -msgstr "" - -#: mod/profiles.php:375 mod/profiles.php:695 -msgid "Interests" -msgstr "" - -#: mod/profiles.php:379 -msgid "Address" -msgstr "" - -#: mod/profiles.php:386 mod/profiles.php:691 -msgid "Location" -msgstr "" - -#: mod/profiles.php:469 -msgid "Profile updated." -msgstr "" - -#: mod/profiles.php:556 -msgid " and " -msgstr "" - -#: mod/profiles.php:564 -msgid "public profile" -msgstr "" - -#: mod/profiles.php:567 -#, php-format -msgid "%1$s changed %2$s to “%3$s”" -msgstr "" - -#: mod/profiles.php:568 -#, php-format -msgid " - Visit %1$s's %2$s" -msgstr "" - -#: mod/profiles.php:571 -#, php-format -msgid "%1$s has an updated %2$s, changing %3$s." -msgstr "" - -#: mod/profiles.php:638 -msgid "Hide contacts and friends:" -msgstr "" - -#: mod/profiles.php:641 mod/profiles.php:645 mod/profiles.php:670 -#: mod/follow.php:110 mod/dfrn_request.php:860 mod/register.php:239 -#: mod/settings.php:1113 mod/settings.php:1119 mod/settings.php:1127 -#: mod/settings.php:1131 mod/settings.php:1136 mod/settings.php:1142 -#: mod/settings.php:1148 mod/settings.php:1154 mod/settings.php:1180 -#: mod/settings.php:1181 mod/settings.php:1182 mod/settings.php:1183 -#: mod/settings.php:1184 mod/api.php:106 -msgid "No" -msgstr "" - -#: mod/profiles.php:643 -msgid "Hide your contact/friend list from viewers of this profile?" -msgstr "" - -#: mod/profiles.php:667 -msgid "Show more profile fields:" -msgstr "" - -#: mod/profiles.php:679 -msgid "Profile Actions" -msgstr "" - -#: mod/profiles.php:680 -msgid "Edit Profile Details" -msgstr "" - -#: mod/profiles.php:682 -msgid "Change Profile Photo" -msgstr "" - -#: mod/profiles.php:683 -msgid "View this profile" -msgstr "" - -#: mod/profiles.php:685 -msgid "Create a new profile using these settings" -msgstr "" - -#: mod/profiles.php:686 -msgid "Clone this profile" -msgstr "" - -#: mod/profiles.php:687 -msgid "Delete this profile" -msgstr "" - -#: mod/profiles.php:689 -msgid "Basic information" -msgstr "" - -#: mod/profiles.php:690 -msgid "Profile picture" -msgstr "" - -#: mod/profiles.php:692 -msgid "Preferences" -msgstr "" - -#: mod/profiles.php:693 -msgid "Status information" -msgstr "" - -#: mod/profiles.php:694 -msgid "Additional information" -msgstr "" - -#: mod/profiles.php:697 -msgid "Relation" -msgstr "" - -#: mod/profiles.php:700 mod/newmember.php:36 mod/profile_photo.php:250 -msgid "Upload Profile Photo" -msgstr "" - -#: mod/profiles.php:701 -msgid "Your Gender:" -msgstr "" - -#: mod/profiles.php:702 -msgid "♥ Marital Status:" -msgstr "" - -#: mod/profiles.php:704 -msgid "Example: fishing photography software" -msgstr "" - -#: mod/profiles.php:709 -msgid "Profile Name:" -msgstr "" - -#: mod/profiles.php:711 -msgid "" -"This is your public profile.
It may " -"be visible to anybody using the internet." -msgstr "" - -#: mod/profiles.php:712 -msgid "Your Full Name:" -msgstr "" - -#: mod/profiles.php:713 -msgid "Title/Description:" -msgstr "" - -#: mod/profiles.php:716 -msgid "Street Address:" -msgstr "" - -#: mod/profiles.php:717 -msgid "Locality/City:" -msgstr "" - -#: mod/profiles.php:718 -msgid "Region/State:" -msgstr "" - -#: mod/profiles.php:719 -msgid "Postal/Zip Code:" -msgstr "" - -#: mod/profiles.php:720 -msgid "Country:" -msgstr "" - -#: mod/profiles.php:724 -msgid "Who: (if applicable)" -msgstr "" - -#: mod/profiles.php:724 -msgid "Examples: cathy123, Cathy Williams, cathy@example.com" -msgstr "" - -#: mod/profiles.php:725 -msgid "Since [date]:" -msgstr "" - -#: mod/profiles.php:727 -msgid "Tell us about yourself..." -msgstr "" - -#: mod/profiles.php:728 -msgid "Homepage URL:" -msgstr "" - -#: mod/profiles.php:731 -msgid "Religious Views:" -msgstr "" - -#: mod/profiles.php:732 -msgid "Public Keywords:" -msgstr "" - -#: mod/profiles.php:732 -msgid "(Used for suggesting potential friends, can be seen by others)" -msgstr "" - -#: mod/profiles.php:733 -msgid "Private Keywords:" -msgstr "" - -#: mod/profiles.php:733 -msgid "(Used for searching profiles, never shown to others)" -msgstr "" - -#: mod/profiles.php:736 -msgid "Musical interests" -msgstr "" - -#: mod/profiles.php:737 -msgid "Books, literature" -msgstr "" - -#: mod/profiles.php:738 -msgid "Television" -msgstr "" - -#: mod/profiles.php:739 -msgid "Film/dance/culture/entertainment" -msgstr "" - -#: mod/profiles.php:740 -msgid "Hobbies/Interests" -msgstr "" - -#: mod/profiles.php:741 -msgid "Love/romance" -msgstr "" - -#: mod/profiles.php:742 -msgid "Work/employment" -msgstr "" - -#: mod/profiles.php:743 -msgid "School/education" -msgstr "" - -#: mod/profiles.php:744 -msgid "Contact information and Social Networks" -msgstr "" - -#: mod/profiles.php:786 -msgid "Edit/Manage Profiles" -msgstr "" - #: mod/credits.php:16 msgid "Credits" msgstr "" @@ -6052,184 +5196,6 @@ msgstr "" msgid "Make this post private" msgstr "" -#: mod/photos.php:100 mod/photos.php:1886 -msgid "Recent Photos" -msgstr "" - -#: mod/photos.php:103 mod/photos.php:1307 mod/photos.php:1888 -msgid "Upload New Photos" -msgstr "" - -#: mod/photos.php:117 mod/settings.php:36 -msgid "everybody" -msgstr "" - -#: mod/photos.php:181 -msgid "Contact information unavailable" -msgstr "" - -#: mod/photos.php:202 -msgid "Album not found." -msgstr "" - -#: mod/photos.php:232 mod/photos.php:244 mod/photos.php:1249 -msgid "Delete Album" -msgstr "" - -#: mod/photos.php:242 -msgid "Do you really want to delete this photo album and all its photos?" -msgstr "" - -#: mod/photos.php:322 mod/photos.php:333 mod/photos.php:1567 -msgid "Delete Photo" -msgstr "" - -#: mod/photos.php:331 -msgid "Do you really want to delete this photo?" -msgstr "" - -#: mod/photos.php:706 -#, php-format -msgid "%1$s was tagged in %2$s by %3$s" -msgstr "" - -#: mod/photos.php:706 -msgid "a photo" -msgstr "" - -#: mod/photos.php:813 -msgid "Image file is empty." -msgstr "" - -#: mod/photos.php:973 -msgid "No photos selected" -msgstr "" - -#: mod/photos.php:1134 -#, php-format -msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." -msgstr "" - -#: mod/photos.php:1169 -msgid "Upload Photos" -msgstr "" - -#: mod/photos.php:1173 mod/photos.php:1244 -msgid "New album name: " -msgstr "" - -#: mod/photos.php:1174 -msgid "or existing album name: " -msgstr "" - -#: mod/photos.php:1175 -msgid "Do not show a status post for this upload" -msgstr "" - -#: mod/photos.php:1186 mod/photos.php:1571 mod/settings.php:1250 -msgid "Show to Groups" -msgstr "" - -#: mod/photos.php:1187 mod/photos.php:1572 mod/settings.php:1251 -msgid "Show to Contacts" -msgstr "" - -#: mod/photos.php:1188 -msgid "Private Photo" -msgstr "" - -#: mod/photos.php:1189 -msgid "Public Photo" -msgstr "" - -#: mod/photos.php:1257 -msgid "Edit Album" -msgstr "" - -#: mod/photos.php:1263 -msgid "Show Newest First" -msgstr "" - -#: mod/photos.php:1265 -msgid "Show Oldest First" -msgstr "" - -#: mod/photos.php:1293 mod/photos.php:1871 -msgid "View Photo" -msgstr "" - -#: mod/photos.php:1340 -msgid "Permission denied. Access to this item may be restricted." -msgstr "" - -#: mod/photos.php:1342 -msgid "Photo not available" -msgstr "" - -#: mod/photos.php:1398 -msgid "View photo" -msgstr "" - -#: mod/photos.php:1398 -msgid "Edit photo" -msgstr "" - -#: mod/photos.php:1399 -msgid "Use as profile photo" -msgstr "" - -#: mod/photos.php:1424 -msgid "View Full Size" -msgstr "" - -#: mod/photos.php:1510 -msgid "Tags: " -msgstr "" - -#: mod/photos.php:1513 -msgid "[Remove any tag]" -msgstr "" - -#: mod/photos.php:1553 -msgid "New album name" -msgstr "" - -#: mod/photos.php:1554 -msgid "Caption" -msgstr "" - -#: mod/photos.php:1555 -msgid "Add a Tag" -msgstr "" - -#: mod/photos.php:1555 -msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" -msgstr "" - -#: mod/photos.php:1556 -msgid "Do not rotate" -msgstr "" - -#: mod/photos.php:1557 -msgid "Rotate CW (right)" -msgstr "" - -#: mod/photos.php:1558 -msgid "Rotate CCW (left)" -msgstr "" - -#: mod/photos.php:1573 -msgid "Private photo" -msgstr "" - -#: mod/photos.php:1574 -msgid "Public photo" -msgstr "" - -#: mod/photos.php:1800 -msgid "Map" -msgstr "" - #: mod/install.php:139 msgid "Friendica Communications Server - Setup" msgstr "" @@ -6587,328 +5553,7 @@ msgstr "" msgid "Item was not found." msgstr "" -#: mod/contacts.php:128 -#, php-format -msgid "%d contact edited." -msgid_plural "%d contacts edited." -msgstr[0] "" -msgstr[1] "" - -#: mod/contacts.php:159 mod/contacts.php:368 -msgid "Could not access contact record." -msgstr "" - -#: mod/contacts.php:173 -msgid "Could not locate selected profile." -msgstr "" - -#: mod/contacts.php:206 -msgid "Contact updated." -msgstr "" - -#: mod/contacts.php:208 mod/dfrn_request.php:578 -msgid "Failed to update contact record." -msgstr "" - -#: mod/contacts.php:389 -msgid "Contact has been blocked" -msgstr "" - -#: mod/contacts.php:389 -msgid "Contact has been unblocked" -msgstr "" - -#: mod/contacts.php:400 -msgid "Contact has been ignored" -msgstr "" - -#: mod/contacts.php:400 -msgid "Contact has been unignored" -msgstr "" - -#: mod/contacts.php:412 -msgid "Contact has been archived" -msgstr "" - -#: mod/contacts.php:412 -msgid "Contact has been unarchived" -msgstr "" - -#: mod/contacts.php:439 mod/contacts.php:794 -msgid "Do you really want to delete this contact?" -msgstr "" - -#: mod/contacts.php:456 -msgid "Contact has been removed." -msgstr "" - -#: mod/contacts.php:497 -#, php-format -msgid "You are mutual friends with %s" -msgstr "" - -#: mod/contacts.php:501 -#, php-format -msgid "You are sharing with %s" -msgstr "" - -#: mod/contacts.php:506 -#, php-format -msgid "%s is sharing with you" -msgstr "" - -#: mod/contacts.php:526 -msgid "Private communications are not available for this contact." -msgstr "" - -#: mod/contacts.php:533 -msgid "(Update was successful)" -msgstr "" - -#: mod/contacts.php:533 -msgid "(Update was not successful)" -msgstr "" - -#: mod/contacts.php:535 mod/contacts.php:973 -msgid "Suggest friends" -msgstr "" - -#: mod/contacts.php:539 -#, php-format -msgid "Network type: %s" -msgstr "" - -#: mod/contacts.php:552 -msgid "Communications lost with this contact!" -msgstr "" - -#: mod/contacts.php:555 -msgid "Fetch further information for feeds" -msgstr "" - -#: mod/contacts.php:556 -msgid "Fetch information" -msgstr "" - -#: mod/contacts.php:556 -msgid "Fetch information and keywords" -msgstr "" - -#: mod/contacts.php:576 -msgid "Profile Visibility" -msgstr "" - -#: mod/contacts.php:577 -#, php-format -msgid "" -"Please choose the profile you would like to display to %s when viewing your " -"profile securely." -msgstr "" - -#: mod/contacts.php:578 -msgid "Contact Information / Notes" -msgstr "" - -#: mod/contacts.php:579 -msgid "Edit contact notes" -msgstr "" - -#: mod/contacts.php:585 -msgid "Block/Unblock contact" -msgstr "" - -#: mod/contacts.php:586 -msgid "Ignore contact" -msgstr "" - -#: mod/contacts.php:587 -msgid "Repair URL settings" -msgstr "" - -#: mod/contacts.php:588 -msgid "View conversations" -msgstr "" - -#: mod/contacts.php:594 -msgid "Last update:" -msgstr "" - -#: mod/contacts.php:596 -msgid "Update public posts" -msgstr "" - -#: mod/contacts.php:598 mod/contacts.php:983 -msgid "Update now" -msgstr "" - -#: mod/contacts.php:604 mod/contacts.php:799 mod/contacts.php:1000 -msgid "Unignore" -msgstr "" - -#: mod/contacts.php:607 -msgid "Currently blocked" -msgstr "" - -#: mod/contacts.php:608 -msgid "Currently ignored" -msgstr "" - -#: mod/contacts.php:609 -msgid "Currently archived" -msgstr "" - -#: mod/contacts.php:610 -msgid "" -"Replies/likes to your public posts may still be visible" -msgstr "" - -#: mod/contacts.php:611 -msgid "Notification for new posts" -msgstr "" - -#: mod/contacts.php:611 -msgid "Send a notification of every new post of this contact" -msgstr "" - -#: mod/contacts.php:614 -msgid "Blacklisted keywords" -msgstr "" - -#: mod/contacts.php:614 -msgid "" -"Comma separated list of keywords that should not be converted to hashtags, " -"when \"Fetch information and keywords\" is selected" -msgstr "" - -#: mod/contacts.php:629 -msgid "Actions" -msgstr "" - -#: mod/contacts.php:632 -msgid "Contact Settings" -msgstr "" - -#: mod/contacts.php:677 -msgid "Suggestions" -msgstr "" - -#: mod/contacts.php:680 -msgid "Suggest potential friends" -msgstr "" - -#: mod/contacts.php:685 mod/group.php:192 -msgid "All Contacts" -msgstr "" - -#: mod/contacts.php:688 -msgid "Show all contacts" -msgstr "" - -#: mod/contacts.php:693 -msgid "Unblocked" -msgstr "" - -#: mod/contacts.php:696 -msgid "Only show unblocked contacts" -msgstr "" - -#: mod/contacts.php:702 -msgid "Blocked" -msgstr "" - -#: mod/contacts.php:705 -msgid "Only show blocked contacts" -msgstr "" - -#: mod/contacts.php:711 -msgid "Ignored" -msgstr "" - -#: mod/contacts.php:714 -msgid "Only show ignored contacts" -msgstr "" - -#: mod/contacts.php:720 -msgid "Archived" -msgstr "" - -#: mod/contacts.php:723 -msgid "Only show archived contacts" -msgstr "" - -#: mod/contacts.php:729 -msgid "Hidden" -msgstr "" - -#: mod/contacts.php:732 -msgid "Only show hidden contacts" -msgstr "" - -#: mod/contacts.php:789 -msgid "Search your contacts" -msgstr "" - -#: mod/contacts.php:797 mod/settings.php:158 mod/settings.php:689 -msgid "Update" -msgstr "" - -#: mod/contacts.php:800 mod/contacts.php:1008 -msgid "Archive" -msgstr "" - -#: mod/contacts.php:800 mod/contacts.php:1008 -msgid "Unarchive" -msgstr "" - -#: mod/contacts.php:803 -msgid "Batch Actions" -msgstr "" - -#: mod/contacts.php:849 -msgid "View all contacts" -msgstr "" - -#: mod/contacts.php:856 mod/common.php:134 -msgid "Common Friends" -msgstr "" - -#: mod/contacts.php:859 -msgid "View all common friends" -msgstr "" - -#: mod/contacts.php:866 -msgid "Advanced Contact Settings" -msgstr "" - -#: mod/contacts.php:911 -msgid "Mutual Friendship" -msgstr "" - -#: mod/contacts.php:915 -msgid "is a fan of yours" -msgstr "" - -#: mod/contacts.php:919 -msgid "you are a fan of" -msgstr "" - -#: mod/contacts.php:994 -msgid "Toggle Blocked status" -msgstr "" - -#: mod/contacts.php:1002 -msgid "Toggle Ignored status" -msgstr "" - -#: mod/contacts.php:1010 -msgid "Toggle Archive status" -msgstr "" - -#: mod/contacts.php:1018 -msgid "Delete contact" -msgstr "" - -#: mod/follow.php:19 mod/dfrn_request.php:873 +#: mod/follow.php:19 mod/dfrn_request.php:874 msgid "Submit Request" msgstr "" @@ -6928,27 +5573,45 @@ msgstr "" msgid "The network type couldn't be detected. Contact can't be added." msgstr "" -#: mod/follow.php:109 mod/dfrn_request.php:859 +#: mod/follow.php:109 mod/dfrn_request.php:860 msgid "Please answer the following:" msgstr "" -#: mod/follow.php:110 mod/dfrn_request.php:860 +#: mod/follow.php:110 mod/dfrn_request.php:861 #, php-format msgid "Does %s know you?" msgstr "" -#: mod/follow.php:111 mod/dfrn_request.php:864 +#: mod/follow.php:110 mod/register.php:239 mod/settings.php:1113 +#: mod/settings.php:1119 mod/settings.php:1127 mod/settings.php:1131 +#: mod/settings.php:1136 mod/settings.php:1142 mod/settings.php:1148 +#: mod/settings.php:1154 mod/settings.php:1180 mod/settings.php:1181 +#: mod/settings.php:1182 mod/settings.php:1183 mod/settings.php:1184 +#: mod/api.php:106 mod/dfrn_request.php:861 mod/profiles.php:642 +#: mod/profiles.php:646 mod/profiles.php:671 +msgid "No" +msgstr "" + +#: mod/follow.php:111 mod/dfrn_request.php:865 msgid "Add a personal note:" msgstr "" -#: mod/follow.php:117 mod/dfrn_request.php:870 +#: mod/follow.php:117 mod/dfrn_request.php:871 msgid "Your Identity Address:" msgstr "" +#: mod/follow.php:126 mod/contacts.php:624 mod/notifications.php:219 +msgid "Profile URL" +msgstr "" + #: mod/follow.php:180 msgid "Contact added" msgstr "" +#: mod/apps.php:7 index.php:240 +msgid "You must be logged in to use addons. " +msgstr "" + #: mod/apps.php:11 msgid "Applications" msgstr "" @@ -6983,6 +5646,10 @@ msgstr "" msgid "No contacts in common." msgstr "" +#: mod/common.php:134 mod/contacts.php:861 +msgid "Common Friends" +msgstr "" + #: mod/newmember.php:6 msgid "Welcome to Friendica" msgstr "" @@ -7033,6 +5700,10 @@ msgid "" "potential friends know exactly how to find you." msgstr "" +#: mod/newmember.php:36 mod/profile_photo.php:250 mod/profiles.php:701 +msgid "Upload Profile Photo" +msgstr "" + #: mod/newmember.php:36 msgid "" "Upload a profile photo if you have not done so already. Studies have shown " @@ -7190,6 +5861,19 @@ msgstr[1] "" msgid "Private messages to this group are at risk of public disclosure." msgstr "" +#: mod/network.php:468 mod/content.php:119 +msgid "No such group" +msgstr "" + +#: mod/network.php:495 mod/group.php:193 mod/content.php:130 +msgid "Group is empty" +msgstr "" + +#: mod/network.php:499 mod/content.php:135 +#, php-format +msgid "Group: %s" +msgstr "" + #: mod/network.php:527 msgid "Private messages to this person are at risk of public disclosure." msgstr "" @@ -7214,6 +5898,10 @@ msgstr "" msgid "Sort by Post Date" msgstr "" +#: mod/network.php:844 mod/profiles.php:697 mod/notifications.php:539 +msgid "Personal" +msgstr "" + #: mod/network.php:847 msgid "Posts that mention or involve you" msgstr "" @@ -7319,149 +6007,8 @@ msgstr "" msgid "Members" msgstr "" -#: mod/dfrn_request.php:99 -msgid "This introduction has already been accepted." -msgstr "" - -#: mod/dfrn_request.php:122 mod/dfrn_request.php:517 -msgid "Profile location is not valid or does not contain profile information." -msgstr "" - -#: mod/dfrn_request.php:127 mod/dfrn_request.php:522 -msgid "Warning: profile location has no identifiable owner name." -msgstr "" - -#: mod/dfrn_request.php:129 mod/dfrn_request.php:524 -msgid "Warning: profile location has no profile photo." -msgstr "" - -#: mod/dfrn_request.php:132 mod/dfrn_request.php:527 -#, 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] "" -msgstr[1] "" - -#: mod/dfrn_request.php:177 -msgid "Introduction complete." -msgstr "" - -#: mod/dfrn_request.php:219 -msgid "Unrecoverable protocol error." -msgstr "" - -#: mod/dfrn_request.php:247 -msgid "Profile unavailable." -msgstr "" - -#: mod/dfrn_request.php:272 -#, php-format -msgid "%s has received too many connection requests today." -msgstr "" - -#: mod/dfrn_request.php:273 -msgid "Spam protection measures have been invoked." -msgstr "" - -#: mod/dfrn_request.php:274 -msgid "Friends are advised to please try again in 24 hours." -msgstr "" - -#: mod/dfrn_request.php:336 -msgid "Invalid locator" -msgstr "" - -#: mod/dfrn_request.php:345 -msgid "Invalid email address." -msgstr "" - -#: mod/dfrn_request.php:372 -msgid "This account has not been configured for email. Request failed." -msgstr "" - -#: mod/dfrn_request.php:475 -msgid "You have already introduced yourself here." -msgstr "" - -#: mod/dfrn_request.php:479 -#, php-format -msgid "Apparently you are already friends with %s." -msgstr "" - -#: mod/dfrn_request.php:500 -msgid "Invalid profile URL." -msgstr "" - -#: mod/dfrn_request.php:599 -msgid "Your introduction has been sent." -msgstr "" - -#: mod/dfrn_request.php:639 -msgid "" -"Remote subscription can't be done for your network. Please subscribe " -"directly on your system." -msgstr "" - -#: mod/dfrn_request.php:662 -msgid "Please login to confirm introduction." -msgstr "" - -#: mod/dfrn_request.php:672 -msgid "" -"Incorrect identity currently logged in. Please login to this profile." -msgstr "" - -#: mod/dfrn_request.php:686 mod/dfrn_request.php:703 -msgid "Confirm" -msgstr "" - -#: mod/dfrn_request.php:698 -msgid "Hide this contact" -msgstr "" - -#: mod/dfrn_request.php:701 -#, php-format -msgid "Welcome home %s." -msgstr "" - -#: mod/dfrn_request.php:702 -#, php-format -msgid "Please confirm your introduction/connection request to %s." -msgstr "" - -#: mod/dfrn_request.php:831 -msgid "" -"Please enter your 'Identity Address' from one of the following supported " -"communications networks:" -msgstr "" - -#: mod/dfrn_request.php:852 -#, php-format -msgid "" -"If you are not yet a member of the free social web, follow this link to find a public Friendica site and join us today." -msgstr "" - -#: mod/dfrn_request.php:857 -msgid "Friend/Connection Request" -msgstr "" - -#: mod/dfrn_request.php:858 -msgid "" -"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, " -"testuser@identi.ca" -msgstr "" - -#: mod/dfrn_request.php:867 -msgid "StatusNet/Federated Social Web" -msgstr "" - -#: mod/dfrn_request.php:869 -#, php-format -msgid "" -" - please do not use this form. Instead, enter %s into your Diaspora search " -"bar." +#: mod/group.php:192 mod/contacts.php:690 +msgid "All Contacts" msgstr "" #: mod/profile_photo.php:44 @@ -7611,6 +6158,10 @@ msgstr "" msgid "Import your profile to this friendica instance" msgstr "" +#: mod/settings.php:36 mod/photos.php:118 +msgid "everybody" +msgstr "" + #: mod/settings.php:60 msgid "Display" msgstr "" @@ -7631,6 +6182,10 @@ msgstr "" msgid "Missing some important data!" msgstr "" +#: mod/settings.php:158 mod/settings.php:689 mod/contacts.php:802 +msgid "Update" +msgstr "" + #: mod/settings.php:269 msgid "Failed to connect with email account using the settings provided." msgstr "" @@ -7723,6 +6278,11 @@ msgstr "" msgid "Connected Apps" msgstr "" +#: mod/settings.php:725 mod/content.php:746 object/Item.php:122 +#: object/Item.php:124 +msgid "Edit" +msgstr "" + #: mod/settings.php:727 msgid "Client key starts with" msgstr "" @@ -8155,6 +6715,14 @@ msgstr "" msgid "(click to open/close)" msgstr "" +#: mod/settings.php:1250 mod/photos.php:1187 mod/photos.php:1572 +msgid "Show to Groups" +msgstr "" + +#: mod/settings.php:1251 mod/photos.php:1188 mod/photos.php:1573 +msgid "Show to Contacts" +msgstr "" + #: mod/settings.php:1252 msgid "Default Private Post" msgstr "" @@ -8441,6 +7009,10 @@ msgstr "" msgid "failed" msgstr "" +#: mod/ostatus_subscribe.php:69 mod/content.php:792 object/Item.php:245 +msgid "ignored" +msgstr "" + #: mod/dfrn_poll.php:104 mod/dfrn_poll.php:537 #, php-format msgid "%1$s welcomes %2$s" @@ -8532,6 +7104,1382 @@ msgstr "" msgid "Select an identity to manage: " msgstr "" +#: mod/contacts.php:128 +#, php-format +msgid "%d contact edited." +msgid_plural "%d contacts edited." +msgstr[0] "" +msgstr[1] "" + +#: mod/contacts.php:159 mod/contacts.php:368 +msgid "Could not access contact record." +msgstr "" + +#: mod/contacts.php:173 +msgid "Could not locate selected profile." +msgstr "" + +#: mod/contacts.php:206 +msgid "Contact updated." +msgstr "" + +#: mod/contacts.php:208 mod/dfrn_request.php:579 +msgid "Failed to update contact record." +msgstr "" + +#: mod/contacts.php:389 +msgid "Contact has been blocked" +msgstr "" + +#: mod/contacts.php:389 +msgid "Contact has been unblocked" +msgstr "" + +#: mod/contacts.php:400 +msgid "Contact has been ignored" +msgstr "" + +#: mod/contacts.php:400 +msgid "Contact has been unignored" +msgstr "" + +#: mod/contacts.php:412 +msgid "Contact has been archived" +msgstr "" + +#: mod/contacts.php:412 +msgid "Contact has been unarchived" +msgstr "" + +#: mod/contacts.php:437 +msgid "Drop contact" +msgstr "" + +#: mod/contacts.php:440 mod/contacts.php:799 +msgid "Do you really want to delete this contact?" +msgstr "" + +#: mod/contacts.php:457 +msgid "Contact has been removed." +msgstr "" + +#: mod/contacts.php:498 +#, php-format +msgid "You are mutual friends with %s" +msgstr "" + +#: mod/contacts.php:502 +#, php-format +msgid "You are sharing with %s" +msgstr "" + +#: mod/contacts.php:507 +#, php-format +msgid "%s is sharing with you" +msgstr "" + +#: mod/contacts.php:527 +msgid "Private communications are not available for this contact." +msgstr "" + +#: mod/contacts.php:534 +msgid "(Update was successful)" +msgstr "" + +#: mod/contacts.php:534 +msgid "(Update was not successful)" +msgstr "" + +#: mod/contacts.php:536 mod/contacts.php:978 +msgid "Suggest friends" +msgstr "" + +#: mod/contacts.php:540 +#, php-format +msgid "Network type: %s" +msgstr "" + +#: mod/contacts.php:553 +msgid "Communications lost with this contact!" +msgstr "" + +#: mod/contacts.php:556 +msgid "Fetch further information for feeds" +msgstr "" + +#: mod/contacts.php:557 +msgid "Fetch information" +msgstr "" + +#: mod/contacts.php:557 +msgid "Fetch information and keywords" +msgstr "" + +#: mod/contacts.php:575 +msgid "Contact" +msgstr "" + +#: mod/contacts.php:578 +msgid "Profile Visibility" +msgstr "" + +#: mod/contacts.php:579 +#, php-format +msgid "" +"Please choose the profile you would like to display to %s when viewing your " +"profile securely." +msgstr "" + +#: mod/contacts.php:580 +msgid "Contact Information / Notes" +msgstr "" + +#: mod/contacts.php:581 +msgid "Edit contact notes" +msgstr "" + +#: mod/contacts.php:587 +msgid "Block/Unblock contact" +msgstr "" + +#: mod/contacts.php:588 +msgid "Ignore contact" +msgstr "" + +#: mod/contacts.php:589 +msgid "Repair URL settings" +msgstr "" + +#: mod/contacts.php:590 +msgid "View conversations" +msgstr "" + +#: mod/contacts.php:596 +msgid "Last update:" +msgstr "" + +#: mod/contacts.php:598 +msgid "Update public posts" +msgstr "" + +#: mod/contacts.php:600 mod/contacts.php:988 +msgid "Update now" +msgstr "" + +#: mod/contacts.php:606 mod/contacts.php:804 mod/contacts.php:1005 +msgid "Unignore" +msgstr "" + +#: mod/contacts.php:606 mod/contacts.php:804 mod/contacts.php:1005 +#: mod/notifications.php:54 mod/notifications.php:142 +#: mod/notifications.php:227 +msgid "Ignore" +msgstr "" + +#: mod/contacts.php:610 +msgid "Currently blocked" +msgstr "" + +#: mod/contacts.php:611 +msgid "Currently ignored" +msgstr "" + +#: mod/contacts.php:612 +msgid "Currently archived" +msgstr "" + +#: mod/contacts.php:613 mod/notifications.php:135 mod/notifications.php:215 +msgid "Hide this contact from others" +msgstr "" + +#: mod/contacts.php:613 +msgid "" +"Replies/likes to your public posts may still be visible" +msgstr "" + +#: mod/contacts.php:614 +msgid "Notification for new posts" +msgstr "" + +#: mod/contacts.php:614 +msgid "Send a notification of every new post of this contact" +msgstr "" + +#: mod/contacts.php:617 +msgid "Blacklisted keywords" +msgstr "" + +#: mod/contacts.php:617 +msgid "" +"Comma separated list of keywords that should not be converted to hashtags, " +"when \"Fetch information and keywords\" is selected" +msgstr "" + +#: mod/contacts.php:633 +msgid "Actions" +msgstr "" + +#: mod/contacts.php:636 +msgid "Contact Settings" +msgstr "" + +#: mod/contacts.php:682 +msgid "Suggestions" +msgstr "" + +#: mod/contacts.php:685 +msgid "Suggest potential friends" +msgstr "" + +#: mod/contacts.php:693 +msgid "Show all contacts" +msgstr "" + +#: mod/contacts.php:698 +msgid "Unblocked" +msgstr "" + +#: mod/contacts.php:701 +msgid "Only show unblocked contacts" +msgstr "" + +#: mod/contacts.php:707 +msgid "Blocked" +msgstr "" + +#: mod/contacts.php:710 +msgid "Only show blocked contacts" +msgstr "" + +#: mod/contacts.php:716 +msgid "Ignored" +msgstr "" + +#: mod/contacts.php:719 +msgid "Only show ignored contacts" +msgstr "" + +#: mod/contacts.php:725 +msgid "Archived" +msgstr "" + +#: mod/contacts.php:728 +msgid "Only show archived contacts" +msgstr "" + +#: mod/contacts.php:734 +msgid "Hidden" +msgstr "" + +#: mod/contacts.php:737 +msgid "Only show hidden contacts" +msgstr "" + +#: mod/contacts.php:794 +msgid "Search your contacts" +msgstr "" + +#: mod/contacts.php:805 mod/contacts.php:1013 +msgid "Archive" +msgstr "" + +#: mod/contacts.php:805 mod/contacts.php:1013 +msgid "Unarchive" +msgstr "" + +#: mod/contacts.php:808 +msgid "Batch Actions" +msgstr "" + +#: mod/contacts.php:854 +msgid "View all contacts" +msgstr "" + +#: mod/contacts.php:864 +msgid "View all common friends" +msgstr "" + +#: mod/contacts.php:871 +msgid "Advanced Contact Settings" +msgstr "" + +#: mod/contacts.php:916 +msgid "Mutual Friendship" +msgstr "" + +#: mod/contacts.php:920 +msgid "is a fan of yours" +msgstr "" + +#: mod/contacts.php:924 +msgid "you are a fan of" +msgstr "" + +#: mod/contacts.php:999 +msgid "Toggle Blocked status" +msgstr "" + +#: mod/contacts.php:1007 +msgid "Toggle Ignored status" +msgstr "" + +#: mod/contacts.php:1015 +msgid "Toggle Archive status" +msgstr "" + +#: mod/contacts.php:1023 +msgid "Delete contact" +msgstr "" + +#: mod/crepair.php:87 +msgid "Contact settings applied." +msgstr "" + +#: mod/crepair.php:89 +msgid "Contact update failed." +msgstr "" + +#: mod/crepair.php:120 +msgid "" +"WARNING: This is highly advanced and if you enter incorrect " +"information your communications with this contact may stop working." +msgstr "" + +#: mod/crepair.php:121 +msgid "" +"Please use your browser 'Back' button now if you are " +"uncertain what to do on this page." +msgstr "" + +#: mod/crepair.php:134 mod/crepair.php:136 +msgid "No mirroring" +msgstr "" + +#: mod/crepair.php:134 +msgid "Mirror as forwarded posting" +msgstr "" + +#: mod/crepair.php:134 mod/crepair.php:136 +msgid "Mirror as my own posting" +msgstr "" + +#: mod/crepair.php:150 +msgid "Return to contact editor" +msgstr "" + +#: mod/crepair.php:152 +msgid "Refetch contact data" +msgstr "" + +#: mod/crepair.php:156 +msgid "Remote Self" +msgstr "" + +#: mod/crepair.php:159 +msgid "Mirror postings from this contact" +msgstr "" + +#: mod/crepair.php:161 +msgid "" +"Mark this contact as remote_self, this will cause friendica to repost new " +"entries from this contact." +msgstr "" + +#: mod/crepair.php:166 +msgid "Account Nickname" +msgstr "" + +#: mod/crepair.php:167 +msgid "@Tagname - overrides Name/Nickname" +msgstr "" + +#: mod/crepair.php:168 +msgid "Account URL" +msgstr "" + +#: mod/crepair.php:169 +msgid "Friend Request URL" +msgstr "" + +#: mod/crepair.php:170 +msgid "Friend Confirm URL" +msgstr "" + +#: mod/crepair.php:171 +msgid "Notification Endpoint URL" +msgstr "" + +#: mod/crepair.php:172 +msgid "Poll/Feed URL" +msgstr "" + +#: mod/crepair.php:173 +msgid "New photo from this URL" +msgstr "" + +#: mod/dfrn_confirm.php:66 mod/profiles.php:19 mod/profiles.php:134 +#: mod/profiles.php:180 mod/profiles.php:611 +msgid "Profile not found." +msgstr "" + +#: mod/dfrn_confirm.php:123 +msgid "" +"This may occasionally happen if contact was requested by both persons and it " +"has already been approved." +msgstr "" + +#: mod/dfrn_confirm.php:242 +msgid "Response from remote site was not understood." +msgstr "" + +#: mod/dfrn_confirm.php:251 mod/dfrn_confirm.php:256 +msgid "Unexpected response from remote site: " +msgstr "" + +#: mod/dfrn_confirm.php:265 +msgid "Confirmation completed successfully." +msgstr "" + +#: mod/dfrn_confirm.php:267 mod/dfrn_confirm.php:281 mod/dfrn_confirm.php:288 +msgid "Remote site reported: " +msgstr "" + +#: mod/dfrn_confirm.php:279 +msgid "Temporary failure. Please wait and try again." +msgstr "" + +#: mod/dfrn_confirm.php:286 +msgid "Introduction failed or was revoked." +msgstr "" + +#: mod/dfrn_confirm.php:415 +msgid "Unable to set contact photo." +msgstr "" + +#: mod/dfrn_confirm.php:553 +#, php-format +msgid "No user record found for '%s' " +msgstr "" + +#: mod/dfrn_confirm.php:563 +msgid "Our site encryption key is apparently messed up." +msgstr "" + +#: mod/dfrn_confirm.php:574 +msgid "Empty site URL was provided or URL could not be decrypted by us." +msgstr "" + +#: mod/dfrn_confirm.php:595 +msgid "Contact record was not found for you on our site." +msgstr "" + +#: mod/dfrn_confirm.php:609 +#, php-format +msgid "Site public key not available in contact record for URL %s." +msgstr "" + +#: mod/dfrn_confirm.php:629 +msgid "" +"The ID provided by your system is a duplicate on our system. It should work " +"if you try again." +msgstr "" + +#: mod/dfrn_confirm.php:640 +msgid "Unable to set your contact credentials on our system." +msgstr "" + +#: mod/dfrn_confirm.php:699 +msgid "Unable to update your contact profile details on our system" +msgstr "" + +#: mod/dfrn_confirm.php:771 +#, php-format +msgid "%1$s has joined %2$s" +msgstr "" + +#: mod/dfrn_request.php:100 +msgid "This introduction has already been accepted." +msgstr "" + +#: mod/dfrn_request.php:123 mod/dfrn_request.php:518 +msgid "Profile location is not valid or does not contain profile information." +msgstr "" + +#: mod/dfrn_request.php:128 mod/dfrn_request.php:523 +msgid "Warning: profile location has no identifiable owner name." +msgstr "" + +#: mod/dfrn_request.php:130 mod/dfrn_request.php:525 +msgid "Warning: profile location has no profile photo." +msgstr "" + +#: mod/dfrn_request.php:133 mod/dfrn_request.php:528 +#, 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] "" +msgstr[1] "" + +#: mod/dfrn_request.php:178 +msgid "Introduction complete." +msgstr "" + +#: mod/dfrn_request.php:220 +msgid "Unrecoverable protocol error." +msgstr "" + +#: mod/dfrn_request.php:248 +msgid "Profile unavailable." +msgstr "" + +#: mod/dfrn_request.php:273 +#, php-format +msgid "%s has received too many connection requests today." +msgstr "" + +#: mod/dfrn_request.php:274 +msgid "Spam protection measures have been invoked." +msgstr "" + +#: mod/dfrn_request.php:275 +msgid "Friends are advised to please try again in 24 hours." +msgstr "" + +#: mod/dfrn_request.php:337 +msgid "Invalid locator" +msgstr "" + +#: mod/dfrn_request.php:346 +msgid "Invalid email address." +msgstr "" + +#: mod/dfrn_request.php:373 +msgid "This account has not been configured for email. Request failed." +msgstr "" + +#: mod/dfrn_request.php:476 +msgid "You have already introduced yourself here." +msgstr "" + +#: mod/dfrn_request.php:480 +#, php-format +msgid "Apparently you are already friends with %s." +msgstr "" + +#: mod/dfrn_request.php:501 +msgid "Invalid profile URL." +msgstr "" + +#: mod/dfrn_request.php:600 +msgid "Your introduction has been sent." +msgstr "" + +#: mod/dfrn_request.php:640 +msgid "" +"Remote subscription can't be done for your network. Please subscribe " +"directly on your system." +msgstr "" + +#: mod/dfrn_request.php:663 +msgid "Please login to confirm introduction." +msgstr "" + +#: mod/dfrn_request.php:673 +msgid "" +"Incorrect identity currently logged in. Please login to this profile." +msgstr "" + +#: mod/dfrn_request.php:687 mod/dfrn_request.php:704 +msgid "Confirm" +msgstr "" + +#: mod/dfrn_request.php:699 +msgid "Hide this contact" +msgstr "" + +#: mod/dfrn_request.php:702 +#, php-format +msgid "Welcome home %s." +msgstr "" + +#: mod/dfrn_request.php:703 +#, php-format +msgid "Please confirm your introduction/connection request to %s." +msgstr "" + +#: mod/dfrn_request.php:832 +msgid "" +"Please enter your 'Identity Address' from one of the following supported " +"communications networks:" +msgstr "" + +#: mod/dfrn_request.php:853 +#, php-format +msgid "" +"If you are not yet a member of the free social web, follow this link to find a public Friendica site and join us today." +msgstr "" + +#: mod/dfrn_request.php:858 +msgid "Friend/Connection Request" +msgstr "" + +#: mod/dfrn_request.php:859 +msgid "" +"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, " +"testuser@identi.ca" +msgstr "" + +#: mod/dfrn_request.php:868 +msgid "StatusNet/Federated Social Web" +msgstr "" + +#: mod/dfrn_request.php:870 +#, php-format +msgid "" +" - please do not use this form. Instead, enter %s into your Diaspora search " +"bar." +msgstr "" + +#: mod/photos.php:101 mod/photos.php:1887 +msgid "Recent Photos" +msgstr "" + +#: mod/photos.php:104 mod/photos.php:1308 mod/photos.php:1889 +msgid "Upload New Photos" +msgstr "" + +#: mod/photos.php:182 +msgid "Contact information unavailable" +msgstr "" + +#: mod/photos.php:203 +msgid "Album not found." +msgstr "" + +#: mod/photos.php:233 mod/photos.php:245 mod/photos.php:1250 +msgid "Delete Album" +msgstr "" + +#: mod/photos.php:243 +msgid "Do you really want to delete this photo album and all its photos?" +msgstr "" + +#: mod/photos.php:323 mod/photos.php:334 mod/photos.php:1568 +msgid "Delete Photo" +msgstr "" + +#: mod/photos.php:332 +msgid "Do you really want to delete this photo?" +msgstr "" + +#: mod/photos.php:707 +#, php-format +msgid "%1$s was tagged in %2$s by %3$s" +msgstr "" + +#: mod/photos.php:707 +msgid "a photo" +msgstr "" + +#: mod/photos.php:814 +msgid "Image file is empty." +msgstr "" + +#: mod/photos.php:974 +msgid "No photos selected" +msgstr "" + +#: mod/photos.php:1135 +#, php-format +msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." +msgstr "" + +#: mod/photos.php:1170 +msgid "Upload Photos" +msgstr "" + +#: mod/photos.php:1174 mod/photos.php:1245 +msgid "New album name: " +msgstr "" + +#: mod/photos.php:1175 +msgid "or existing album name: " +msgstr "" + +#: mod/photos.php:1176 +msgid "Do not show a status post for this upload" +msgstr "" + +#: mod/photos.php:1189 +msgid "Private Photo" +msgstr "" + +#: mod/photos.php:1190 +msgid "Public Photo" +msgstr "" + +#: mod/photos.php:1258 +msgid "Edit Album" +msgstr "" + +#: mod/photos.php:1264 +msgid "Show Newest First" +msgstr "" + +#: mod/photos.php:1266 +msgid "Show Oldest First" +msgstr "" + +#: mod/photos.php:1294 mod/photos.php:1872 +msgid "View Photo" +msgstr "" + +#: mod/photos.php:1341 +msgid "Permission denied. Access to this item may be restricted." +msgstr "" + +#: mod/photos.php:1343 +msgid "Photo not available" +msgstr "" + +#: mod/photos.php:1399 +msgid "View photo" +msgstr "" + +#: mod/photos.php:1399 +msgid "Edit photo" +msgstr "" + +#: mod/photos.php:1400 +msgid "Use as profile photo" +msgstr "" + +#: mod/photos.php:1406 mod/content.php:638 object/Item.php:117 +msgid "Private Message" +msgstr "" + +#: mod/photos.php:1425 +msgid "View Full Size" +msgstr "" + +#: mod/photos.php:1511 +msgid "Tags: " +msgstr "" + +#: mod/photos.php:1514 +msgid "[Remove any tag]" +msgstr "" + +#: mod/photos.php:1554 +msgid "New album name" +msgstr "" + +#: mod/photos.php:1555 +msgid "Caption" +msgstr "" + +#: mod/photos.php:1556 +msgid "Add a Tag" +msgstr "" + +#: mod/photos.php:1556 +msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" +msgstr "" + +#: mod/photos.php:1557 +msgid "Do not rotate" +msgstr "" + +#: mod/photos.php:1558 +msgid "Rotate CW (right)" +msgstr "" + +#: mod/photos.php:1559 +msgid "Rotate CCW (left)" +msgstr "" + +#: mod/photos.php:1574 +msgid "Private photo" +msgstr "" + +#: mod/photos.php:1575 +msgid "Public photo" +msgstr "" + +#: mod/photos.php:1595 mod/content.php:702 object/Item.php:263 +msgid "I like this (toggle)" +msgstr "" + +#: mod/photos.php:1596 mod/content.php:703 object/Item.php:264 +msgid "I don't like this (toggle)" +msgstr "" + +#: mod/photos.php:1615 mod/photos.php:1663 mod/photos.php:1751 +#: mod/content.php:725 object/Item.php:717 +msgid "This is you" +msgstr "" + +#: mod/photos.php:1617 mod/photos.php:1665 mod/photos.php:1753 +#: mod/content.php:727 mod/content.php:945 object/Item.php:403 +#: object/Item.php:719 boot.php:888 +msgid "Comment" +msgstr "" + +#: mod/photos.php:1801 +msgid "Map" +msgstr "" + +#: mod/profiles.php:38 +msgid "Profile deleted." +msgstr "" + +#: mod/profiles.php:56 mod/profiles.php:90 +msgid "Profile-" +msgstr "" + +#: mod/profiles.php:75 mod/profiles.php:118 +msgid "New profile created." +msgstr "" + +#: mod/profiles.php:96 +msgid "Profile unavailable to clone." +msgstr "" + +#: mod/profiles.php:190 +msgid "Profile Name is required." +msgstr "" + +#: mod/profiles.php:337 +msgid "Marital Status" +msgstr "" + +#: mod/profiles.php:341 +msgid "Romantic Partner" +msgstr "" + +#: mod/profiles.php:353 +msgid "Work/Employment" +msgstr "" + +#: mod/profiles.php:356 +msgid "Religion" +msgstr "" + +#: mod/profiles.php:360 +msgid "Political Views" +msgstr "" + +#: mod/profiles.php:364 +msgid "Gender" +msgstr "" + +#: mod/profiles.php:368 +msgid "Sexual Preference" +msgstr "" + +#: mod/profiles.php:372 +msgid "Homepage" +msgstr "" + +#: mod/profiles.php:376 mod/profiles.php:696 +msgid "Interests" +msgstr "" + +#: mod/profiles.php:380 +msgid "Address" +msgstr "" + +#: mod/profiles.php:387 mod/profiles.php:692 +msgid "Location" +msgstr "" + +#: mod/profiles.php:470 +msgid "Profile updated." +msgstr "" + +#: mod/profiles.php:557 +msgid " and " +msgstr "" + +#: mod/profiles.php:565 +msgid "public profile" +msgstr "" + +#: mod/profiles.php:568 +#, php-format +msgid "%1$s changed %2$s to “%3$s”" +msgstr "" + +#: mod/profiles.php:569 +#, php-format +msgid " - Visit %1$s's %2$s" +msgstr "" + +#: mod/profiles.php:572 +#, php-format +msgid "%1$s has an updated %2$s, changing %3$s." +msgstr "" + +#: mod/profiles.php:639 +msgid "Hide contacts and friends:" +msgstr "" + +#: mod/profiles.php:644 +msgid "Hide your contact/friend list from viewers of this profile?" +msgstr "" + +#: mod/profiles.php:668 +msgid "Show more profile fields:" +msgstr "" + +#: mod/profiles.php:680 +msgid "Profile Actions" +msgstr "" + +#: mod/profiles.php:681 +msgid "Edit Profile Details" +msgstr "" + +#: mod/profiles.php:683 +msgid "Change Profile Photo" +msgstr "" + +#: mod/profiles.php:684 +msgid "View this profile" +msgstr "" + +#: mod/profiles.php:686 +msgid "Create a new profile using these settings" +msgstr "" + +#: mod/profiles.php:687 +msgid "Clone this profile" +msgstr "" + +#: mod/profiles.php:688 +msgid "Delete this profile" +msgstr "" + +#: mod/profiles.php:690 +msgid "Basic information" +msgstr "" + +#: mod/profiles.php:691 +msgid "Profile picture" +msgstr "" + +#: mod/profiles.php:693 +msgid "Preferences" +msgstr "" + +#: mod/profiles.php:694 +msgid "Status information" +msgstr "" + +#: mod/profiles.php:695 +msgid "Additional information" +msgstr "" + +#: mod/profiles.php:698 +msgid "Relation" +msgstr "" + +#: mod/profiles.php:702 +msgid "Your Gender:" +msgstr "" + +#: mod/profiles.php:703 +msgid "♥ Marital Status:" +msgstr "" + +#: mod/profiles.php:705 +msgid "Example: fishing photography software" +msgstr "" + +#: mod/profiles.php:710 +msgid "Profile Name:" +msgstr "" + +#: mod/profiles.php:712 +msgid "" +"This is your public profile.
It may " +"be visible to anybody using the internet." +msgstr "" + +#: mod/profiles.php:713 +msgid "Your Full Name:" +msgstr "" + +#: mod/profiles.php:714 +msgid "Title/Description:" +msgstr "" + +#: mod/profiles.php:717 +msgid "Street Address:" +msgstr "" + +#: mod/profiles.php:718 +msgid "Locality/City:" +msgstr "" + +#: mod/profiles.php:719 +msgid "Region/State:" +msgstr "" + +#: mod/profiles.php:720 +msgid "Postal/Zip Code:" +msgstr "" + +#: mod/profiles.php:721 +msgid "Country:" +msgstr "" + +#: mod/profiles.php:725 +msgid "Who: (if applicable)" +msgstr "" + +#: mod/profiles.php:725 +msgid "Examples: cathy123, Cathy Williams, cathy@example.com" +msgstr "" + +#: mod/profiles.php:726 +msgid "Since [date]:" +msgstr "" + +#: mod/profiles.php:728 +msgid "Tell us about yourself..." +msgstr "" + +#: mod/profiles.php:729 +msgid "Homepage URL:" +msgstr "" + +#: mod/profiles.php:732 +msgid "Religious Views:" +msgstr "" + +#: mod/profiles.php:733 +msgid "Public Keywords:" +msgstr "" + +#: mod/profiles.php:733 +msgid "(Used for suggesting potential friends, can be seen by others)" +msgstr "" + +#: mod/profiles.php:734 +msgid "Private Keywords:" +msgstr "" + +#: mod/profiles.php:734 +msgid "(Used for searching profiles, never shown to others)" +msgstr "" + +#: mod/profiles.php:737 +msgid "Musical interests" +msgstr "" + +#: mod/profiles.php:738 +msgid "Books, literature" +msgstr "" + +#: mod/profiles.php:739 +msgid "Television" +msgstr "" + +#: mod/profiles.php:740 +msgid "Film/dance/culture/entertainment" +msgstr "" + +#: mod/profiles.php:741 +msgid "Hobbies/Interests" +msgstr "" + +#: mod/profiles.php:742 +msgid "Love/romance" +msgstr "" + +#: mod/profiles.php:743 +msgid "Work/employment" +msgstr "" + +#: mod/profiles.php:744 +msgid "School/education" +msgstr "" + +#: mod/profiles.php:745 +msgid "Contact information and Social Networks" +msgstr "" + +#: mod/profiles.php:787 +msgid "Edit/Manage Profiles" +msgstr "" + +#: mod/content.php:325 object/Item.php:95 +msgid "This entry was edited" +msgstr "" + +#: mod/content.php:621 object/Item.php:429 +#, php-format +msgid "%d comment" +msgid_plural "%d comments" +msgstr[0] "" +msgstr[1] "" + +#: mod/content.php:702 object/Item.php:263 +msgid "like" +msgstr "" + +#: mod/content.php:703 object/Item.php:264 +msgid "dislike" +msgstr "" + +#: mod/content.php:705 object/Item.php:266 +msgid "Share this" +msgstr "" + +#: mod/content.php:705 object/Item.php:266 +msgid "share" +msgstr "" + +#: mod/content.php:729 object/Item.php:721 +msgid "Bold" +msgstr "" + +#: mod/content.php:730 object/Item.php:722 +msgid "Italic" +msgstr "" + +#: mod/content.php:731 object/Item.php:723 +msgid "Underline" +msgstr "" + +#: mod/content.php:732 object/Item.php:724 +msgid "Quote" +msgstr "" + +#: mod/content.php:733 object/Item.php:725 +msgid "Code" +msgstr "" + +#: mod/content.php:734 object/Item.php:726 +msgid "Image" +msgstr "" + +#: mod/content.php:735 object/Item.php:727 +msgid "Link" +msgstr "" + +#: mod/content.php:736 object/Item.php:728 +msgid "Video" +msgstr "" + +#: mod/content.php:771 object/Item.php:227 +msgid "add star" +msgstr "" + +#: mod/content.php:772 object/Item.php:228 +msgid "remove star" +msgstr "" + +#: mod/content.php:773 object/Item.php:229 +msgid "toggle star status" +msgstr "" + +#: mod/content.php:776 object/Item.php:232 +msgid "starred" +msgstr "" + +#: mod/content.php:777 mod/content.php:798 object/Item.php:252 +msgid "add tag" +msgstr "" + +#: mod/content.php:787 object/Item.php:240 +msgid "ignore thread" +msgstr "" + +#: mod/content.php:788 object/Item.php:241 +msgid "unignore thread" +msgstr "" + +#: mod/content.php:789 object/Item.php:242 +msgid "toggle ignore status" +msgstr "" + +#: mod/content.php:803 object/Item.php:137 +msgid "save to folder" +msgstr "" + +#: mod/content.php:848 object/Item.php:201 +msgid "I will attend" +msgstr "" + +#: mod/content.php:848 object/Item.php:201 +msgid "I will not attend" +msgstr "" + +#: mod/content.php:848 object/Item.php:201 +msgid "I might attend" +msgstr "" + +#: mod/content.php:912 object/Item.php:369 +msgid "to" +msgstr "" + +#: mod/content.php:913 object/Item.php:371 +msgid "Wall-to-Wall" +msgstr "" + +#: mod/content.php:914 object/Item.php:372 +msgid "via Wall-To-Wall:" +msgstr "" + +#: mod/notifications.php:29 +msgid "Invalid request identifier." +msgstr "" + +#: mod/notifications.php:38 mod/notifications.php:143 +#: mod/notifications.php:228 +msgid "Discard" +msgstr "" + +#: mod/notifications.php:91 +msgid "Show Ignored Requests" +msgstr "" + +#: mod/notifications.php:91 +msgid "Hide Ignored Requests" +msgstr "" + +#: mod/notifications.php:127 mod/notifications.php:198 +msgid "Notification type: " +msgstr "" + +#: mod/notifications.php:128 +msgid "Friend Suggestion" +msgstr "" + +#: mod/notifications.php:130 +#, php-format +msgid "suggested by %s" +msgstr "" + +#: mod/notifications.php:136 mod/notifications.php:216 +msgid "Post a new friend activity" +msgstr "" + +#: mod/notifications.php:136 mod/notifications.php:216 +msgid "if applicable" +msgstr "" + +#: mod/notifications.php:159 +msgid "Claims to be known to you: " +msgstr "" + +#: mod/notifications.php:160 +msgid "yes" +msgstr "" + +#: mod/notifications.php:160 +msgid "no" +msgstr "" + +#: mod/notifications.php:161 +msgid "" +"Shall your connection be bidirectional or not? \"Friend\" implies that you " +"allow to read and you subscribe to their posts. \"Fan/Admirer\" means that " +"you allow to read but you do not want to read theirs. Approve as: " +msgstr "" + +#: mod/notifications.php:164 +msgid "" +"Shall your connection be bidirectional or not? \"Friend\" implies that you " +"allow to read and you subscribe to their posts. \"Sharer\" means that you " +"allow to read but you do not want to read theirs. Approve as: " +msgstr "" + +#: mod/notifications.php:172 +msgid "Friend" +msgstr "" + +#: mod/notifications.php:173 +msgid "Sharer" +msgstr "" + +#: mod/notifications.php:173 +msgid "Fan/Admirer" +msgstr "" + +#: mod/notifications.php:199 +msgid "Friend/Connect Request" +msgstr "" + +#: mod/notifications.php:199 +msgid "New Follower" +msgstr "" + +#: mod/notifications.php:234 +msgid "No introductions." +msgstr "" + +#: mod/notifications.php:238 +msgid "Network Notifications" +msgstr "" + +#: mod/notifications.php:265 mod/notifications.php:382 +#: mod/notifications.php:461 +#, php-format +msgid "%s liked %s's post" +msgstr "" + +#: mod/notifications.php:275 mod/notifications.php:392 +#: mod/notifications.php:471 +#, php-format +msgid "%s disliked %s's post" +msgstr "" + +#: mod/notifications.php:290 mod/notifications.php:407 +#: mod/notifications.php:486 +#, php-format +msgid "%s is now friends with %s" +msgstr "" + +#: mod/notifications.php:297 mod/notifications.php:414 +#, php-format +msgid "%s created a new post" +msgstr "" + +#: mod/notifications.php:298 mod/notifications.php:415 +#: mod/notifications.php:496 +#, php-format +msgid "%s commented on %s's post" +msgstr "" + +#: mod/notifications.php:313 +msgid "No more network notifications." +msgstr "" + +#: mod/notifications.php:343 +msgid "Personal Notifications" +msgstr "" + +#: mod/notifications.php:430 +msgid "No more personal notifications." +msgstr "" + +#: mod/notifications.php:435 +msgid "Home Notifications" +msgstr "" + +#: mod/notifications.php:503 +msgid "No more home notifications." +msgstr "" + +#: mod/notifications.php:527 +msgid "System" +msgstr "" + #: object/Item.php:370 msgid "via" msgstr "" @@ -8790,3 +8738,56 @@ msgstr "" #: view/theme/duepuntozero/config.php:62 msgid "Variations" msgstr "" + +#: index.php:447 +msgid "toggle mobile" +msgstr "" + +#: boot.php:887 +msgid "Delete this item?" +msgstr "" + +#: boot.php:890 +msgid "show fewer" +msgstr "" + +#: boot.php:1483 +#, php-format +msgid "Update %s failed. See error logs." +msgstr "" + +#: boot.php:1595 +msgid "Create a New Account" +msgstr "" + +#: boot.php:1624 +msgid "Password: " +msgstr "" + +#: boot.php:1625 +msgid "Remember me" +msgstr "" + +#: boot.php:1628 +msgid "Or login using OpenID: " +msgstr "" + +#: boot.php:1634 +msgid "Forgot your password?" +msgstr "" + +#: boot.php:1637 +msgid "Website Terms of Service" +msgstr "" + +#: boot.php:1638 +msgid "terms of service" +msgstr "" + +#: boot.php:1640 +msgid "Website Privacy Policy" +msgstr "" + +#: boot.php:1641 +msgid "privacy policy" +msgstr "" From 668da905e2b3a096ed5b5059cbaec587fa113d23 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Mon, 1 Aug 2016 07:48:43 +0200 Subject: [PATCH 013/352] "proc_run" is now called with priority. --- boot.php | 158 ++++++++++++++++++++++-------------------- include/Contact.php | 6 +- include/cron.php | 12 ++-- include/follow.php | 2 +- include/identity.php | 2 +- include/items.php | 10 +-- include/like.php | 4 +- include/message.php | 2 +- include/notifier.php | 12 ++-- include/poller.php | 7 ++ include/queue.php | 4 +- include/socgraph.php | 2 +- include/uimport.php | 2 +- mod/admin.php | 2 +- mod/contacts.php | 2 +- mod/dfrn_confirm.php | 4 +- mod/dirfind.php | 2 +- mod/events.php | 2 +- mod/fsuggest.php | 2 +- mod/item.php | 4 +- mod/mood.php | 4 +- mod/photos.php | 8 +-- mod/poke.php | 4 +- mod/profile_photo.php | 4 +- mod/profiles.php | 7 +- mod/register.php | 2 +- mod/regmod.php | 2 +- mod/settings.php | 4 +- mod/tagger.php | 2 +- mod/videos.php | 2 +- update.php | 6 +- 31 files changed, 149 insertions(+), 137 deletions(-) diff --git a/boot.php b/boot.php index cad4094c7d..1e59ba3b54 100644 --- a/boot.php +++ b/boot.php @@ -386,6 +386,17 @@ define ( 'GRAVITY_LIKE', 3); define ( 'GRAVITY_COMMENT', 6); /* @}*/ +/** + * @name Priority + * + * Process priority for the worker + * @{ + */ +define('PRIORITY_HIGH', 1); +define('PRIORITY_MEDIUM', 2); +define('PRIORITY_LOW', 3); +/* @}*/ + // Normally this constant is defined - but not if "pcntl" isn't installed if (!defined("SIGTERM")) @@ -1241,13 +1252,34 @@ class App { logger("killed stale process"); // Calling a new instance if ($task != "") - proc_run('php', $task); + proc_run(PRIORITY_MEDIUM, $task); } return true; } } return false; } + + function proc_run($args) { + + // Add the php path if it is a php call + if (count($args) && $args[0] === 'php') + $args[0] = ((x($this->config,'php_path')) && (strlen($this->config['php_path'])) ? $this->config['php_path'] : 'php'); + + // add baseurl to args. cli scripts can't construct it + $args[] = $this->get_baseurl(); + + for($x = 0; $x < count($args); $x ++) + $args[$x] = escapeshellarg($args[$x]); + + $cmdline = implode($args," "); + + if(get_config('system','proc_windows')) + proc_close(proc_open('cmd /c start /b ' . $cmdline,array(),$foo,dirname(__FILE__))); + else + proc_close(proc_open($cmdline." &",array(),$foo,dirname(__FILE__))); + + } } /** @@ -1363,7 +1395,7 @@ function check_db() { $build = DB_UPDATE_VERSION; } if($build != DB_UPDATE_VERSION) - proc_run('php', 'include/dbupdate.php'); + proc_run(PRIORITY_HIGH, 'include/dbupdate.php'); } @@ -1736,10 +1768,11 @@ function get_max_import_size() { * @brief Wrap calls to proc_close(proc_open()) and call hook * so plugins can take part in process :) * - * @param string $cmd program to run + * @param (string|integer) $cmd program to run or priority * * next args are passed as $cmd command line * e.g.: proc_run("ls","-la","/tmp"); + * or: proc_run(PRIORITY_HIGH, "include/notifier.php", "drop", $drop_id); * * @note $cmd and string args are surrounded with "" * @@ -1753,7 +1786,7 @@ function proc_run($cmd){ $args = func_get_args(); $newargs = array(); - if(! count($args)) + if (!count($args)) return; // expand any arrays @@ -1763,8 +1796,7 @@ function proc_run($cmd){ foreach($arg as $n) { $newargs[] = $n; } - } - else + } else $newargs[] = $arg; } @@ -1773,81 +1805,55 @@ function proc_run($cmd){ $arr = array('args' => $args, 'run_cmd' => true); call_hooks("proc_run", $arr); - if(! $arr['run_cmd']) + if (!$arr['run_cmd'] OR !count($args)) return; - if(count($args) && $args[0] === 'php') { - - if (get_config("system", "worker")) { - $argv = $args; - array_shift($argv); - - $parameters = json_encode($argv); - $found = q("SELECT `id` FROM `workerqueue` WHERE `parameter` = '%s'", - dbesc($parameters)); - - $funcname = str_replace(".php", "", basename($argv[0]))."_run"; - - // Define the processes that have priority over any other process - /// @todo Better check for priority processes - $high_priority = array("delivery_run", "notifier_run", "pubsubpublish_run"); - $low_priority = array("queue_run", "gprobe_run", "discover_poco_run"); - - if (in_array($funcname, $high_priority)) - $priority = 1; - elseif (in_array($funcname, $low_priority)) - $priority = 3; - else - $priority = 2; - - if (!$found) - // quickfix for the delivery problems, 2106-07-28 - /// @todo find better solution - //q("INSERT INTO `workerqueue` (`function`, `parameter`, `created`, `priority`) - // VALUES ('%s', '%s', '%s', %d)", - // dbesc($funcname), - q("INSERT INTO `workerqueue` (`parameter`, `created`, `priority`) - VALUES ('%s', '%s', %d)", - dbesc($parameters), - dbesc(datetime_convert()), - intval($priority)); - - // Should we quit and wait for the poller to be called as a cronjob? - if (get_config("system", "worker_dont_fork")) - return; - - // Checking number of workers - $workers = q("SELECT COUNT(*) AS `workers` FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'"); - - // Get number of allowed number of worker threads - $queues = intval(get_config("system", "worker_queues")); - - if ($queues == 0) - $queues = 4; - - // If there are already enough workers running, don't fork another one - if ($workers[0]["workers"] >= $queues) - return; - - // Now call the poller to execute the jobs that we just added to the queue - $args = array("php", "include/poller.php", "no_cron"); - } - - $args[0] = ((x($a->config,'php_path')) && (strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php'); + if (!get_config("system", "worker") OR + (($args[0] != 'php') AND !is_int($args[0]))) { + $a->proc_run($args); + return; } - // add baseurl to args. cli scripts can't construct it - $args[] = $a->get_baseurl(); - - for($x = 0; $x < count($args); $x ++) - $args[$x] = escapeshellarg($args[$x]); - - $cmdline = implode($args," "); - - if(get_config('system','proc_windows')) - proc_close(proc_open('cmd /c start /b ' . $cmdline,array(),$foo,dirname(__FILE__))); + if (is_int($args[0])) + $priority = $args[0]; else - proc_close(proc_open($cmdline." &",array(),$foo,dirname(__FILE__))); + $priority = PRIORITY_MEDIUM; + + $argv = $args; + array_shift($argv); + + $parameters = json_encode($argv); + $found = q("SELECT `id` FROM `workerqueue` WHERE `parameter` = '%s'", + dbesc($parameters)); + + if (!$found) + q("INSERT INTO `workerqueue` (`parameter`, `created`, `priority`) + VALUES ('%s', '%s', %d)", + dbesc($parameters), + dbesc(datetime_convert()), + intval($priority)); + + // Should we quit and wait for the poller to be called as a cronjob? + if (get_config("system", "worker_dont_fork")) + return; + + // Checking number of workers + $workers = q("SELECT COUNT(*) AS `workers` FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'"); + + // Get number of allowed number of worker threads + $queues = intval(get_config("system", "worker_queues")); + + if ($queues == 0) + $queues = 4; + + // If there are already enough workers running, don't fork another one + if ($workers[0]["workers"] >= $queues) + return; + + // Now call the poller to execute the jobs that we just added to the queue + $args = array("php", "include/poller.php", "no_cron"); + + $a->proc_run($args); } function current_theme(){ diff --git a/include/Contact.php b/include/Contact.php index 10005d3e3c..e466d7f908 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -45,10 +45,10 @@ function user_remove($uid) { // don't delete yet, will be done later when contacts have deleted my stuff // q("DELETE FROM `user` WHERE `uid` = %d", intval($uid)); q("UPDATE `user` SET `account_removed` = 1, `account_expires_on` = UTC_TIMESTAMP() WHERE `uid` = %d", intval($uid)); - proc_run('php', "include/notifier.php", "removeme", $uid); + proc_run(PRIORITY_HIGH, "include/notifier.php", "removeme", $uid); // Send an update to the directory - proc_run('php', "include/directory.php", $r[0]['url']); + proc_run(PRIORITY_LOW, "include/directory.php", $r[0]['url']); if($uid == local_user()) { unset($_SESSION['authenticated']); @@ -275,7 +275,7 @@ function get_contact_details_by_url($url, $uid = -1, $default = array()) { if ((($profile["addr"] == "") OR ($profile["name"] == "")) AND ($profile["gid"] != 0) AND in_array($profile["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) - proc_run('php',"include/update_gcontact.php", $profile["gid"]); + proc_run(PRIORITY_LOW, "include/update_gcontact.php", $profile["gid"]); // Show contact details of Diaspora contacts only if connected if (($profile["cid"] == 0) AND ($profile["network"] == NETWORK_DIASPORA)) { diff --git a/include/cron.php b/include/cron.php index c1e4338d6f..c54fef8a9c 100644 --- a/include/cron.php +++ b/include/cron.php @@ -70,15 +70,15 @@ function cron_run(&$argv, &$argc){ // run queue delivery process in the background - proc_run('php',"include/queue.php"); + proc_run(PRIORITY_LOW,"include/queue.php"); // run the process to discover global contacts in the background - proc_run('php',"include/discover_poco.php"); + proc_run(PRIORITY_LOW,"include/discover_poco.php"); // run the process to update locally stored global contacts in the background - proc_run('php',"include/discover_poco.php", "checkcontact"); + proc_run(PRIORITY_LOW,"include/discover_poco.php", "checkcontact"); // expire any expired accounts @@ -126,11 +126,11 @@ function cron_run(&$argv, &$argc){ update_contact_birthdays(); - proc_run('php',"include/discover_poco.php", "suggestions"); + proc_run(PRIORITY_LOW,"include/discover_poco.php", "suggestions"); set_config('system','last_expire_day',$d2); - proc_run('php','include/expire.php'); + proc_run(PRIORITY_LOW,'include/expire.php'); } // Clear cache entries @@ -272,7 +272,7 @@ function cron_run(&$argv, &$argc){ logger("Polling ".$contact["network"]." ".$contact["id"]." ".$contact["nick"]." ".$contact["name"]); - proc_run('php','include/onepoll.php',$contact['id']); + proc_run(PRIORITY_MEDIUM,'include/onepoll.php',$contact['id']); if($interval) @time_sleep_until(microtime(true) + (float) $interval); diff --git a/include/follow.php b/include/follow.php index 2461bf0356..08e74e02f3 100644 --- a/include/follow.php +++ b/include/follow.php @@ -270,7 +270,7 @@ function new_contact($uid,$url,$interactive = false) { // pull feed and consume it, which should subscribe to the hub. - proc_run('php',"include/onepoll.php","$contact_id", "force"); + proc_run(PRIORITY_MEDIUM, "include/onepoll.php", $contact_id, "force"); // create a follow slap diff --git a/include/identity.php b/include/identity.php index 4dffe72559..9b75ebccdb 100644 --- a/include/identity.php +++ b/include/identity.php @@ -818,7 +818,7 @@ function zrl_init(&$a) { } } - proc_run('php','include/gprobe.php',bin2hex($tmp_str)); + proc_run(PRIORITY_LOW, 'include/gprobe.php',bin2hex($tmp_str)); $arr = array('zrl' => $tmp_str, 'url' => $a->cmd); call_hooks('zrl_init',$arr); } diff --git a/include/items.php b/include/items.php index 1d2a775c49..754d5b0882 100644 --- a/include/items.php +++ b/include/items.php @@ -917,7 +917,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa check_item_notification($current_post, $uid); if ($notify) - proc_run('php', "include/notifier.php", $notify_type, $current_post); + proc_run(PRIORITY_HIGH, "include/notifier.php", $notify_type, $current_post); return $current_post; } @@ -1156,7 +1156,7 @@ function tag_deliver($uid,$item_id) { ); update_thread($item_id); - proc_run('php','include/notifier.php','tgroup',$item_id); + proc_run(PRIORITY_HIGH,'include/notifier.php', 'tgroup', $item_id); } @@ -1763,7 +1763,7 @@ function item_expire($uid, $days, $network = "", $force = false) { drop_item($item['id'],false); } - proc_run('php',"include/notifier.php","expire","$uid"); + proc_run(PRIORITY_HIGH,"include/notifier.php", "expire", $uid); } @@ -1785,7 +1785,7 @@ function drop_items($items) { // multiple threads may have been deleted, send an expire notification if($uid) - proc_run('php',"include/notifier.php","expire","$uid"); + proc_run(PRIORITY_HIGH,"include/notifier.php", "expire", $uid); } @@ -1998,7 +1998,7 @@ function drop_item($id,$interactive = true) { // send the notification upstream/downstream as the case may be - proc_run('php',"include/notifier.php","drop","$drop_id"); + proc_run(PRIORITY_HIGH,"include/notifier.php", "drop", $drop_id); if(! $interactive) return $owner; diff --git a/include/like.php b/include/like.php index 9ceff2303a..118ec81ca1 100644 --- a/include/like.php +++ b/include/like.php @@ -153,7 +153,7 @@ function do_like($item_id, $verb) { ); $like_item_id = $like_item['id']; - proc_run('php',"include/notifier.php","like","$like_item_id"); + proc_run(PRIORITY_HIGH, "include/notifier.php", "like", $like_item_id); return true; } @@ -245,7 +245,7 @@ EOT; call_hooks('post_local_end', $arr); - proc_run('php',"include/notifier.php","like","$post_id"); + proc_run(PRIORITY_HIGH, "include/notifier.php", "like", $post_id); return true; } diff --git a/include/message.php b/include/message.php index 0f4b53c626..51f3ad805a 100644 --- a/include/message.php +++ b/include/message.php @@ -150,7 +150,7 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){ } if($post_id) { - proc_run('php',"include/notifier.php","mail","$post_id"); + proc_run(PRIORITY_HIGH, "include/notifier.php", "mail", $post_id); return intval($post_id); } else { return -3; diff --git a/include/notifier.php b/include/notifier.php index 446824a26a..cfe4e18412 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -16,7 +16,7 @@ require_once('include/salmon.php'); /* * The notifier is typically called with: * - * proc_run('php', "include/notifier.php", COMMAND, ITEM_ID); + * proc_run(PRIORITY_HIGH, "include/notifier.php", COMMAND, ITEM_ID); * * where COMMAND is one of the following: * @@ -355,7 +355,7 @@ function notifier_run(&$argv, &$argc){ // a delivery fork. private groups (forum_mode == 2) do not uplink if((intval($parent['forum_mode']) == 1) && (! $top_level) && ($cmd !== 'uplink')) { - proc_run('php','include/notifier.php','uplink',$item_id); + proc_run(PRIORITY_HIGH,'include/notifier.php','uplink',$item_id); } $conversants = array(); @@ -538,7 +538,7 @@ function notifier_run(&$argv, &$argc){ $this_batch[] = $contact['id']; if(count($this_batch) >= $deliveries_per_process) { - proc_run('php','include/delivery.php',$cmd,$item_id,$this_batch); + proc_run(PRIORITY_HIGH,'include/delivery.php',$cmd,$item_id,$this_batch); $this_batch = array(); if($interval) @time_sleep_until(microtime(true) + (float) $interval); @@ -548,7 +548,7 @@ function notifier_run(&$argv, &$argc){ // be sure to pick up any stragglers if(count($this_batch)) - proc_run('php','include/delivery.php',$cmd,$item_id,$this_batch); + proc_run(PRIORITY_HIGH,'include/delivery.php',$cmd,$item_id,$this_batch); } // send salmon slaps to mentioned remote tags (@foo@example.com) in OStatus posts @@ -619,7 +619,7 @@ function notifier_run(&$argv, &$argc){ if((! $mail) && (! $fsuggest) && (! $followup)) { logger('notifier: delivery agent: '.$rr['name'].' '.$rr['id'].' '.$rr['network'].' '.$target_item["guid"]); - proc_run('php','include/delivery.php',$cmd,$item_id,$rr['id']); + proc_run(PRIORITY_HIGH,'include/delivery.php',$cmd,$item_id,$rr['id']); if($interval) @time_sleep_until(microtime(true) + (float) $interval); } @@ -659,7 +659,7 @@ function notifier_run(&$argv, &$argc){ } // Handling the pubsubhubbub requests - proc_run('php','include/pubsubpublish.php'); + proc_run(PRIORITY_HIGH,'include/pubsubpublish.php'); } logger('notifier: calling hooks', LOGGER_DEBUG); diff --git a/include/poller.php b/include/poller.php index ec6653b488..b54757b00b 100644 --- a/include/poller.php +++ b/include/poller.php @@ -275,6 +275,13 @@ function poller_too_much_workers() { logger("Current load: ".$load." - maximum: ".$maxsysload." - current queues: ".$active."/".$entries." - maximum: ".$queues."/".$maxqueues, LOGGER_DEBUG); + // Are there fewer workers running as possible? Then fork a new one. + if (!get_config("system", "worker_dont_fork") AND ($queues > ($active + 1)) AND ($entries > 1)) { + logger("Active workers: ".$active."/".$queues." Fork a new worker.", LOGGER_DEBUG); + $args = array("php", "include/poller.php", "no_cron"); + $a = get_app(); + $a->proc_run($args); + } } return($active >= $queues); diff --git a/include/queue.php b/include/queue.php index 878c149731..9779a0733d 100644 --- a/include/queue.php +++ b/include/queue.php @@ -48,7 +48,7 @@ function queue_run(&$argv, &$argc){ logger('queue: start'); // Handling the pubsubhubbub requests - proc_run('php','include/pubsubpublish.php'); + proc_run(PRIORITY_HIGH,'include/pubsubpublish.php'); $interval = ((get_config('system','delivery_interval') === false) ? 2 : intval(get_config('system','delivery_interval'))); @@ -60,7 +60,7 @@ function queue_run(&$argv, &$argc){ if($r) { foreach($r as $rr) { logger('queue: deliverq'); - proc_run('php','include/delivery.php',$rr['cmd'],$rr['item'],$rr['contact']); + proc_run(PRIORITY_HIGH,'include/delivery.php',$rr['cmd'],$rr['item'],$rr['contact']); if($interval) @time_sleep_until(microtime(true) + (float) $interval); } diff --git a/include/socgraph.php b/include/socgraph.php index cb2fd97b39..89897aaa7c 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -1507,7 +1507,7 @@ function get_gcontact_id($contact) { if ($doprobing) { logger("Last Contact: ". $last_contact_str." - Last Failure: ".$last_failure_str." - Checking: ".$contact["url"], LOGGER_DEBUG); - proc_run('php', 'include/gprobe.php', bin2hex($contact["url"])); + proc_run(PRIORITY_LOW, 'include/gprobe.php', bin2hex($contact["url"])); } if ((count($r) > 1) AND ($gcontact_id > 0) AND ($contact["url"] != "")) diff --git a/include/uimport.php b/include/uimport.php index bd271e91a8..937a16710a 100644 --- a/include/uimport.php +++ b/include/uimport.php @@ -287,7 +287,7 @@ function import_account(&$a, $file) { } // send relocate messages - proc_run('php', 'include/notifier.php', 'relocate', $newuid); + proc_run(PRIORITY_HIGH, 'include/notifier.php', 'relocate', $newuid); info(t("Done. You can now login with your username and password")); goaway($a->get_baseurl() . "/login"); diff --git a/mod/admin.php b/mod/admin.php index 547c37fb6c..d49673fc0f 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -549,7 +549,7 @@ function admin_page_site_post(&$a) { $users = q("SELECT `uid` FROM `user` WHERE `account_removed` = 0 AND `account_expired` = 0"); foreach ($users as $user) { - proc_run('php', 'include/notifier.php', 'relocate', $user['uid']); + proc_run(PRIORITY_HIGH, 'include/notifier.php', 'relocate', $user['uid']); } info("Relocation started. Could take a while to complete."); diff --git a/mod/contacts.php b/mod/contacts.php index f9e9f6b735..ba8ad45c39 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -237,7 +237,7 @@ function _contact_update($contact_id) { intval($contact_id)); } else // pull feed and consume it, which should subscribe to the hub. - proc_run('php',"include/onepoll.php","$contact_id", "force"); + proc_run(PRIORITY_MEDIUM, "include/onepoll.php", $contact_id, "force"); } function _contact_update_profile($contact_id) { diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php index 25694a67f3..51cd59c62f 100644 --- a/mod/dfrn_confirm.php +++ b/mod/dfrn_confirm.php @@ -487,7 +487,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { $i = item_store($arr); if($i) - proc_run('php',"include/notifier.php","activity","$i"); + proc_run(PRIORITY_HIGH, "include/notifier.php", "activity", $i); } } } @@ -784,7 +784,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { $i = item_store($arr); if($i) - proc_run('php',"include/notifier.php","activity","$i"); + proc_run(PRIORITY_HIGH, "include/notifier.php", "activity", $i); } } diff --git a/mod/dirfind.php b/mod/dirfind.php index 0638fe14fa..52e1617554 100644 --- a/mod/dirfind.php +++ b/mod/dirfind.php @@ -156,7 +156,7 @@ function dirfind_content(&$a, $prefix = "") { } // Add found profiles from the global directory to the local directory - proc_run('php','include/discover_poco.php', "dirsearch", urlencode($search)); + proc_run(PRIORITY_LOW, 'include/discover_poco.php', "dirsearch", urlencode($search)); } else { $p = (($a->pager['page'] != 1) ? '&p=' . $a->pager['page'] : ''); diff --git a/mod/events.php b/mod/events.php index 878bf841d2..636cf6c579 100644 --- a/mod/events.php +++ b/mod/events.php @@ -177,7 +177,7 @@ function events_post(&$a) { $item_id = event_store($datarray); if(! $cid) - proc_run('php',"include/notifier.php","event","$item_id"); + proc_run(PRIORITY_HIGH, "include/notifier.php", "event", $item_id); goaway($_SESSION['return_url']); } diff --git a/mod/fsuggest.php b/mod/fsuggest.php index 6b1cbd7533..ad407d5f32 100644 --- a/mod/fsuggest.php +++ b/mod/fsuggest.php @@ -57,7 +57,7 @@ function fsuggest_post(&$a) { intval($fsuggest_id), intval(local_user()) ); - proc_run('php', 'include/notifier.php', 'suggest' , $fsuggest_id); + proc_run(PRIORITY_HIGH, 'include/notifier.php', 'suggest', $fsuggest_id); } info( t('Friend suggestion sent.') . EOL); diff --git a/mod/item.php b/mod/item.php index 6f5f8fc1ea..9a9b5895bd 100644 --- a/mod/item.php +++ b/mod/item.php @@ -783,7 +783,7 @@ function item_post(&$a) { // update filetags in pconfig file_tag_update_pconfig($uid,$categories_old,$categories_new,'category'); - proc_run('php', "include/notifier.php", 'edit_post', "$post_id"); + proc_run(PRIORITY_HIGH, "include/notifier.php", 'edit_post', $post_id); if((x($_REQUEST,'return')) && strlen($return_path)) { logger('return: ' . $return_path); goaway($a->get_baseurl() . "/" . $return_path ); @@ -1032,7 +1032,7 @@ function item_post(&$a) { // Currently the only realistic fixes are to use a reliable server - which precludes shared hosting, // or cut back on plugins which do remote deliveries. - proc_run('php', "include/notifier.php", $notify_type, "$post_id"); + proc_run(PRIORITY_HIGH, "include/notifier.php", $notify_type, $post_id); logger('post_complete'); diff --git a/mod/mood.php b/mod/mood.php index 5e6ca0fcfc..f804af0c00 100644 --- a/mod/mood.php +++ b/mod/mood.php @@ -95,13 +95,13 @@ function mood_init(&$a) { intval($uid), intval($item_id) ); - proc_run('php',"include/notifier.php","tag","$item_id"); + proc_run(PRIORITY_HIGH, "include/notifier.php", "tag", $item_id); } call_hooks('post_local_end', $arr); - proc_run('php',"include/notifier.php","like","$post_id"); + proc_run(PRIORITY_HIGH, "include/notifier.php", "like", $post_id); return; } diff --git a/mod/photos.php b/mod/photos.php index 4ac4e1a0ee..ec71cc09d8 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -306,7 +306,7 @@ function photos_post(&$a) { // send the notification upstream/downstream as the case may be if($rr['visible']) - proc_run('php',"include/notifier.php","drop","$drop_id"); + proc_run(PRIORITY_HIGH, "include/notifier.php", "drop", $drop_id); } } } @@ -376,7 +376,7 @@ function photos_post(&$a) { $drop_id = intval($i[0]['id']); if($i[0]['visible']) - proc_run('php',"include/notifier.php","drop","$drop_id"); + proc_run(PRIORITY_HIGH, "include/notifier.php", "drop", $drop_id); } } @@ -719,7 +719,7 @@ function photos_post(&$a) { $item_id = item_store($arr); if($item_id) { - proc_run('php',"include/notifier.php","tag","$item_id"); + proc_run(PRIORITY_HIGH, "include/notifier.php", "tag", $item_id); } } @@ -935,7 +935,7 @@ function photos_post(&$a) { $item_id = item_store($arr); if($visible) - proc_run('php', "include/notifier.php", 'wall-new', $item_id); + proc_run(PRIORITY_HIGH, "include/notifier.php", 'wall-new', $item_id); call_hooks('photo_post_end',intval($item_id)); diff --git a/mod/poke.php b/mod/poke.php index 4a643435be..435da4dcd4 100644 --- a/mod/poke.php +++ b/mod/poke.php @@ -131,13 +131,13 @@ function poke_init(&$a) { // intval($uid), // intval($item_id) //); - proc_run('php',"include/notifier.php","tag","$item_id"); + proc_run(PRIORITY_HIGH, "include/notifier.php", "tag", $item_id); } call_hooks('post_local_end', $arr); - proc_run('php',"include/notifier.php","like","$post_id"); + proc_run(PRIORITY_HIGH, "include/notifier.php", "like", $post_id); return; } diff --git a/mod/profile_photo.php b/mod/profile_photo.php index 4e8d279a97..11e671afc5 100644 --- a/mod/profile_photo.php +++ b/mod/profile_photo.php @@ -125,7 +125,7 @@ function profile_photo_post(&$a) { // Update global directory in background $url = $a->get_baseurl() . '/profile/' . $a->user['nickname']; if($url && strlen(get_config('system','directory'))) - proc_run('php',"include/directory.php","$url"); + proc_run(PRIORITY_LOW, "include/directory.php", $url); require_once('include/profile_update.php'); profile_change(); @@ -224,7 +224,7 @@ function profile_photo_content(&$a) { // Update global directory in background $url = $_SESSION['my_url']; if($url && strlen(get_config('system','directory'))) - proc_run('php',"include/directory.php","$url"); + proc_run(PRIORITY_LOW, "include/directory.php", $url); goaway($a->get_baseurl() . '/profiles'); return; // NOTREACHED diff --git a/mod/profiles.php b/mod/profiles.php index c3bd068b0b..d770e75c3a 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -496,7 +496,7 @@ function profiles_post(&$a) { // Update global directory in background $url = $_SESSION['my_url']; if($url && strlen(get_config('system','directory'))) - proc_run('php',"include/directory.php","$url"); + proc_run(PRIORITY_LOW, "include/directory.php", $url); require_once('include/profile_update.php'); profile_change(); @@ -587,9 +587,8 @@ function profile_activity($changed, $value) { $arr['deny_gid'] = $a->user['deny_gid']; $i = item_store($arr); - if($i) { - proc_run('php',"include/notifier.php","activity","$i"); - } + if($i) + proc_run(PRIORITY_HIGH, "include/notifier.php", "activity", $i); } diff --git a/mod/register.php b/mod/register.php index 4c4fcc2af1..6fc5887ef5 100644 --- a/mod/register.php +++ b/mod/register.php @@ -64,7 +64,7 @@ function register_post(&$a) { if($netpublish && $a->config['register_policy'] != REGISTER_APPROVE) { $url = $a->get_baseurl() . '/profile/' . $user['nickname']; - proc_run('php',"include/directory.php","$url"); + proc_run(PRIORITY_LOW, "include/directory.php", $url); } $using_invites = get_config('system','invitation_only'); diff --git a/mod/regmod.php b/mod/regmod.php index 5a90db1f90..bbe733003a 100644 --- a/mod/regmod.php +++ b/mod/regmod.php @@ -37,7 +37,7 @@ function user_allow($hash) { if(count($r) && $r[0]['net-publish']) { $url = $a->get_baseurl() . '/profile/' . $user[0]['nickname']; if($url && strlen(get_config('system','directory'))) - proc_run('php',"include/directory.php","$url"); + proc_run(PRIORITY_LOW, "include/directory.php", $url); } push_lang($register[0]['language']); diff --git a/mod/settings.php b/mod/settings.php index 89406b7072..e2d3f4d367 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -352,7 +352,7 @@ function settings_post(&$a) { check_form_security_token_redirectOnErr('/settings', 'settings'); if (x($_POST,'resend_relocate')) { - proc_run('php', 'include/notifier.php', 'relocate', local_user()); + proc_run(PRIORITY_HIGH, 'include/notifier.php', 'relocate', local_user()); info(t("Relocate message has been send to your contacts")); goaway('settings'); } @@ -614,7 +614,7 @@ function settings_post(&$a) { // Update global directory in background $url = $_SESSION['my_url']; if($url && strlen(get_config('system','directory'))) - proc_run('php',"include/directory.php","$url"); + proc_run(PRIORITY_LOW, "include/directory.php", $url); } require_once('include/profile_update.php'); diff --git a/mod/tagger.php b/mod/tagger.php index 26166a3cc0..e0ef1ceb02 100644 --- a/mod/tagger.php +++ b/mod/tagger.php @@ -211,7 +211,7 @@ EOT; call_hooks('post_local_end', $arr); - proc_run('php',"include/notifier.php","tag","$post_id"); + proc_run(PRIORITY_HIGH, "include/notifier.php", "tag", $post_id); killme(); diff --git a/mod/videos.php b/mod/videos.php index bf8d696b60..e5a0887bb9 100644 --- a/mod/videos.php +++ b/mod/videos.php @@ -167,7 +167,7 @@ function videos_post(&$a) { $drop_id = intval($i[0]['id']); if($i[0]['visible']) - proc_run('php',"include/notifier.php","drop","$drop_id"); + proc_run(PRIORITY_HIGH, "include/notifier.php", "drop", $drop_id); } } diff --git a/update.php b/update.php index 41f238e913..a150fe39fa 100644 --- a/update.php +++ b/update.php @@ -1595,7 +1595,7 @@ function update_1169() { if (!$r) return UPDATE_FAILED; - proc_run('php',"include/threadupdate.php"); + proc_run(PRIORITY_LOW, "include/threadupdate.php"); return UPDATE_SUCCESS; } @@ -1636,7 +1636,7 @@ function update_1178() { set_config('system','community_page_style', CP_NO_COMMUNITY_PAGE); // Update the central item storage with uid=0 - proc_run('php',"include/threadupdate.php"); + proc_run(PRIORITY_LOW, "include/threadupdate.php"); return UPDATE_SUCCESS; } @@ -1644,7 +1644,7 @@ function update_1178() { function update_1180() { // Fill the new fields in the term table. - proc_run('php',"include/tagupdate.php"); + proc_run(PRIORITY_LOW, "include/tagupdate.php"); return UPDATE_SUCCESS; } From 7a4be1cead9c388c7529118cc943eb661b0960bc Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Mon, 1 Aug 2016 18:18:11 +0200 Subject: [PATCH 014/352] notifications.php: move more code to NotificationsManager --- include/NotificationsManager.php | 323 ++++++++++++++---- mod/notifications.php | 321 ++++------------- view/templates/notifications.tpl | 2 +- .../templates/notifications_comments_item.tpl | 2 +- .../templates/notifications_dislikes_item.tpl | 2 +- view/templates/notifications_friends_item.tpl | 2 +- view/templates/notifications_likes_item.tpl | 2 +- view/templates/notifications_network_item.tpl | 2 +- view/templates/notifications_posts_item.tpl | 2 +- view/templates/notify.tpl | 2 +- view/theme/frio/templates/notifications.tpl | 2 +- 11 files changed, 330 insertions(+), 332 deletions(-) diff --git a/include/NotificationsManager.php b/include/NotificationsManager.php index cbf8986d09..09e9c1494e 100644 --- a/include/NotificationsManager.php +++ b/include/NotificationsManager.php @@ -5,6 +5,7 @@ require_once('include/html2plain.php'); require_once("include/datetime.php"); require_once("include/bbcode.php"); +require_once("include/dbm.php"); /** * @brief Read and write notifications from/to database @@ -146,87 +147,56 @@ class NotificationsManager { 'label' => t('System'), 'url'=>'notifications/system', 'sel'=> (($this->a->argv[1] == 'system') ? 'active' : ''), + 'id' => 'system-tab', 'accesskey' => 'y', ), array( 'label' => t('Network'), 'url'=>'notifications/network', 'sel'=> (($this->a->argv[1] == 'network') ? 'active' : ''), + 'id' => 'network-tab', 'accesskey' => 'w', ), array( 'label' => t('Personal'), 'url'=>'notifications/personal', 'sel'=> (($this->a->argv[1] == 'personal') ? 'active' : ''), + 'id' => 'personal-tab', 'accesskey' => 'r', ), array( 'label' => t('Home'), 'url' => 'notifications/home', 'sel'=> (($this->a->argv[1] == 'home') ? 'active' : ''), + 'id' => 'home-tab', 'accesskey' => 'h', ), array( 'label' => t('Introductions'), 'url' => 'notifications/intros', 'sel'=> (($this->a->argv[1] == 'intros') ? 'active' : ''), + 'id' => 'intro-tab', 'accesskey' => 'i', ), - /*array( - 'label' => t('Messages'), - 'url' => 'message', - 'sel'=> '', - ),*/ /*while I can have notifications for messages, this tablist is not place for message page link */ ); return $tabs; } - public function format($notifs) { + public function format($notifs, $ident = "") { - $notif_content = array(); + $notif = array(); + $arr = array(); - // The template files we need in different cases for formatting the content - $tpl_item_likes = get_markup_template('notifications_likes_item.tpl'); - $tpl_item_dislikes = get_markup_template('notifications_dislikes_item.tpl'); - $tpl_item_friends = get_markup_template('notifications_friends_item.tpl'); - $tpl_item_comments = get_markup_template('notifications_comments_item.tpl'); - $tpl_item_posts = get_markup_template('notifications_posts_item.tpl'); - $tpl_notify = get_markup_template('notify.tpl'); + if (dbm::is_result($notifs)) { - if (count($notifs['notifications']) > 0) { - // switch ($notifs['ident']) { - // case 'system': - // $default_item_link = app::get_baseurl(true).'/notify/view/'. $it['id']; - // $default_item_image = proxy_url($it['photo'], false, PROXY_SIZE_MICRO); - // $default_item_text = strip_tags(bbcode($it['msg'])); - // $default_item_when = relative_date($it['date']); - // $default_tpl = $tpl_notify; - // break; - // - // case 'home': - // $default_item_link = app::get_baseurl(true).'/display/'.$it['pguid']; - // $default_item_image = proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO); - // $default_item_text = sprintf( t("%s commented on %s's post"), $it['author-name'], $it['pname']); - // $default_item_when = relative_date($it['created']); - // $default_tpl = $tpl_item_comments; - // break; - // - // default: - // $default_item_link = app::get_baseurl(true).'/display/'.$it['pguid']; - // $default_item_image = proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO); - // $default_item_text = (($it['id'] == $it['parent']) - // ? sprintf( t("%s created a new post"), $it['author-name']) - // : sprintf( t("%s commented on %s's post"), $it['author-name'], $it['pname'])); - // $default_item_when = relative_date($it['created']); - // $default_tpl = (($it['id'] == $it['parent']) ? $tpl_item_posts : $tpl_item_comments); - // - // } + foreach ($notifs as $it) { + if($it['unseen']) + $it['seen'] = ($it['unseen'] > 0 ? false : true); - foreach ($notifs['notifications'] as $it) { - - switch ($notifs['ident']) { + switch ($ident) { case 'system': + $default_item_label = 'notify'; $default_item_link = app::get_baseurl(true).'/notify/view/'. $it['id']; $default_item_image = proxy_url($it['photo'], false, PROXY_SIZE_MICRO); $default_item_text = strip_tags(bbcode($it['msg'])); @@ -235,6 +205,7 @@ class NotificationsManager { break; case 'home': + $default_item_label = 'comment'; $default_item_link = app::get_baseurl(true).'/display/'.$it['pguid']; $default_item_image = proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO); $default_item_text = sprintf( t("%s commented on %s's post"), $it['author-name'], $it['pname']); @@ -243,6 +214,7 @@ class NotificationsManager { break; default: + $default_item_label = (($it['id'] == $it['parent']) ? 'post' : 'comment'); $default_item_link = app::get_baseurl(true).'/display/'.$it['pguid']; $default_item_image = proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO); $default_item_text = (($it['id'] == $it['parent']) @@ -255,23 +227,27 @@ class NotificationsManager { switch($it['verb']){ case ACTIVITY_LIKE: - $notif_content[] = replace_macros($tpl_item_likes,array( + $notif = array( //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_link' => app::get_baseurl(true).'/display/'.$it['pguid'], - '$item_image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), - '$item_text' => sprintf( t("%s liked %s's post"), $it['author-name'], $it['pname']), - '$item_when' => relative_date($it['created']) - )); + 'label' => 'like', + 'link' => app::get_baseurl(true).'/display/'.$it['pguid'], + '$image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), + 'text' => sprintf( t("%s liked %s's post"), $it['author-name'], $it['pname']), + 'when' => relative_date($it['created']), + 'seen' => $it['seen'] + ); break; case ACTIVITY_DISLIKE: - $notif_content[] = replace_macros($tpl_item_dislikes,array( + $notif = array( //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_link' => app::get_baseurl(true).'/display/'.$it['pguid'], - '$item_image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), - '$item_text' => sprintf( t("%s disliked %s's post"), $it['author-name'], $it['pname']), - '$item_when' => relative_date($it['created']) - )); + 'label' => 'dislike', + 'link' => app::get_baseurl(true).'/display/'.$it['pguid'], + 'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), + 'text' => sprintf( t("%s disliked %s's post"), $it['author-name'], $it['pname']), + 'when' => relative_date($it['created']), + 'seen' => $it['seen'] + ); break; case ACTIVITY_FRIEND: @@ -279,28 +255,235 @@ class NotificationsManager { $obj = parse_xml_string($xmlhead.$it['object']); $it['fname'] = $obj->title; - $notif_content[] = replace_macros($tpl_item_friends,array( + $notif = array( //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_link' => app::get_baseurl(true).'/display/'.$it['pguid'], - '$item_image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), - '$item_text' => sprintf( t("%s is now friends with %s"), $it['author-name'], $it['fname']), - '$item_when' => relative_date($it['created']) - )); + 'label' => 'friend', + 'link' => app::get_baseurl(true).'/display/'.$it['pguid'], + 'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), + 'text' => sprintf( t("%s is now friends with %s"), $it['author-name'], $it['fname']), + 'when' => relative_date($it['created']), + 'seen' => $it['seen'] + ); break; default: - $notif_content[] = replace_macros($default_tpl,array( + $notif = array( //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_link' => $default_item_link, - '$item_image' => $default_item_image, - '$item_text' => $default_item_text, - '$item_when' => $default_item_when - )); + 'label' => $default_item_label, + 'link' => $default_item_link, + 'image' => $default_item_image, + 'text' => $default_item_text, + 'when' => $default_item_when, + 'seen' => $it['seen'] + ); } + + $arr[] = $notif; } } - return $notif_content; + return $arr; } + + private function networkTotal($seen = 0) { + if($seen === 0) + $sql_seen = " AND `item`.`unseen` = 1 "; + + $r = q("SELECT COUNT(*) AS `total` + FROM `item` INNER JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent` + WHERE `item`.`visible` = 1 AND `pitem`.`parent` != 0 AND + `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0 + $sql_seen", + intval(local_user()) + ); + + if(dbm::is_result($r)) + return $r[0]['total']; + + return 0; + } + + public function networkNotifs($seen = 0) { + $ident = 'network'; + $total = $this->networkTotal($seen); + + if($seen === 0) + $sql_seen = " AND `item`.`unseen` = 1 "; + + + $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, `item`.`unseen`, + `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` AS `object`, + `pitem`.`author-name` AS `pname`, `pitem`.`author-link` AS `plink`, `pitem`.`guid` AS `pguid` + FROM `item` INNER JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent` + WHERE `item`.`visible` = 1 AND `pitem`.`parent` != 0 AND + `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0 + $sql_seen + ORDER BY `item`.`created` DESC", + intval(local_user()) + ); + + if(dbm::is_result($r)) { + $notifs = $this->format($r, $ident); + $arr = array ( + 'notifications' => $notifs, + 'ident' => $ident, + 'total' => $total, + ); + + return $arr; + } + } + + private function systemTotal($seen = 0) { + if($seen === 0) + $sql_seen = " AND `seen` = 0 "; + + $r = q("SELECT COUNT(*) AS `total` FROM `notify` WHERE `uid` = %d $sql_seen", + intval(local_user()) + ); + + if(dbm::is_result($r)) + return $r[0]['total']; + + return 0; + } + + public function systemNotifs($seen = 0) { + $ident = 'system'; + $total = $this->systemTotal($seen); + + if($seen === 0) + $sql_seen = " AND `seen` = 0 "; + + $r = q("SELECT * FROM `notify` WHERE `uid` = %d $sql_seen ORDER BY `date` DESC", + intval(local_user()) + ); + + if(dbm::is_result($r)) { + $notifs = $this->format($r, $ident); + $arr = array ( + 'notifications' => $notifs, + 'ident' => $ident, + 'total' => $total, + ); + + return $arr; + } + } + + private function _personal_sql_extra() { + $myurl = app::get_baseurl(true) . '/profile/'. $this->a->user['nickname']; + $myurl = substr($myurl,strpos($myurl,'://')+3); + $myurl = str_replace(array('www.','.'),array('','\\.'),$myurl); + $diasp_url = str_replace('/profile/','/u/',$myurl); + $sql_extra .= sprintf(" AND ( `item`.`author-link` regexp '%s' or `item`.`tag` regexp '%s' or `item`.`tag` regexp '%s' ) ", + dbesc($myurl . '$'), + dbesc($myurl . '\\]'), + dbesc($diasp_url . '\\]') + ); + + return $sql_extra; + } + + private function personalTotal($seen = 0) { + $sql_extra .= $this->_personal_sql_extra(); + + if($seen === 0) + $sql_seen = " AND `item`.`unseen` = 1 "; + + $r = q("SELECT COUNT(*) AS `total` + FROM `item` INNER JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent` + WHERE `item`.`visible` = 1 + $sql_extra + $sql_seen + AND `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0 " , + intval(local_user()) + ); + + if(dbm::is_result($r)) + return $r[0]['total']; + + return 0; + } + public function personalNotifs($seen = 0) { + $ident = 'personal'; + $total = 0; + $sql_extra .= $this->_personal_sql_extra(); + + if($seen === 0) + $sql_seen = " AND `item`.`unseen` = 1 "; + + $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, `item`.`unseen`, + `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` AS `object`, + `pitem`.`author-name` AS `pname`, `pitem`.`author-link` AS `plink`, `pitem`.`guid` AS `pguid`, + FROM `item` INNER JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent` + WHERE `item`.`visible` = 1 + $sql_extra + $sql_seen + AND `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0 + ORDER BY `item`.`created` DESC" , + intval(local_user()) + ); + + if(dbm::is_result($r)) { + $notifs = $this->format($r, $ident); + $arr = array ( + 'notifications' => $notifs, + 'ident' => $ident, + 'total' => $total, + ); + + return $arr; + } + } + + private function homeTotal($seen = 0) { + if($seen === 0) + $sql_seen = " AND `item`.`unseen` = 1 "; + + $r = q("SELECT COUNT(*) AS `total` FROM `item` + WHERE ``item`.`visible` = 1 AND + `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 1 + $sql_seen", + intval(local_user()) + ); + + if(dbm::is_result($r)) + return $r['total']; + + return 0; + } + + public function homeNotifs($seen = 0) { + $ident = 'home'; + $total = $this->homeTotal($seen); + + if($seen === 0) + $sql_seen = " AND `item`.`unseen` = 1 "; + + $total = $this->homeTotal($seen); + + $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, `item`.`unseen`, + `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` as `object`, + `pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink`, `pitem`.`guid` as `pguid` + FROM `item` INNER JOIN `item` as `pitem` ON `pitem`.`id`=`item`.`parent` + WHERE `item`.`visible` = 1 AND + `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 1 + $sql_seen + ORDER BY `item`.`created` DESC", + intval(local_user()) + ); + + if(dbm::is_result($r)) { + $notifs = $this->format($r, $ident); + $arr = array ( + 'notifications' => $notifs, + 'ident' => $ident, + 'total' => $total, + ); + + return $arr; + } + } } diff --git a/mod/notifications.php b/mod/notifications.php index 5a1ef51ca7..faf7651914 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -67,6 +67,7 @@ function notifications_content(&$a) { return; } + $show = (x($_REQUEST,'show') ? $_REQUEST['show'] : 0); nav_set_selected('notifications'); $json = (($a->argc > 1 && $a->argv[$a->argc - 1] === 'json') ? true : false); @@ -89,14 +90,20 @@ function notifications_content(&$a) { $notif_header = t('Notifications'); $notif_tpl = get_markup_template('notifications.tpl'); - $notif_ignored_lnk .= '' - . ((strlen($sql_extra)) ? t('Show Ignored Requests') : t('Hide Ignored Requests')) . '' . "\r\n"; +// $notif_show_lnk .= '' +// . ((strlen($sql_extra)) ? t('Show Ignored Requests') : t('Hide Ignored Requests')) . '' . "\r\n"; - $r = q("SELECT COUNT(*) AS `total` FROM `intro` + $notif_show_lnk = array( + 'href' => ((strlen($sql_extra)) ? 'notifications/intros/all' : 'notifications/intros' ), + 'text' => ((strlen($sql_extra)) ? t('Show Ignored Requests') : t('Hide Ignored Requests')), + 'id' => "notifications-show-hide-link", + ); + + $r = q("SELECT COUNT(*) AS `total` FROM `intro` WHERE `intro`.`uid` = %d $sql_extra AND `intro`.`blocked` = 0 ", intval($_SESSION['uid']) ); - if($r && count($r)) { + if(dbm::is_result($r)) { $a->set_pager_total($r[0]['total']); $a->set_pager_itemspage(20); } @@ -114,7 +121,7 @@ function notifications_content(&$a) { WHERE `intro`.`uid` = %d $sql_extra AND `intro`.`blocked` = 0 ", intval($_SESSION['uid'])); - if(($r !== false) && (count($r))) { + if(dbm::is_result($r)) { $sugg = get_markup_template('suggestions.tpl'); $tpl = get_markup_template("intros.tpl"); @@ -240,82 +247,16 @@ function notifications_content(&$a) { $notif_header = t('Network Notifications'); $notif_tpl = get_markup_template('notifications.tpl'); - $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, - `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` as `object`, - `pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink`, `pitem`.`guid` as `pguid` - FROM `item` INNER JOIN `item` as `pitem` ON `pitem`.`id`=`item`.`parent` - WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND `pitem`.`parent` != 0 AND - `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0 ORDER BY `item`.`created` DESC" , - intval(local_user()) + $notifs = $nm->networkNotifs($show); + + $notif_show_lnk = array( + 'href' => ($show ? 'notifications/network' : 'notifications/network?show=all' ), + 'text' => ($show ? t('Show unread') : t('Show all')), ); -// $tpl_item_likes = get_markup_template('notifications_likes_item.tpl'); -// $tpl_item_dislikes = get_markup_template('notifications_dislikes_item.tpl'); -// $tpl_item_friends = get_markup_template('notifications_friends_item.tpl'); -// $tpl_item_comments = get_markup_template('notifications_comments_item.tpl'); -// $tpl_item_posts = get_markup_template('notifications_posts_item.tpl'); - - if ($r) { - - $notifs = array( - 'notifications' => $r, - 'ident' => 'network', - ); - -// foreach ($r as $it) { -// switch($it['verb']){ -// case ACTIVITY_LIKE: -// $notif_content[] = replace_macros($tpl_item_likes,array( -// //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], -// '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], -// '$item_image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), -// '$item_text' => sprintf( t("%s liked %s's post"), $it['author-name'], $it['pname']), -// '$item_when' => relative_date($it['created']) -// )); -// break; -// -// case ACTIVITY_DISLIKE: -// $notif_content[] = replace_macros($tpl_item_dislikes,array( -// //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], -// '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], -// '$item_image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), -// '$item_text' => sprintf( t("%s disliked %s's post"), $it['author-name'], $it['pname']), -// '$item_when' => relative_date($it['created']) -// )); -// break; -// -// case ACTIVITY_FRIEND: -// -// $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; -// $obj = parse_xml_string($xmlhead.$it['object']); -// $it['fname'] = $obj->title; -// -// $notif_content[] = replace_macros($tpl_item_friends,array( -// //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], -// '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], -// '$item_image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), -// '$item_text' => sprintf( t("%s is now friends with %s"), $it['author-name'], $it['fname']), -// '$item_when' => relative_date($it['created']) -// )); -// break; -// -// default: -// $item_text = (($it['id'] == $it['parent']) -// ? sprintf( t("%s created a new post"), $it['author-name']) -// : sprintf( t("%s commented on %s's post"), $it['author-name'], $it['pname'])); -// $tpl = (($it['id'] == $it['parent']) ? $tpl_item_posts : $tpl_item_comments); -// -// $notif_content[] = replace_macros($tpl,array( -// //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], -// '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], -// '$item_image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), -// '$item_text' => $item_text, -// '$item_when' => relative_date($it['created']) -// )); -// } -// } - - } else { + if(!dbm::is_result($notifs)) { + if($show) + $notif_show_lnk = array(); $notif_nocontent = t('No more network notifications.'); } @@ -325,28 +266,17 @@ function notifications_content(&$a) { $notif_header = t('System Notifications'); $notif_tpl = get_markup_template('notifications.tpl'); - $not_tpl = get_markup_template('notify.tpl'); - require_once('include/bbcode.php'); + $notifs = $nm->systemNotifs($show); - $r = q("SELECT * from notify where uid = %d and seen = 0 order by date desc", - intval(local_user()) + $notif_show_lnk = array( + 'href' => ($show ? 'notifications/system' : 'notifications/system?show=all' ), + 'text' => ($show ? t('Show unread') : t('Show all')), ); - if (count($r) > 0) { -// foreach ($r as $it) { -// $notif_content[] = replace_macros($not_tpl,array( -// '$item_link' => $a->get_baseurl(true).'/notify/view/'. $it['id'], -// '$item_image' => proxy_url($it['photo'], false, PROXY_SIZE_MICRO), -// '$item_text' => strip_tags(bbcode($it['msg'])), -// '$item_when' => relative_date($it['date']) -// )); -// } - $notifs = array( - 'notifications' => $r, - 'ident' => 'system', - ); + if(!dbm::is_result($notifs)) { + if($show) + $notif_show_lnk = array(); - } else { $notif_nocontent = t('No more system notifications.'); } @@ -355,94 +285,16 @@ function notifications_content(&$a) { $notif_header = t('Personal Notifications'); $notif_tpl = get_markup_template('notifications.tpl'); - $myurl = $a->get_baseurl(true) . '/profile/'. $a->user['nickname']; - $myurl = substr($myurl,strpos($myurl,'://')+3); - $myurl = str_replace(array('www.','.'),array('','\\.'),$myurl); - $diasp_url = str_replace('/profile/','/u/',$myurl); - $sql_extra .= sprintf(" AND ( `item`.`author-link` regexp '%s' or `item`.`tag` regexp '%s' or `item`.`tag` regexp '%s' ) ", - dbesc($myurl . '$'), - dbesc($myurl . '\\]'), - dbesc($diasp_url . '\\]') + $notifs = $nm->personalNotifs($show); + + $notif_show_lnk = array( + 'href' => ($show ? 'notifications/personal' : 'notifications/personal?show=all' ), + 'text' => ($show ? t('Show unread') : t('Show all')), ); - - $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, - `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` as `object`, - `pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink`, `pitem`.`guid` as `pguid` - FROM `item` INNER JOIN `item` as `pitem` ON `pitem`.`id`=`item`.`parent` - WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 - $sql_extra - AND `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0 ORDER BY `item`.`created` DESC" , - intval(local_user()) - ); - -// $tpl_item_likes = get_markup_template('notifications_likes_item.tpl'); -// $tpl_item_dislikes = get_markup_template('notifications_dislikes_item.tpl'); -// $tpl_item_friends = get_markup_template('notifications_friends_item.tpl'); -// $tpl_item_comments = get_markup_template('notifications_comments_item.tpl'); -// $tpl_item_posts = get_markup_template('notifications_posts_item.tpl'); - - if (count($r) > 0) { - $notifs =array( - 'notifications' => $r, - 'ident' => 'personal' - ); - - -// foreach ($r as $it) { -// switch($it['verb']){ -// case ACTIVITY_LIKE: -// $notif_content[] = replace_macros($tpl_item_likes,array( -// //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], -// '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], -// '$item_image' => $it['author-avatar'], -// '$item_text' => sprintf( t("%s liked %s's post"), $it['author-name'], $it['pname']), -// '$item_when' => relative_date($it['created']) -// )); -// break; -// -// case ACTIVITY_DISLIKE: -// $notif_content[] = replace_macros($tpl_item_dislikes,array( -// //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], -// '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], -// '$item_image' => $it['author-avatar'], -// '$item_text' => sprintf( t("%s disliked %s's post"), $it['author-name'], $it['pname']), -// '$item_when' => relative_date($it['created']) -// )); -// break; -// -// case ACTIVITY_FRIEND: -// -// $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; -// $obj = parse_xml_string($xmlhead.$it['object']); -// $it['fname'] = $obj->title; -// -// $notif_content[] = replace_macros($tpl_item_friends,array( -// //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], -// '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], -// '$item_image' => $it['author-avatar'], -// '$item_text' => sprintf( t("%s is now friends with %s"), $it['author-name'], $it['fname']), -// '$item_when' => relative_date($it['created']) -// )); -// break; -// -// default: -// $item_text = (($it['id'] == $it['parent']) -// ? sprintf( t("%s created a new post"), $it['author-name']) -// : sprintf( t("%s commented on %s's post"), $it['author-name'], $it['pname'])); -// $tpl = (($it['id'] == $it['parent']) ? $tpl_item_posts : $tpl_item_comments); -// -// $notif_content[] = replace_macros($tpl,array( -// //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], -// '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], -// '$item_image' => $it['author-avatar'], -// '$item_text' => $item_text, -// '$item_when' => relative_date($it['created']) -// )); -// } -// } - - } else { + if(!dbm::is_result($notifs)) { + if($show) + $notif_show_lnk = array(); $notif_nocontent = t('No more personal notifications.'); } @@ -452,90 +304,53 @@ function notifications_content(&$a) { $notif_header = t('Home Notifications'); $notif_tpl = get_markup_template('notifications.tpl'); - $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, - `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` as `object`, - `pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink`, `pitem`.`guid` as `pguid` - FROM `item` INNER JOIN `item` as `pitem` ON `pitem`.`id`=`item`.`parent` - WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND - `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 1 ORDER BY `item`.`created` DESC", - intval(local_user()) + $notifs = $nm->homeNotifs($show); + + $notif_show_lnk = array( + 'href' => ($show ? 'notifications/home' : 'notifications/home?show=all' ), + 'text' => ($show ? t('Show unread') : t('Show all')), ); -// $tpl_item_likes = get_markup_template('notifications_likes_item.tpl'); -// $tpl_item_dislikes = get_markup_template('notifications_dislikes_item.tpl'); -// $tpl_item_friends = get_markup_template('notifications_friends_item.tpl'); -// $tpl_item_comments = get_markup_template('notifications_comments_item.tpl'); + if(!dbm::is_result($notifs)) { + if($show) + $notif_show_lnk = array(); - if (count($r) > 0) { - - $notifs = array( - 'notifications' => $r, - 'ident' => 'home', - ); - -// foreach ($r as $it) { -// switch($it['verb']){ -// case ACTIVITY_LIKE: -// $notif_content[] = replace_macros($tpl_item_likes,array( -// //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], -// '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], -// '$item_image' => $it['author-avatar'], -// '$item_text' => sprintf( t("%s liked %s's post"), $it['author-name'], $it['pname']), -// '$item_when' => relative_date($it['created']) -// )); -// -// break; -// case ACTIVITY_DISLIKE: -// $notif_content[] = replace_macros($tpl_item_dislikes,array( -// //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], -// '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], -// '$item_image' => $it['author-avatar'], -// '$item_text' => sprintf( t("%s disliked %s's post"), $it['author-name'], $it['pname']), -// '$item_when' => relative_date($it['created']) -// )); -// -// break; -// case ACTIVITY_FRIEND: -// -// $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; -// $obj = parse_xml_string($xmlhead.$it['object']); -// $it['fname'] = $obj->title; -// -// $notif_content[] = replace_macros($tpl_item_friends,array( -// //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], -// '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], -// '$item_image' => $it['author-avatar'], -// '$item_text' => sprintf( t("%s is now friends with %s"), $it['author-name'], $it['fname']), -// '$item_when' => relative_date($it['created']) -// )); -// -// break; -// default: -// $notif_content[] = replace_macros($tpl_item_comments,array( -// //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], -// '$item_link' => $a->get_baseurl(true).'/display/'.$it['pguid'], -// '$item_image' => $it['author-avatar'], -// '$item_text' => sprintf( t("%s commented on %s's post"), $it['author-name'], $it['pname']), -// '$item_when' => relative_date($it['created']) -// )); -// } -// } - - } else { $notif_nocontent = t('No more home notifications.'); } } - if(count($notifs['notifications']) > 0 ) - $notif_content =$nm->format ($notifs); + if(count($notifs['notifications']) > 0 ) { + // The template files we need in different cases for formatting the content + $tpl_item_like = 'notifications_likes_item.tpl'; + $tpl_item_dislike = 'notifications_dislikes_item.tpl'; + $tpl_item_friend = 'notifications_friends_item.tpl'; + $tpl_item_comment = 'notifications_comments_item.tpl'; + $tpl_item_post = 'notifications_posts_item.tpl'; + $tpl_item_notify = 'notify.tpl'; + + foreach ($notifs['notifications'] as $it) { + $tplname = 'tpl_item_'.$it['label']; + $templ = get_markup_template($$tplname); + + $notif_content[] = replace_macros($templ,array( + '$item_label' => $it['label'], + '$item_link' => $it['link'], + '$item_image' => $it['image'], + '$item_text' => $it['text'], + '$item_when' => $it['when'], + '$item_seen' => $it['seen'], + )); + } + + } $o .= replace_macros($notif_tpl, array( '$notif_header' => $notif_header, '$tabs' => $tabs, '$notif_content' => $notif_content, '$notif_nocontent' => $notif_nocontent, - '$notif_ignored_lnk' => $notif_ignored_lnk, + '$notif_show_lnk' => $notif_show_lnk, )); $o .= paginate($a); diff --git a/view/templates/notifications.tpl b/view/templates/notifications.tpl index 9c671c2a5b..4048cfa46b 100644 --- a/view/templates/notifications.tpl +++ b/view/templates/notifications.tpl @@ -6,7 +6,7 @@
{{* The "show ignored" link *}} - {{if $notif_ignored_lnk}}{{$notif_ignored_lnk}}{{/if}} + {{if $notif_show_lnk}}{{$notif_show_lnk.text}}{{/if}} {{* The notifications *}} {{if $notif_content}} diff --git a/view/templates/notifications_comments_item.tpl b/view/templates/notifications_comments_item.tpl index a578941706..dfa15df280 100644 --- a/view/templates/notifications_comments_item.tpl +++ b/view/templates/notifications_comments_item.tpl @@ -1,4 +1,4 @@ -
+
{{$item_text}} {{$item_when}}
\ No newline at end of file diff --git a/view/templates/notifications_dislikes_item.tpl b/view/templates/notifications_dislikes_item.tpl index a578941706..dfa15df280 100644 --- a/view/templates/notifications_dislikes_item.tpl +++ b/view/templates/notifications_dislikes_item.tpl @@ -1,4 +1,4 @@ -
+
{{$item_text}} {{$item_when}}
\ No newline at end of file diff --git a/view/templates/notifications_friends_item.tpl b/view/templates/notifications_friends_item.tpl index a578941706..dfa15df280 100644 --- a/view/templates/notifications_friends_item.tpl +++ b/view/templates/notifications_friends_item.tpl @@ -1,4 +1,4 @@ -
+
{{$item_text}} {{$item_when}}
\ No newline at end of file diff --git a/view/templates/notifications_likes_item.tpl b/view/templates/notifications_likes_item.tpl index c2ebbd39e3..6add369cb4 100644 --- a/view/templates/notifications_likes_item.tpl +++ b/view/templates/notifications_likes_item.tpl @@ -1,4 +1,4 @@ -
+
{{$item_text}} {{$item_when}}
\ No newline at end of file diff --git a/view/templates/notifications_network_item.tpl b/view/templates/notifications_network_item.tpl index bef25326ec..64395a83d0 100644 --- a/view/templates/notifications_network_item.tpl +++ b/view/templates/notifications_network_item.tpl @@ -1,4 +1,4 @@ -
+
{{$item_text}} {{$item_when}}
diff --git a/view/templates/notifications_posts_item.tpl b/view/templates/notifications_posts_item.tpl index a578941706..dfa15df280 100644 --- a/view/templates/notifications_posts_item.tpl +++ b/view/templates/notifications_posts_item.tpl @@ -1,4 +1,4 @@ -
+
{{$item_text}} {{$item_when}}
\ No newline at end of file diff --git a/view/templates/notify.tpl b/view/templates/notify.tpl index a578941706..dfa15df280 100644 --- a/view/templates/notify.tpl +++ b/view/templates/notify.tpl @@ -1,4 +1,4 @@ -
+
{{$item_text}} {{$item_when}}
\ No newline at end of file diff --git a/view/theme/frio/templates/notifications.tpl b/view/theme/frio/templates/notifications.tpl index 3729e6f8c2..5f131bd7ed 100644 --- a/view/theme/frio/templates/notifications.tpl +++ b/view/theme/frio/templates/notifications.tpl @@ -6,7 +6,7 @@
{{* The "show ignored" link *}} - {{if $notif_ignored_lnk}}{{$notif_ignored_lnk}}{{/if}} + {{if $notif_show_lnk}}{{$notif_show_lnk.text}}{{/if}} {{* The notifications *}} {{if $notif_content}} From bcee356f661c02dc6f4d92bd223d293638d30475 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Mon, 1 Aug 2016 23:04:41 +0200 Subject: [PATCH 015/352] notifications - add docu & pagination --- include/NotificationsManager.php | 149 +++++++++++++++++--- mod/notifications.php | 26 ++-- view/templates/notifications.tpl | 3 + view/theme/frio/templates/notifications.tpl | 3 + 4 files changed, 151 insertions(+), 30 deletions(-) diff --git a/include/NotificationsManager.php b/include/NotificationsManager.php index 09e9c1494e..b14e76740b 100644 --- a/include/NotificationsManager.php +++ b/include/NotificationsManager.php @@ -183,7 +183,20 @@ class NotificationsManager { return $tabs; } - public function format($notifs, $ident = "") { + /** + * @brief Format the notification query in an usable array + * + * @param array $notifs The array from the db query + * @param string $ident The notifications identifier (e.g. network) + * @return array + * string 'label' => The type of the notification + * string 'link' => URL to the source + * string 'image' => The avatar image + * string 'text' => The notification text + * string 'when' => Relative date of the notification + * bool 'seen' => Is the notification marked as "seen" + */ + private function format($notifs, $ident = "") { $notif = array(); $arr = array(); @@ -191,13 +204,17 @@ class NotificationsManager { if (dbm::is_result($notifs)) { foreach ($notifs as $it) { + // Because we use different db tables for the notification query + // we have sometimes $it['unseen'] and sometimes $it['seen]. + // So we will have to transform $it['unseen'] if($it['unseen']) $it['seen'] = ($it['unseen'] > 0 ? false : true); + // Depending on the identifier of the notification we need to use different defaults switch ($ident) { case 'system': $default_item_label = 'notify'; - $default_item_link = app::get_baseurl(true).'/notify/view/'. $it['id']; + $default_item_link = $this->a->get_baseurl(true).'/notify/view/'. $it['id']; $default_item_image = proxy_url($it['photo'], false, PROXY_SIZE_MICRO); $default_item_text = strip_tags(bbcode($it['msg'])); $default_item_when = relative_date($it['date']); @@ -206,7 +223,7 @@ class NotificationsManager { case 'home': $default_item_label = 'comment'; - $default_item_link = app::get_baseurl(true).'/display/'.$it['pguid']; + $default_item_link = $this->a->get_baseurl(true).'/display/'.$it['pguid']; $default_item_image = proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO); $default_item_text = sprintf( t("%s commented on %s's post"), $it['author-name'], $it['pname']); $default_item_when = relative_date($it['created']); @@ -215,7 +232,7 @@ class NotificationsManager { default: $default_item_label = (($it['id'] == $it['parent']) ? 'post' : 'comment'); - $default_item_link = app::get_baseurl(true).'/display/'.$it['pguid']; + $default_item_link = $this->a->get_baseurl(true).'/display/'.$it['pguid']; $default_item_image = proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO); $default_item_text = (($it['id'] == $it['parent']) ? sprintf( t("%s created a new post"), $it['author-name']) @@ -225,12 +242,13 @@ class NotificationsManager { } + // Transform the different types of notification in an usable array switch($it['verb']){ case ACTIVITY_LIKE: $notif = array( //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], 'label' => 'like', - 'link' => app::get_baseurl(true).'/display/'.$it['pguid'], + 'link' => $this->a->get_baseurl(true).'/display/'.$it['pguid'], '$image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), 'text' => sprintf( t("%s liked %s's post"), $it['author-name'], $it['pname']), 'when' => relative_date($it['created']), @@ -242,7 +260,7 @@ class NotificationsManager { $notif = array( //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], 'label' => 'dislike', - 'link' => app::get_baseurl(true).'/display/'.$it['pguid'], + 'link' => $this->a->get_baseurl(true).'/display/'.$it['pguid'], 'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), 'text' => sprintf( t("%s disliked %s's post"), $it['author-name'], $it['pname']), 'when' => relative_date($it['created']), @@ -258,7 +276,7 @@ class NotificationsManager { $notif = array( //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], 'label' => 'friend', - 'link' => app::get_baseurl(true).'/display/'.$it['pguid'], + 'link' => $this->a->get_baseurl(true).'/display/'.$it['pguid'], 'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), 'text' => sprintf( t("%s is now friends with %s"), $it['author-name'], $it['fname']), 'when' => relative_date($it['created']), @@ -286,6 +304,13 @@ class NotificationsManager { } + /** + * @brief Total number of network notifications + * @param int $seen + * If 0 only include notifications into the query + * which arn't marked as "seen" into + * @return int Number of network notifications + */ private function networkTotal($seen = 0) { if($seen === 0) $sql_seen = " AND `item`.`unseen` = 1 "; @@ -304,7 +329,18 @@ class NotificationsManager { return 0; } - public function networkNotifs($seen = 0) { + /** + * @brief Get network notifications + * + * @param type $seen + * If 0 only include notifications into the query + * which arn't marked as "seen" into + * @param int $start Start the query at this point + * @param int $limit Maximum number of query results + * + * @return array Query output + */ + public function networkNotifs($seen = 0, $start = 0, $limit = 20) { $ident = 'network'; $total = $this->networkTotal($seen); @@ -319,8 +355,10 @@ class NotificationsManager { WHERE `item`.`visible` = 1 AND `pitem`.`parent` != 0 AND `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0 $sql_seen - ORDER BY `item`.`created` DESC", - intval(local_user()) + ORDER BY `item`.`created` DESC LIMIT %d, %d ", + intval(local_user()), + intval($start), + intval($limit) ); if(dbm::is_result($r)) { @@ -335,6 +373,13 @@ class NotificationsManager { } } + /** + * @brief Total number of system notifications + * @param int $seen + * If 0 only include notifications into the query + * which arn't marked as "seen" into + * @return int Number of system notifications + */ private function systemTotal($seen = 0) { if($seen === 0) $sql_seen = " AND `seen` = 0 "; @@ -349,15 +394,29 @@ class NotificationsManager { return 0; } - public function systemNotifs($seen = 0) { + /** + * @brief Get system notifications + * + * @param type $seen + * If 0 only include notifications into the query + * which arn't marked as "seen" into + * @param int $start Start the query at this point + * @param int $limit Maximum number of query results + * + * @return array Query output + */ + public function systemNotifs($seen = 0, $start = 0, $limit = 20) { $ident = 'system'; $total = $this->systemTotal($seen); if($seen === 0) $sql_seen = " AND `seen` = 0 "; - $r = q("SELECT * FROM `notify` WHERE `uid` = %d $sql_seen ORDER BY `date` DESC", - intval(local_user()) + $r = q("SELECT `id`, `photo`, `msg`, `date`, `seen` FROM `notify` + WHERE `uid` = %d $sql_seen ORDER BY `date` DESC LIMIT %d, %d ", + intval(local_user()), + intval($start), + intval($limit) ); if(dbm::is_result($r)) { @@ -372,8 +431,13 @@ class NotificationsManager { } } + /** + * @brief Addional SQL query string for the personal notifications + * + * @return string The additional sql query + */ private function _personal_sql_extra() { - $myurl = app::get_baseurl(true) . '/profile/'. $this->a->user['nickname']; + $myurl = $this->a->get_baseurl(true) . '/profile/'. $this->a->user['nickname']; $myurl = substr($myurl,strpos($myurl,'://')+3); $myurl = str_replace(array('www.','.'),array('','\\.'),$myurl); $diasp_url = str_replace('/profile/','/u/',$myurl); @@ -386,6 +450,13 @@ class NotificationsManager { return $sql_extra; } + /** + * @brief Total number of personal notifications + * @param int $seen + * If 0 only include notifications into the query + * which arn't marked as "seen" into + * @return int Number of personal notifications + */ private function personalTotal($seen = 0) { $sql_extra .= $this->_personal_sql_extra(); @@ -406,7 +477,19 @@ class NotificationsManager { return 0; } - public function personalNotifs($seen = 0) { + + /** + * @brief Get personal notifications + * + * @param type $seen + * If 0 only include notifications into the query + * which arn't marked as "seen" into + * @param int $start Start the query at this point + * @param int $limit Maximum number of query results + * + * @return array Query output + */ + public function personalNotifs($seen = 0, $start = 0, $limit = 20) { $ident = 'personal'; $total = 0; $sql_extra .= $this->_personal_sql_extra(); @@ -422,8 +505,10 @@ class NotificationsManager { $sql_extra $sql_seen AND `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0 - ORDER BY `item`.`created` DESC" , - intval(local_user()) + ORDER BY `item`.`created` DESC LIMIT %d, %d " , + intval(local_user()), + intval($start), + intval($limit) ); if(dbm::is_result($r)) { @@ -438,24 +523,42 @@ class NotificationsManager { } } + /** + * @brief Total number of home notifications + * @param int $seen + * If 0 only include notifications into the query + * which arn't marked as "seen" into + * @return int Number of home notifications + */ private function homeTotal($seen = 0) { if($seen === 0) $sql_seen = " AND `item`.`unseen` = 1 "; $r = q("SELECT COUNT(*) AS `total` FROM `item` - WHERE ``item`.`visible` = 1 AND + WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 1 $sql_seen", intval(local_user()) ); if(dbm::is_result($r)) - return $r['total']; + return $r[0]['total']; return 0; } - public function homeNotifs($seen = 0) { + /** + * @brief Get home notifications + * + * @param type $seen + * If 0 only include notifications into the query + * which arn't marked as "seen" into + * @param int $start Start the query at this point + * @param int $limit Maximum number of query results + * + * @return array Query output + */ + public function homeNotifs($seen = 0, $start = 0, $limit = 20) { $ident = 'home'; $total = $this->homeTotal($seen); @@ -471,8 +574,10 @@ class NotificationsManager { WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 1 $sql_seen - ORDER BY `item`.`created` DESC", - intval(local_user()) + ORDER BY `item`.`created` DESC LIMIT %d, %d ", + intval(local_user()), + intval($start), + intval($limit) ); if(dbm::is_result($r)) { diff --git a/mod/notifications.php b/mod/notifications.php index faf7651914..cdafe07ee9 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -67,7 +67,9 @@ function notifications_content(&$a) { return; } + $page = (x($_REQUEST,'page') ? $_REQUEST['page'] : 1); $show = (x($_REQUEST,'show') ? $_REQUEST['show'] : 0); + nav_set_selected('notifications'); $json = (($a->argc > 1 && $a->argv[$a->argc - 1] === 'json') ? true : false); @@ -78,6 +80,8 @@ function notifications_content(&$a) { // get the nav tabs for the notification pages $tabs = $nm->getTabs(); $notif_content = array(); + $perpage = 20; + $startrec = ($page * $perpage) - $perpage; if( (($a->argc > 1) && ($a->argv[1] == 'intros')) || (($a->argc == 1))) { nav_set_selected('introductions'); @@ -90,8 +94,6 @@ function notifications_content(&$a) { $notif_header = t('Notifications'); $notif_tpl = get_markup_template('notifications.tpl'); -// $notif_show_lnk .= '' -// . ((strlen($sql_extra)) ? t('Show Ignored Requests') : t('Hide Ignored Requests')) . '
' . "\r\n"; $notif_show_lnk = array( 'href' => ((strlen($sql_extra)) ? 'notifications/intros/all' : 'notifications/intros' ), @@ -105,7 +107,7 @@ function notifications_content(&$a) { ); if(dbm::is_result($r)) { $a->set_pager_total($r[0]['total']); - $a->set_pager_itemspage(20); + $a->set_pager_itemspage($perpage); } /// @todo Fetch contact details by "get_contact_details_by_url" instead of queries to contact, fcontact and gcontact @@ -247,7 +249,7 @@ function notifications_content(&$a) { $notif_header = t('Network Notifications'); $notif_tpl = get_markup_template('notifications.tpl'); - $notifs = $nm->networkNotifs($show); + $notifs = $nm->networkNotifs($show, $startrec, $perpage); $notif_show_lnk = array( 'href' => ($show ? 'notifications/network' : 'notifications/network?show=all' ), @@ -266,7 +268,7 @@ function notifications_content(&$a) { $notif_header = t('System Notifications'); $notif_tpl = get_markup_template('notifications.tpl'); - $notifs = $nm->systemNotifs($show); + $notifs = $nm->systemNotifs($show, $startrec, $perpage); $notif_show_lnk = array( 'href' => ($show ? 'notifications/system' : 'notifications/system?show=all' ), @@ -285,7 +287,7 @@ function notifications_content(&$a) { $notif_header = t('Personal Notifications'); $notif_tpl = get_markup_template('notifications.tpl'); - $notifs = $nm->personalNotifs($show); + $notifs = $nm->personalNotifs($show, $startrec, $perpage); $notif_show_lnk = array( 'href' => ($show ? 'notifications/personal' : 'notifications/personal?show=all' ), @@ -304,7 +306,7 @@ function notifications_content(&$a) { $notif_header = t('Home Notifications'); $notif_tpl = get_markup_template('notifications.tpl'); - $notifs = $nm->homeNotifs($show); + $notifs = $nm->homeNotifs($show, $startrec, $perpage); $notif_show_lnk = array( 'href' => ($show ? 'notifications/home' : 'notifications/home?show=all' ), @@ -321,6 +323,14 @@ function notifications_content(&$a) { } if(count($notifs['notifications']) > 0 ) { + // set the pager + $a->set_pager_total($notifs['total']); + $a->set_pager_itemspage($perpage); + + // add additional informations (needed for json output) + $notifs['items_page'] = $a->pager['itemspage']; + $notifs['page'] = $a->pager['page']; + // The template files we need in different cases for formatting the content $tpl_item_like = 'notifications_likes_item.tpl'; $tpl_item_dislike = 'notifications_dislikes_item.tpl'; @@ -351,8 +361,8 @@ function notifications_content(&$a) { '$notif_content' => $notif_content, '$notif_nocontent' => $notif_nocontent, '$notif_show_lnk' => $notif_show_lnk, + '$notif_paginate' => paginate($a) )); - $o .= paginate($a); return $o; } diff --git a/view/templates/notifications.tpl b/view/templates/notifications.tpl index 4048cfa46b..f3068226c4 100644 --- a/view/templates/notifications.tpl +++ b/view/templates/notifications.tpl @@ -19,4 +19,7 @@ {{if $notif_nocontent}}
{{$notif_nocontent}}
{{/if}} + + {{* The pager *}} + {{$notif_paginate}}
diff --git a/view/theme/frio/templates/notifications.tpl b/view/theme/frio/templates/notifications.tpl index 5f131bd7ed..82f11c8be4 100644 --- a/view/theme/frio/templates/notifications.tpl +++ b/view/theme/frio/templates/notifications.tpl @@ -22,4 +22,7 @@
{{$notif_nocontent}}
{{/if}}
+ + {{* The pager *}} + {{$notif_paginate}}
From 6d3c15fe9100de9d773ddb28784574d046fbe8ea Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Tue, 2 Aug 2016 00:01:43 +0200 Subject: [PATCH 016/352] notifications - add attendance notifications --- include/NotificationsManager.php | 37 +++++++++++++++++--- mod/notifications.php | 3 ++ view/templates/notifications_attend_item.tpl | 4 +++ 3 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 view/templates/notifications_attend_item.tpl diff --git a/include/NotificationsManager.php b/include/NotificationsManager.php index b14e76740b..362e3f5326 100644 --- a/include/NotificationsManager.php +++ b/include/NotificationsManager.php @@ -246,7 +246,6 @@ class NotificationsManager { switch($it['verb']){ case ACTIVITY_LIKE: $notif = array( - //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], 'label' => 'like', 'link' => $this->a->get_baseurl(true).'/display/'.$it['pguid'], '$image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), @@ -258,7 +257,6 @@ class NotificationsManager { case ACTIVITY_DISLIKE: $notif = array( - //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], 'label' => 'dislike', 'link' => $this->a->get_baseurl(true).'/display/'.$it['pguid'], 'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), @@ -268,13 +266,45 @@ class NotificationsManager { ); break; + case ACTIVITY_ATTEND: + $notif = array( + 'label' => 'attend', + 'link' => $this->a->get_baseurl(true).'/display/'.$it['pguid'], + 'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), + 'text' => sprintf( t("%s is attending %s's event"), $it['author-name'], $it['pname']), + 'when' => relative_date($it['created']), + 'seen' => $it['seen'] + ); + break; + + case ACTIVITY_ATTENDNO: + $notif = array( + 'label' => 'attendno', + 'link' => $this->a->get_baseurl(true).'/display/'.$it['pguid'], + 'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), + 'text' => sprintf( t("%s is not attending %s's event"), $it['author-name'], $it['pname']), + 'when' => relative_date($it['created']), + 'seen' => $it['seen'] + ); + break; + + case ACTIVITY_ATTENDMAYBE: + $notif = array( + 'label' => 'attendmaybe', + 'link' => $this->a->get_baseurl(true).'/display/'.$it['pguid'], + 'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), + 'text' => sprintf( t("%s may attend %s's event"), $it['author-name'], $it['pname']), + 'when' => relative_date($it['created']), + 'seen' => $it['seen'] + ); + break; + case ACTIVITY_FRIEND: $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; $obj = parse_xml_string($xmlhead.$it['object']); $it['fname'] = $obj->title; $notif = array( - //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], 'label' => 'friend', 'link' => $this->a->get_baseurl(true).'/display/'.$it['pguid'], 'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), @@ -286,7 +316,6 @@ class NotificationsManager { default: $notif = array( - //'$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], 'label' => $default_item_label, 'link' => $default_item_link, 'image' => $default_item_image, diff --git a/mod/notifications.php b/mod/notifications.php index cdafe07ee9..a22703ba95 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -334,6 +334,9 @@ function notifications_content(&$a) { // The template files we need in different cases for formatting the content $tpl_item_like = 'notifications_likes_item.tpl'; $tpl_item_dislike = 'notifications_dislikes_item.tpl'; + $tpl_item_attend = 'notifications_attend_item.tpl'; + $tpl_item_attendno = 'notifications_attend_item.tpl'; + $tpl_item_attendmaybe = 'notifications_attend_item.tpl'; $tpl_item_friend = 'notifications_friends_item.tpl'; $tpl_item_comment = 'notifications_comments_item.tpl'; $tpl_item_post = 'notifications_posts_item.tpl'; diff --git a/view/templates/notifications_attend_item.tpl b/view/templates/notifications_attend_item.tpl new file mode 100644 index 0000000000..6add369cb4 --- /dev/null +++ b/view/templates/notifications_attend_item.tpl @@ -0,0 +1,4 @@ + +
+ {{$item_text}} {{$item_when}} +
\ No newline at end of file From b9dbb0ace1f80f51892b382f68f6441fb7d5c906 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Tue, 2 Aug 2016 06:28:34 +0200 Subject: [PATCH 017/352] Split cronhook call to several single calls --- include/cron.php | 38 ++++++++++++++++++++------------ include/cronhooks.php | 21 +++++++++++++++--- include/plugin.php | 50 +++++++++++++++++++++++-------------------- include/poller.php | 4 ++-- 4 files changed, 71 insertions(+), 42 deletions(-) diff --git a/include/cron.php b/include/cron.php index c54fef8a9c..28d6713f54 100644 --- a/include/cron.php +++ b/include/cron.php @@ -142,28 +142,44 @@ function cron_run(&$argv, &$argc){ // Repair entries in the database cron_repair_database(); + // Poll contacts + cron_poll_contacts($argc, $argv); + + logger('cron: end'); + + set_config('system','last_cron', time()); + + return; +} + +/** + * @brief Clear cache entries + * + * @param App $a + */ +function cron_poll_contacts($argc, $argv) { $manual_id = 0; $generation = 0; $force = false; $restart = false; - if(($argc > 1) && ($argv[1] == 'force')) + if (($argc > 1) && ($argv[1] == 'force')) $force = true; - if(($argc > 1) && ($argv[1] == 'restart')) { + if (($argc > 1) && ($argv[1] == 'restart')) { $restart = true; $generation = intval($argv[2]); - if(! $generation) + if (!$generation) killme(); } - if(($argc > 1) && intval($argv[1])) { + if (($argc > 1) && intval($argv[1])) { $manual_id = intval($argv[1]); $force = true; } $interval = intval(get_config('system','poll_interval')); - if(! $interval) + if (!$interval) $interval = ((get_config('system','delivery_interval') === false) ? 3 : intval(get_config('system','delivery_interval'))); // If we are using the worker we don't need a delivery interval @@ -200,11 +216,11 @@ function cron_run(&$argv, &$argc){ dbesc(NETWORK_MAIL2) ); - if(! count($contacts)) { + if (!count($contacts)) { return; } - foreach($contacts as $c) { + foreach ($contacts as $c) { $res = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1", intval($c['id']) @@ -266,7 +282,7 @@ function cron_run(&$argv, &$argc){ $update = true; break; } - if(!$update) + if (!$update) continue; } @@ -278,12 +294,6 @@ function cron_run(&$argv, &$argc){ @time_sleep_until(microtime(true) + (float) $interval); } } - - logger('cron: end'); - - set_config('system','last_cron', time()); - - return; } /** diff --git a/include/cronhooks.php b/include/cronhooks.php index b6cf0e7237..4bb1e5f659 100644 --- a/include/cronhooks.php +++ b/include/cronhooks.php @@ -31,6 +31,17 @@ function cronhooks_run(&$argv, &$argc){ return; } + load_hooks(); + + if (($argc == 2) AND is_array($a->hooks) AND array_key_exists("cron", $a->hooks)) { + foreach ($a->hooks["cron"] as $hook) + if ($hook[1] == $argv[1]) { + logger("Calling cron hook '".$hook[1]."'", LOGGER_DEBUG); + call_single_hook($a, $name, $hook, $data); + } + return; + } + $last = get_config('system','last_cronhook'); $poll_interval = intval(get_config('system','cronhook_interval')); @@ -47,13 +58,17 @@ function cronhooks_run(&$argv, &$argc){ $a->set_baseurl(get_config('system','url')); - load_hooks(); - logger('cronhooks: start'); $d = datetime_convert(); - call_hooks('cron', $d); + if (get_config("system", "worker") AND is_array($a->hooks) AND array_key_exists("cron", $a->hooks)) { + foreach ($a->hooks["cron"] as $hook) { + logger("Calling cronhooks for '".$hook[1]."'", LOGGER_DEBUG); + proc_run(PRIORITY_MEDIUM, "include/cronhooks.php", $hook[1]); + } + } else + call_hooks('cron', $d); logger('cronhooks: end'); diff --git a/include/plugin.php b/include/plugin.php index e25e9e85b1..f6e4a7a882 100644 --- a/include/plugin.php +++ b/include/plugin.php @@ -205,37 +205,41 @@ function load_hooks() { * @param string $name of the hook to call * @param string|array &$data to transmit to the callback handler */ -if(! function_exists('call_hooks')) { function call_hooks($name, &$data = null) { $stamp1 = microtime(true); $a = get_app(); - #logger($name, LOGGER_ALL); + if (is_array($a->hooks) && array_key_exists($name, $a->hooks)) + foreach ($a->hooks[$name] as $hook) + call_single_hook($a, $name, $hook, $data); +} - if((is_array($a->hooks)) && (array_key_exists($name,$a->hooks))) { - foreach($a->hooks[$name] as $hook) { - // Don't run a theme's hook if the user isn't using the theme - if(strpos($hook[0], 'view/theme/') !== false && strpos($hook[0], 'view/theme/'.current_theme()) === false) - continue; +/** + * @brief Calls a single hook. + * + * @param string $name of the hook to call + * @param array $hook Hook data + * @param string|array &$data to transmit to the callback handler + */ +function call_single_hook($a, $name, $hook, &$data = null) { + // Don't run a theme's hook if the user isn't using the theme + if (strpos($hook[0], 'view/theme/') !== false && strpos($hook[0], 'view/theme/'.current_theme()) === false) + return; - @include_once($hook[0]); - if(function_exists($hook[1])) { - $func = $hook[1]; - //logger($name." => ".$hook[0].":".$func."()", LOGGER_DEBUG); - $func($a,$data); - } - else { - // remove orphan hooks - q("DELETE FROM `hook` WHERE `hook` = '%s' AND `file` = '%s' AND `function` = '%s'", - dbesc($name), - dbesc($hook[0]), - dbesc($hook[1]) - ); - } - } + @include_once($hook[0]); + if (function_exists($hook[1])) { + $func = $hook[1]; + $func($a, $data); + } else { + // remove orphan hooks + q("DELETE FROM `hook` WHERE `hook` = '%s' AND `file` = '%s' AND `function` = '%s'", + dbesc($name), + dbesc($hook[0]), + dbesc($hook[1]) + ); } -}} +} //check if an app_menu hook exist for plugin $name. //Return true if the plugin is an app diff --git a/include/poller.php b/include/poller.php index b54757b00b..811b81e174 100644 --- a/include/poller.php +++ b/include/poller.php @@ -46,10 +46,10 @@ function poller_run(&$argv, &$argc){ if(($argc <= 1) OR ($argv[1] != "no_cron")) { // Run the cron job that calls all other jobs - proc_run("php","include/cron.php"); + proc_run(PRIORITY_MEDIUM, "include/cron.php"); // Run the cronhooks job separately from cron for being able to use a different timing - proc_run("php","include/cronhooks.php"); + proc_run(PRIORITY_MEDIUM, "include/cronhooks.php"); // Cleaning dead processes poller_kill_stale_workers(); From 13c285d61df4fa30aa8fa1f47d7ecbec31c5f208 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Tue, 2 Aug 2016 10:19:10 +0200 Subject: [PATCH 018/352] Updated documentation --- include/cron.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/cron.php b/include/cron.php index 28d6713f54..82c8cc7a16 100644 --- a/include/cron.php +++ b/include/cron.php @@ -153,9 +153,10 @@ function cron_run(&$argv, &$argc){ } /** - * @brief Clear cache entries + * @brief Poll contacts for unreceived messages * - * @param App $a + * @param Integer $argc Number of command line arguments + * @param Array $argv Array of command line arguments */ function cron_poll_contacts($argc, $argv) { $manual_id = 0; From 87fb0b7b26dbbffc6d341e45fd5d4a558c36c250 Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Tue, 2 Aug 2016 12:24:07 +0200 Subject: [PATCH 019/352] Quick fix to PR #2682 --- include/api.php | 5 +++-- include/xml.php | 25 +++++++++++++++---------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/include/api.php b/include/api.php index 14d11f6695..a856b747f8 100644 --- a/include/api.php +++ b/include/api.php @@ -768,6 +768,7 @@ } $data3 = array($root_element => $data2); + $ret = xml::from_array($data3, $xml, false, $namespaces); return $ret; } @@ -2377,9 +2378,9 @@ $res = array(); $uri = $item['uri']."-l"; foreach($activities as $k => $v) { - $res[$k] = ( x($v,$uri) ? array_map("api_contactlink_to_array", $v[$uri]) : array() ); + $res[$k] = (x($v,$uri)?count($v[$uri]):0); + #$res[$k] = ( x($v,$uri) ? array_map("api_contactlink_to_array", $v[$uri]) : array() ); } - return $res; } diff --git a/include/xml.php b/include/xml.php index a60d0671d3..f45d6cade0 100644 --- a/include/xml.php +++ b/include/xml.php @@ -51,8 +51,13 @@ class xml { $element = $xml; if (is_integer($key)) { - if (isset($element)) - $element[0] = $value; + if (isset($element)) { + if (is_scalar($value)) { + $element[0] = $value; + } else { + /// @todo: handle nested array values + } + } continue; } @@ -145,11 +150,11 @@ class xml { /** * @brief Convert an XML document to a normalised, case-corrected array * used by webfinger - * + * * @param object $xml_element The XML document - * @param integer $recursion_depth recursion counter for internal use - default 0 + * @param integer $recursion_depth recursion counter for internal use - default 0 * internal use, recursion counter - * + * * @return array | sring The array from the xml element or the string */ public static function element_to_array($xml_element, &$recursion_depth=0) { @@ -195,23 +200,23 @@ class xml { /** * @brief Convert the given XML text to an array in the XML structure. - * + * * xml::to_array() will convert the given XML text to an array in the XML structure. * Link: http://www.bin-co.com/php/scripts/xml2array/ * Portions significantly re-written by mike@macgirvin.com for Friendica * (namespaces, lowercase tags, get_attribute default changed, more...) - * + * * Examples: $array = xml::to_array(file_get_contents('feed.xml')); * $array = xml::to_array(file_get_contents('feed.xml', true, 1, 'attribute')); - * + * * @param object $contents The XML text * @param boolean $namespaces True or false include namespace information * in the returned array as array elements. - * @param integer $get_attributes 1 or 0. If this is 1 the function will get the attributes as well as the tag values - + * @param integer $get_attributes 1 or 0. If this is 1 the function will get the attributes as well as the tag values - * this results in a different array structure in the return value. * @param string $priority Can be 'tag' or 'attribute'. This will change the way the resulting * array sturcture. For 'tag', the tags are given more importance. - * + * * @return array The parsed XML in an array form. Use print_r() to see the resulting array structure. */ public static function to_array($contents, $namespaces = true, $get_attributes=1, $priority = 'attribute') { From 35bbc3948f2aa082785a79e144d6dc142487ba32 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Tue, 2 Aug 2016 12:30:04 +0200 Subject: [PATCH 020/352] DE update to the strings --- view/de/messages.po | 4575 ++++++++++++++++++++++--------------------- view/de/strings.php | 1299 ++++++------ 2 files changed, 2939 insertions(+), 2935 deletions(-) diff --git a/view/de/messages.po b/view/de/messages.po index 3314bf5933..c541ce9089 100644 --- a/view/de/messages.po +++ b/view/de/messages.po @@ -5,7 +5,7 @@ # Translators: # Andreas H., 2015 # Andreas H., 2015-2016 -# bavatar , 2011 +# Tobias Diekershoff , 2011 # David Rabel , 2016 # Erkan Yilmaz , 2011 # Fabian Dost , 2012 @@ -22,20 +22,22 @@ # Matthias Moritz , 2012 # Oliver , 2015 # Oliver , 2012 +# rabuzarus , 2016 # Sennewood , 2013 # Sennewood , 2012-2013 # silke m , 2015 -# bavatar , 2013-2016 -# bavatar , 2011-2013 +# Tobias Diekershoff , 2013-2016 +# Tobias Diekershoff , 2011-2013 +# Tobias Diekershoff , 2016 # zottel , 2011-2012 # tschlotfeldt , 2011 msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-08 19:22+0200\n" -"PO-Revision-Date: 2016-07-17 10:34+0000\n" -"Last-Translator: David Rabel \n" +"POT-Creation-Date: 2016-08-01 07:44+0200\n" +"PO-Revision-Date: 2016-08-02 10:25+0000\n" +"Last-Translator: Tobias Diekershoff \n" "Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -43,88 +45,7 @@ msgstr "" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: boot.php:887 -msgid "Delete this item?" -msgstr "Diesen Beitrag löschen?" - -#: boot.php:888 mod/content.php:727 mod/content.php:945 mod/photos.php:1616 -#: mod/photos.php:1664 mod/photos.php:1752 object/Item.php:403 -#: object/Item.php:719 -msgid "Comment" -msgstr "Kommentar" - -#: boot.php:889 include/contact_widgets.php:242 include/ForumManager.php:119 -#: include/items.php:2122 mod/content.php:624 object/Item.php:432 -#: view/theme/vier/theme.php:260 -msgid "show more" -msgstr "mehr anzeigen" - -#: boot.php:890 -msgid "show fewer" -msgstr "weniger anzeigen" - -#: boot.php:1483 -#, php-format -msgid "Update %s failed. See error logs." -msgstr "Update %s fehlgeschlagen. Bitte Fehlerprotokoll überprüfen." - -#: boot.php:1595 -msgid "Create a New Account" -msgstr "Neues Konto erstellen" - -#: boot.php:1596 include/nav.php:111 mod/register.php:280 -msgid "Register" -msgstr "Registrieren" - -#: boot.php:1620 include/nav.php:75 view/theme/frio/theme.php:243 -msgid "Logout" -msgstr "Abmelden" - -#: boot.php:1621 include/nav.php:94 mod/bookmarklet.php:12 -msgid "Login" -msgstr "Anmeldung" - -#: boot.php:1623 mod/lostpass.php:161 -msgid "Nickname or Email: " -msgstr "Spitzname oder E-Mail:" - -#: boot.php:1624 -msgid "Password: " -msgstr "Passwort: " - -#: boot.php:1625 -msgid "Remember me" -msgstr "Anmeldedaten merken" - -#: boot.php:1628 -msgid "Or login using OpenID: " -msgstr "Oder melde Dich mit Deiner OpenID an: " - -#: boot.php:1634 -msgid "Forgot your password?" -msgstr "Passwort vergessen?" - -#: boot.php:1635 mod/lostpass.php:109 -msgid "Password Reset" -msgstr "Passwort zurücksetzen" - -#: boot.php:1637 -msgid "Website Terms of Service" -msgstr "Website Nutzungsbedingungen" - -#: boot.php:1638 -msgid "terms of service" -msgstr "Nutzungsbedingungen" - -#: boot.php:1640 -msgid "Website Privacy Policy" -msgstr "Website Datenschutzerklärung" - -#: boot.php:1641 -msgid "privacy policy" -msgstr "Datenschutzerklärung" - -#: include/datetime.php:57 include/datetime.php:59 mod/profiles.php:698 +#: include/datetime.php:57 include/datetime.php:59 mod/profiles.php:699 msgid "Miscellaneous" msgstr "Verschiedenes" @@ -132,7 +53,7 @@ msgstr "Verschiedenes" msgid "Birthday:" msgstr "Geburtstag:" -#: include/datetime.php:185 mod/profiles.php:721 +#: include/datetime.php:185 mod/profiles.php:722 msgid "Age: " msgstr "Alter: " @@ -256,8 +177,8 @@ msgstr "Name oder Interessen eingeben" #: include/contact_widgets.php:32 include/conversation.php:978 #: include/Contact.php:324 mod/dirfind.php:204 mod/match.php:72 -#: mod/allfriends.php:66 mod/contacts.php:600 mod/follow.php:103 -#: mod/suggest.php:83 +#: mod/allfriends.php:66 mod/follow.php:103 mod/suggest.php:83 +#: mod/contacts.php:602 msgid "Connect/Follow" msgstr "Verbinden/Folgen" @@ -265,7 +186,7 @@ msgstr "Verbinden/Folgen" msgid "Examples: Robert Morgenstein, Fishing" msgstr "Beispiel: Robert Morgenstein, Angeln" -#: include/contact_widgets.php:34 mod/directory.php:212 mod/contacts.php:791 +#: include/contact_widgets.php:34 mod/directory.php:212 mod/contacts.php:796 msgid "Find" msgstr "Finde" @@ -315,6 +236,12 @@ msgid_plural "%d contacts in common" msgstr[0] "%d gemeinsamer Kontakt" msgstr[1] "%d gemeinsame Kontakte" +#: include/contact_widgets.php:242 include/ForumManager.php:119 +#: include/items.php:2122 mod/content.php:624 object/Item.php:432 +#: view/theme/vier/theme.php:260 boot.php:889 +msgid "show more" +msgstr "mehr anzeigen" + #: include/enotify.php:24 msgid "Friendica Notification" msgstr "Friendica-Benachrichtigung" @@ -612,18 +539,6 @@ 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/plugin.php:522 include/plugin.php:524 -msgid "Click here to upgrade." -msgstr "Zum Upgraden hier klicken." - -#: include/plugin.php:530 -msgid "This action exceeds the limits set by your subscription plan." -msgstr "Diese Aktion überschreitet die Obergrenze Deines Abonnements." - -#: include/plugin.php:535 -msgid "This action is not available under your subscription plan." -msgstr "Diese Aktion ist in Deinem Abonnement nicht verfügbar." - #: include/ForumManager.php:114 include/text.php:998 include/nav.php:130 #: view/theme/vier/theme.php:255 msgid "Forums" @@ -633,28 +548,6 @@ msgstr "Foren" msgid "External link to forum" msgstr "Externer Link zum Forum" -#: include/diaspora.php:1379 include/conversation.php:141 include/like.php:182 -#: 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/diaspora.php:1383 include/conversation.php:125 -#: include/conversation.php:134 include/conversation.php:261 -#: include/conversation.php:270 include/like.php:163 mod/tagger.php:62 -#: mod/subthread.php:87 view/theme/diabook/theme.php:466 -#: view/theme/diabook/theme.php:475 -msgid "status" -msgstr "Status" - -#: include/diaspora.php:1909 -msgid "Sharing notification from Diaspora network" -msgstr "Freigabe-Benachrichtigung von Diaspora" - -#: include/diaspora.php:2801 -msgid "Attachments:" -msgstr "Anhänge:" - #: include/dfrn.php:1110 #, php-format msgid "%s\\'s birthday" @@ -714,8 +607,8 @@ msgid "Finishes:" msgstr "Endet:" #: include/event.php:39 include/event.php:63 include/identity.php:329 -#: include/bb2diaspora.php:170 mod/notifications.php:246 mod/events.php:495 -#: mod/directory.php:145 mod/contacts.php:624 +#: include/bb2diaspora.php:170 mod/events.php:495 mod/directory.php:145 +#: mod/contacts.php:628 mod/notifications.php:208 msgid "Location:" msgstr "Ort:" @@ -1147,7 +1040,7 @@ msgstr "Ist mir nicht wichtig" msgid "Ask me" msgstr "Frag mich" -#: include/items.php:1447 mod/dfrn_confirm.php:725 mod/dfrn_request.php:744 +#: include/items.php:1447 mod/dfrn_confirm.php:726 mod/dfrn_request.php:745 msgid "[Name Withheld]" msgstr "[Name unterdrückt]" @@ -1161,45 +1054,45 @@ msgstr "Beitrag nicht gefunden." msgid "Do you really want to delete this item?" msgstr "Möchtest Du wirklich dieses Item löschen?" -#: include/items.php:1846 mod/profiles.php:641 mod/profiles.php:644 -#: mod/profiles.php:670 mod/contacts.php:441 mod/follow.php:110 -#: mod/suggest.php:29 mod/dfrn_request.php:860 mod/register.php:238 -#: mod/settings.php:1113 mod/settings.php:1119 mod/settings.php:1127 -#: mod/settings.php:1131 mod/settings.php:1136 mod/settings.php:1142 -#: mod/settings.php:1148 mod/settings.php:1154 mod/settings.php:1180 -#: mod/settings.php:1181 mod/settings.php:1182 mod/settings.php:1183 -#: mod/settings.php:1184 mod/api.php:105 mod/message.php:217 +#: include/items.php:1846 mod/follow.php:110 mod/suggest.php:29 +#: mod/register.php:238 mod/settings.php:1113 mod/settings.php:1119 +#: mod/settings.php:1127 mod/settings.php:1131 mod/settings.php:1136 +#: mod/settings.php:1142 mod/settings.php:1148 mod/settings.php:1154 +#: mod/settings.php:1180 mod/settings.php:1181 mod/settings.php:1182 +#: mod/settings.php:1183 mod/settings.php:1184 mod/api.php:105 +#: mod/message.php:217 mod/contacts.php:442 mod/dfrn_request.php:861 +#: mod/profiles.php:642 mod/profiles.php:645 mod/profiles.php:671 msgid "Yes" msgstr "Ja" #: include/items.php:1849 include/conversation.php:1274 mod/fbrowser.php:101 #: mod/fbrowser.php:136 mod/tagrm.php:11 mod/tagrm.php:94 mod/videos.php:131 -#: mod/photos.php:247 mod/photos.php:336 mod/contacts.php:444 #: mod/follow.php:121 mod/suggest.php:32 mod/editpost.php:148 -#: mod/dfrn_request.php:874 mod/settings.php:664 mod/settings.php:690 -#: mod/message.php:220 +#: mod/settings.php:664 mod/settings.php:690 mod/message.php:220 +#: mod/contacts.php:445 mod/dfrn_request.php:875 mod/photos.php:248 +#: mod/photos.php:337 msgid "Cancel" msgstr "Abbrechen" -#: include/items.php:2011 index.php:397 mod/regmod.php:110 mod/dirfind.php:11 -#: mod/notifications.php:69 mod/dfrn_confirm.php:56 mod/wall_upload.php:77 -#: mod/wall_upload.php:80 mod/fsuggest.php:78 mod/notes.php:22 -#: mod/events.php:190 mod/uimport.php:23 mod/nogroup.php:25 mod/invite.php:15 -#: mod/invite.php:101 mod/viewcontacts.php:45 mod/crepair.php:100 +#: include/items.php:2011 mod/regmod.php:110 mod/dirfind.php:11 +#: mod/wall_upload.php:77 mod/wall_upload.php:80 mod/fsuggest.php:78 +#: mod/notes.php:22 mod/events.php:190 mod/uimport.php:23 mod/nogroup.php:25 +#: mod/invite.php:15 mod/invite.php:101 mod/viewcontacts.php:45 #: mod/wall_attach.php:67 mod/wall_attach.php:70 mod/allfriends.php:12 #: mod/cal.php:308 mod/repair_ostatus.php:9 mod/delegate.php:12 -#: mod/profiles.php:165 mod/profiles.php:598 mod/poke.php:150 -#: mod/photos.php:171 mod/photos.php:1092 mod/attach.php:33 -#: mod/contacts.php:350 mod/follow.php:11 mod/follow.php:73 mod/follow.php:155 -#: mod/suggest.php:58 mod/display.php:474 mod/common.php:18 mod/mood.php:114 -#: mod/editpost.php:10 mod/network.php:4 mod/group.php:19 +#: mod/poke.php:150 mod/attach.php:33 mod/follow.php:11 mod/follow.php:73 +#: mod/follow.php:155 mod/suggest.php:58 mod/display.php:474 mod/common.php:18 +#: mod/mood.php:114 mod/editpost.php:10 mod/network.php:4 mod/group.php:19 #: mod/profile_photo.php:19 mod/profile_photo.php:175 #: mod/profile_photo.php:186 mod/profile_photo.php:199 mod/register.php:42 #: mod/settings.php:22 mod/settings.php:128 mod/settings.php:650 #: mod/wallmessage.php:9 mod/wallmessage.php:33 mod/wallmessage.php:79 #: mod/wallmessage.php:103 mod/api.php:26 mod/api.php:31 mod/item.php:185 #: mod/item.php:197 mod/ostatus_subscribe.php:9 mod/message.php:46 -#: mod/message.php:182 mod/manage.php:96 +#: mod/message.php:182 mod/manage.php:96 mod/contacts.php:350 +#: mod/crepair.php:100 mod/dfrn_confirm.php:57 mod/photos.php:172 +#: mod/photos.php:1093 mod/profiles.php:166 mod/profiles.php:599 +#: mod/notifications.php:65 index.php:397 msgid "Permission denied." msgstr "Zugriff verweigert." @@ -1276,7 +1169,7 @@ msgstr "Tags" #: include/text.php:995 include/identity.php:781 include/identity.php:784 #: include/nav.php:127 include/nav.php:193 mod/viewcontacts.php:116 -#: mod/contacts.php:785 mod/contacts.php:846 view/theme/frio/theme.php:257 +#: mod/contacts.php:790 mod/contacts.php:851 view/theme/frio/theme.php:257 #: view/theme/diabook/theme.php:125 msgid "Contacts" msgstr "Kontakte" @@ -1429,15 +1322,14 @@ msgstr "Auf separater Seite ansehen" msgid "view on separate page" msgstr "auf separater Seite ansehen" -#: include/text.php:1779 include/conversation.php:122 -#: include/conversation.php:258 include/like.php:165 -#: view/theme/diabook/theme.php:463 +#: include/text.php:1779 include/like.php:165 include/conversation.php:122 +#: include/conversation.php:258 view/theme/diabook/theme.php:463 msgid "event" msgstr "Event" -#: include/text.php:1781 include/conversation.php:130 -#: include/conversation.php:266 include/like.php:163 mod/tagger.php:62 -#: mod/subthread.php:87 view/theme/diabook/theme.php:471 +#: include/text.php:1781 include/like.php:163 include/conversation.php:130 +#: include/conversation.php:266 mod/tagger.php:62 mod/subthread.php:87 +#: view/theme/diabook/theme.php:471 msgid "photo" msgstr "Foto" @@ -1460,415 +1352,6 @@ msgstr "Beitrag" msgid "Item filed" msgstr "Beitrag abgelegt" -#: include/conversation.php:144 include/like.php:184 -#, php-format -msgid "%1$s doesn't like %2$s's %3$s" -msgstr "%1$s mag %2$ss %3$s nicht" - -#: include/conversation.php:147 -#, php-format -msgid "%1$s attends %2$s's %3$s" -msgstr "%1$s nimmt an %2$ss %3$s teil." - -#: include/conversation.php:150 -#, php-format -msgid "%1$s doesn't attend %2$s's %3$s" -msgstr "%1$s nimmt nicht an %2$ss %3$s teil." - -#: include/conversation.php:153 -#, php-format -msgid "%1$s attends maybe %2$s's %3$s" -msgstr "%1$s nimmt eventuell an %2$ss %3$s teil." - -#: include/conversation.php:185 mod/dfrn_confirm.php:472 -#, php-format -msgid "%1$s is now friends with %2$s" -msgstr "%1$s ist nun mit %2$s befreundet" - -#: include/conversation.php:219 -#, php-format -msgid "%1$s poked %2$s" -msgstr "%1$s stupste %2$s" - -#: include/conversation.php:239 mod/mood.php:62 -#, php-format -msgid "%1$s is currently %2$s" -msgstr "%1$s ist momentan %2$s" - -#: include/conversation.php:278 mod/tagger.php:95 -#, php-format -msgid "%1$s tagged %2$s's %3$s with %4$s" -msgstr "%1$s hat %2$ss %3$s mit %4$s getaggt" - -#: include/conversation.php:303 -msgid "post/item" -msgstr "Nachricht/Beitrag" - -#: include/conversation.php:304 -#, php-format -msgid "%1$s marked %2$s's %3$s as favorite" -msgstr "%1$s hat %2$s\\s %3$s als Favorit markiert" - -#: include/conversation.php:587 mod/content.php:372 mod/profiles.php:344 -#: mod/photos.php:1634 -msgid "Likes" -msgstr "Likes" - -#: include/conversation.php:587 mod/content.php:372 mod/profiles.php:348 -#: mod/photos.php:1634 -msgid "Dislikes" -msgstr "Dislikes" - -#: include/conversation.php:588 include/conversation.php:1471 -#: mod/content.php:373 mod/photos.php:1635 -msgid "Attending" -msgid_plural "Attending" -msgstr[0] "Teilnehmend" -msgstr[1] "Teilnehmend" - -#: include/conversation.php:588 mod/content.php:373 mod/photos.php:1635 -msgid "Not attending" -msgstr "Nicht teilnehmend" - -#: include/conversation.php:588 mod/content.php:373 mod/photos.php:1635 -msgid "Might attend" -msgstr "Eventuell teilnehmend" - -#: include/conversation.php:710 mod/content.php:453 mod/content.php:758 -#: mod/photos.php:1709 object/Item.php:133 -msgid "Select" -msgstr "Auswählen" - -#: include/conversation.php:711 mod/admin.php:1388 mod/content.php:454 -#: mod/content.php:759 mod/photos.php:1710 mod/contacts.php:801 -#: mod/contacts.php:1016 mod/group.php:171 mod/settings.php:726 -#: object/Item.php:134 -msgid "Delete" -msgstr "Löschen" - -#: include/conversation.php:755 mod/content.php:487 mod/content.php:910 -#: mod/content.php:911 object/Item.php:367 object/Item.php:368 -#, php-format -msgid "View %s's profile @ %s" -msgstr "Das Profil von %s auf %s betrachten." - -#: include/conversation.php:767 object/Item.php:355 -msgid "Categories:" -msgstr "Kategorien:" - -#: include/conversation.php:768 object/Item.php:356 -msgid "Filed under:" -msgstr "Abgelegt unter:" - -#: include/conversation.php:775 mod/content.php:497 mod/content.php:923 -#: object/Item.php:381 -#, php-format -msgid "%s from %s" -msgstr "%s von %s" - -#: include/conversation.php:791 mod/content.php:513 -msgid "View in context" -msgstr "Im Zusammenhang betrachten" - -#: include/conversation.php:793 include/conversation.php:1255 -#: mod/content.php:515 mod/content.php:948 mod/photos.php:1597 -#: mod/editpost.php:124 mod/wallmessage.php:156 mod/message.php:356 -#: mod/message.php:548 object/Item.php:406 -msgid "Please wait" -msgstr "Bitte warten" - -#: include/conversation.php:872 -msgid "remove" -msgstr "löschen" - -#: include/conversation.php:876 -msgid "Delete Selected Items" -msgstr "Lösche die markierten Beiträge" - -#: include/conversation.php:964 -msgid "Follow Thread" -msgstr "Folge der Unterhaltung" - -#: include/conversation.php:965 include/Contact.php:364 -msgid "View Status" -msgstr "Pinnwand anschauen" - -#: include/conversation.php:966 include/conversation.php:980 -#: include/Contact.php:310 include/Contact.php:323 include/Contact.php:365 -#: mod/dirfind.php:203 mod/directory.php:163 mod/match.php:71 -#: mod/allfriends.php:65 mod/suggest.php:82 -msgid "View Profile" -msgstr "Profil anschauen" - -#: include/conversation.php:967 include/Contact.php:366 -msgid "View Photos" -msgstr "Bilder anschauen" - -#: include/conversation.php:968 include/Contact.php:367 -msgid "Network Posts" -msgstr "Netzwerkbeiträge" - -#: include/conversation.php:969 include/Contact.php:368 -msgid "Edit Contact" -msgstr "Kontakt bearbeiten" - -#: include/conversation.php:970 include/Contact.php:370 -msgid "Send PM" -msgstr "Private Nachricht senden" - -#: include/conversation.php:974 include/Contact.php:371 -msgid "Poke" -msgstr "Anstupsen" - -#: include/conversation.php:1088 -#, php-format -msgid "%s likes this." -msgstr "%s mag das." - -#: include/conversation.php:1091 -#, php-format -msgid "%s doesn't like this." -msgstr "%s mag das nicht." - -#: include/conversation.php:1094 -#, php-format -msgid "%s attends." -msgstr "%s nimmt teil." - -#: include/conversation.php:1097 -#, php-format -msgid "%s doesn't attend." -msgstr "%s nimmt nicht teil." - -#: include/conversation.php:1100 -#, php-format -msgid "%s attends maybe." -msgstr "%s nimmt eventuell teil." - -#: include/conversation.php:1110 -msgid "and" -msgstr "und" - -#: include/conversation.php:1116 -#, php-format -msgid ", and %d other people" -msgstr " und %d andere" - -#: include/conversation.php:1125 -#, php-format -msgid "%2$d people like this" -msgstr "%2$d Personen mögen das" - -#: include/conversation.php:1126 -#, php-format -msgid "%s like this." -msgstr "%s mögen das." - -#: include/conversation.php:1129 -#, php-format -msgid "%2$d people don't like this" -msgstr "%2$d Personen mögen das nicht" - -#: include/conversation.php:1130 -#, php-format -msgid "%s don't like this." -msgstr "%s mögen dies nicht." - -#: include/conversation.php:1133 -#, php-format -msgid "%2$d people attend" -msgstr "%2$d Personen nehmen teil" - -#: include/conversation.php:1134 -#, php-format -msgid "%s attend." -msgstr "%s nehmen teil." - -#: include/conversation.php:1137 -#, php-format -msgid "%2$d people don't attend" -msgstr "%2$d Personen nehmen nicht teil" - -#: include/conversation.php:1138 -#, php-format -msgid "%s don't attend." -msgstr "%s nehmen nicht teil." - -#: include/conversation.php:1141 -#, php-format -msgid "%2$d people anttend maybe" -msgstr "%2$d Personen nehmen eventuell teil" - -#: include/conversation.php:1142 -#, php-format -msgid "%s anttend maybe." -msgstr "%s nehmen vielleicht teil." - -#: include/conversation.php:1181 include/conversation.php:1199 -msgid "Visible to everybody" -msgstr "Für jedermann sichtbar" - -#: include/conversation.php:1182 include/conversation.php:1200 -#: mod/wallmessage.php:127 mod/wallmessage.php:135 mod/message.php:291 -#: mod/message.php:299 mod/message.php:442 mod/message.php:450 -msgid "Please enter a link URL:" -msgstr "Bitte gib die URL des Links ein:" - -#: include/conversation.php:1183 include/conversation.php:1201 -msgid "Please enter a video link/URL:" -msgstr "Bitte Link/URL zum Video einfügen:" - -#: include/conversation.php:1184 include/conversation.php:1202 -msgid "Please enter an audio link/URL:" -msgstr "Bitte Link/URL zum Audio einfügen:" - -#: include/conversation.php:1185 include/conversation.php:1203 -msgid "Tag term:" -msgstr "Tag:" - -#: include/conversation.php:1186 include/conversation.php:1204 -#: mod/filer.php:30 -msgid "Save to Folder:" -msgstr "In diesem Ordner speichern:" - -#: include/conversation.php:1187 include/conversation.php:1205 -msgid "Where are you right now?" -msgstr "Wo hältst Du Dich jetzt gerade auf?" - -#: include/conversation.php:1188 -msgid "Delete item(s)?" -msgstr "Einträge löschen?" - -#: include/conversation.php:1236 mod/photos.php:1596 -msgid "Share" -msgstr "Teilen" - -#: include/conversation.php:1237 mod/editpost.php:110 mod/wallmessage.php:154 -#: mod/message.php:354 mod/message.php:545 -msgid "Upload photo" -msgstr "Foto hochladen" - -#: include/conversation.php:1238 mod/editpost.php:111 -msgid "upload photo" -msgstr "Bild hochladen" - -#: include/conversation.php:1239 mod/editpost.php:112 -msgid "Attach file" -msgstr "Datei anhängen" - -#: include/conversation.php:1240 mod/editpost.php:113 -msgid "attach file" -msgstr "Datei anhängen" - -#: include/conversation.php:1241 mod/editpost.php:114 mod/wallmessage.php:155 -#: mod/message.php:355 mod/message.php:546 -msgid "Insert web link" -msgstr "Einen Link einfügen" - -#: include/conversation.php:1242 mod/editpost.php:115 -msgid "web link" -msgstr "Weblink" - -#: include/conversation.php:1243 mod/editpost.php:116 -msgid "Insert video link" -msgstr "Video-Adresse einfügen" - -#: include/conversation.php:1244 mod/editpost.php:117 -msgid "video link" -msgstr "Video-Link" - -#: include/conversation.php:1245 mod/editpost.php:118 -msgid "Insert audio link" -msgstr "Audio-Adresse einfügen" - -#: include/conversation.php:1246 mod/editpost.php:119 -msgid "audio link" -msgstr "Audio-Link" - -#: include/conversation.php:1247 mod/editpost.php:120 -msgid "Set your location" -msgstr "Deinen Standort festlegen" - -#: include/conversation.php:1248 mod/editpost.php:121 -msgid "set location" -msgstr "Ort setzen" - -#: include/conversation.php:1249 mod/editpost.php:122 -msgid "Clear browser location" -msgstr "Browser-Standort leeren" - -#: include/conversation.php:1250 mod/editpost.php:123 -msgid "clear location" -msgstr "Ort löschen" - -#: include/conversation.php:1252 mod/editpost.php:137 -msgid "Set title" -msgstr "Titel setzen" - -#: include/conversation.php:1254 mod/editpost.php:139 -msgid "Categories (comma-separated list)" -msgstr "Kategorien (kommasepariert)" - -#: include/conversation.php:1256 mod/editpost.php:125 -msgid "Permission settings" -msgstr "Berechtigungseinstellungen" - -#: include/conversation.php:1257 mod/editpost.php:154 -msgid "permissions" -msgstr "Zugriffsrechte" - -#: include/conversation.php:1265 mod/editpost.php:134 -msgid "Public post" -msgstr "Öffentlicher Beitrag" - -#: include/conversation.php:1270 mod/events.php:505 mod/content.php:737 -#: mod/photos.php:1618 mod/photos.php:1666 mod/photos.php:1754 -#: mod/editpost.php:145 object/Item.php:729 -msgid "Preview" -msgstr "Vorschau" - -#: include/conversation.php:1280 -msgid "Post to Groups" -msgstr "Poste an Gruppe" - -#: include/conversation.php:1281 -msgid "Post to Contacts" -msgstr "Poste an Kontakte" - -#: include/conversation.php:1282 -msgid "Private post" -msgstr "Privater Beitrag" - -#: include/conversation.php:1287 include/identity.php:250 mod/editpost.php:152 -msgid "Message" -msgstr "Nachricht" - -#: include/conversation.php:1288 mod/editpost.php:153 -msgid "Browser" -msgstr "Browser" - -#: include/conversation.php:1443 -msgid "View all" -msgstr "Zeige alle" - -#: include/conversation.php:1465 -msgid "Like" -msgid_plural "Likes" -msgstr[0] "mag ich" -msgstr[1] "Mag ich" - -#: include/conversation.php:1468 -msgid "Dislike" -msgid_plural "Dislikes" -msgstr[0] "mag ich nicht" -msgstr[1] "Mag ich nicht" - -#: include/conversation.php:1474 -msgid "Not Attending" -msgid_plural "Not Attending" -msgstr[0] "Nicht teilnehmend " -msgstr[1] "Nicht teilnehmend" - #: include/identity.php:42 msgid "Requested account is not available." msgstr "Das angefragte Profil ist nicht vorhanden." @@ -1885,6 +1368,10 @@ msgstr "Profil bearbeiten" msgid "Atom feed" msgstr "Atom-Feed" +#: include/identity.php:250 include/conversation.php:1287 mod/editpost.php:152 +msgid "Message" +msgstr "Nachricht" + #: include/identity.php:276 include/nav.php:191 msgid "Profiles" msgstr "Profile" @@ -1893,36 +1380,36 @@ msgstr "Profile" msgid "Manage/edit profiles" msgstr "Profile verwalten/editieren" -#: include/identity.php:281 include/identity.php:307 mod/profiles.php:787 +#: include/identity.php:281 include/identity.php:307 mod/profiles.php:788 msgid "Change profile photo" msgstr "Profilbild ändern" -#: include/identity.php:282 mod/profiles.php:788 +#: include/identity.php:282 mod/profiles.php:789 msgid "Create New Profile" msgstr "Neues Profil anlegen" -#: include/identity.php:292 mod/profiles.php:777 +#: include/identity.php:292 mod/profiles.php:778 msgid "Profile Image" msgstr "Profilbild" -#: include/identity.php:295 mod/profiles.php:779 +#: include/identity.php:295 mod/profiles.php:780 msgid "visible to everybody" msgstr "sichtbar für jeden" -#: include/identity.php:296 mod/profiles.php:684 mod/profiles.php:780 +#: include/identity.php:296 mod/profiles.php:685 mod/profiles.php:781 msgid "Edit visibility" msgstr "Sichtbarkeit bearbeiten" #: include/identity.php:319 mod/dirfind.php:223 mod/directory.php:174 #: mod/match.php:84 mod/viewcontacts.php:105 mod/allfriends.php:79 -#: mod/cal.php:44 mod/videos.php:37 mod/photos.php:41 mod/contacts.php:51 -#: mod/contacts.php:948 mod/suggest.php:98 mod/hovercard.php:80 -#: mod/common.php:123 mod/network.php:517 +#: mod/cal.php:44 mod/videos.php:37 mod/suggest.php:98 mod/hovercard.php:80 +#: mod/common.php:123 mod/network.php:517 mod/contacts.php:51 +#: mod/contacts.php:626 mod/contacts.php:953 mod/photos.php:42 msgid "Forum" msgstr "Forum" -#: include/identity.php:331 include/identity.php:614 mod/notifications.php:252 -#: mod/directory.php:147 +#: include/identity.php:331 include/identity.php:614 mod/directory.php:147 +#: mod/notifications.php:214 msgid "Gender:" msgstr "Geschlecht:" @@ -1934,14 +1421,14 @@ msgstr "Status:" msgid "Homepage:" msgstr "Homepage:" -#: include/identity.php:338 include/identity.php:655 mod/notifications.php:248 -#: mod/directory.php:153 mod/contacts.php:626 +#: include/identity.php:338 include/identity.php:655 mod/directory.php:153 +#: mod/contacts.php:630 mod/notifications.php:210 msgid "About:" msgstr "Über:" -#: include/identity.php:420 mod/contacts.php:50 +#: include/identity.php:420 mod/contacts.php:50 mod/notifications.php:222 msgid "Network:" -msgstr "Netzwerk" +msgstr "Netzwerk:" #: include/identity.php:449 include/identity.php:533 msgid "g A l F d" @@ -1976,8 +1463,8 @@ msgid "Events this week:" msgstr "Veranstaltungen diese Woche" #: include/identity.php:603 include/identity.php:689 include/identity.php:720 -#: include/nav.php:79 mod/profperm.php:104 mod/contacts.php:834 -#: mod/newmember.php:32 view/theme/frio/theme.php:247 +#: include/nav.php:79 mod/profperm.php:104 mod/newmember.php:32 +#: mod/contacts.php:637 mod/contacts.php:839 view/theme/frio/theme.php:247 #: view/theme/diabook/theme.php:124 msgid "Profile" msgstr "Profil" @@ -2003,20 +1490,20 @@ msgstr "Alter:" msgid "for %1$d %2$s" msgstr "für %1$d %2$s" -#: include/identity.php:643 mod/profiles.php:703 +#: include/identity.php:643 mod/profiles.php:704 msgid "Sexual Preference:" msgstr "Sexuelle Vorlieben:" -#: include/identity.php:647 mod/profiles.php:729 +#: include/identity.php:647 mod/profiles.php:730 msgid "Hometown:" msgstr "Heimatort:" -#: include/identity.php:649 mod/notifications.php:250 mod/contacts.php:628 -#: mod/follow.php:134 +#: include/identity.php:649 mod/follow.php:134 mod/contacts.php:632 +#: mod/notifications.php:212 msgid "Tags:" msgstr "Tags" -#: include/identity.php:651 mod/profiles.php:730 +#: include/identity.php:651 mod/profiles.php:731 msgid "Political Views:" msgstr "Politische Ansichten:" @@ -2028,11 +1515,11 @@ msgstr "Religion:" msgid "Hobbies/Interests:" msgstr "Hobbies/Interessen:" -#: include/identity.php:659 mod/profiles.php:734 +#: include/identity.php:659 mod/profiles.php:735 msgid "Likes:" msgstr "Likes:" -#: include/identity.php:661 mod/profiles.php:735 +#: include/identity.php:661 mod/profiles.php:736 msgid "Dislikes:" msgstr "Dislikes:" @@ -2077,20 +1564,20 @@ msgid "Basic" msgstr "Allgemein" #: include/identity.php:691 mod/events.php:509 mod/admin.php:928 -#: mod/contacts.php:863 +#: mod/contacts.php:868 msgid "Advanced" msgstr "Erweitert" -#: include/identity.php:712 include/nav.php:78 mod/contacts.php:631 -#: mod/contacts.php:826 view/theme/frio/theme.php:246 +#: include/identity.php:712 include/nav.php:78 mod/contacts.php:635 +#: mod/contacts.php:831 view/theme/frio/theme.php:246 msgid "Status" msgstr "Status" -#: include/identity.php:715 mod/contacts.php:829 mod/follow.php:143 +#: include/identity.php:715 mod/follow.php:143 mod/contacts.php:834 msgid "Status Messages and Posts" msgstr "Statusnachrichten und Beiträge" -#: include/identity.php:723 mod/contacts.php:837 +#: include/identity.php:723 mod/contacts.php:842 msgid "Profile Details" msgstr "Profildetails" @@ -2099,7 +1586,7 @@ msgstr "Profildetails" msgid "Photos" msgstr "Bilder" -#: include/identity.php:731 mod/photos.php:99 +#: include/identity.php:731 mod/photos.php:100 msgid "Photo Albums" msgstr "Fotoalben" @@ -2128,11 +1615,7 @@ msgstr "Persönliche Notizen" msgid "Only You Can See This" msgstr "Nur Du kannst das sehen" -#: include/Scrape.php:656 -msgid " on Last.fm" -msgstr " bei Last.fm" - -#: include/follow.php:77 mod/dfrn_request.php:506 +#: include/follow.php:77 mod/dfrn_request.php:507 msgid "Disallowed profile URL." msgstr "Nicht erlaubte Profil-URL." @@ -2191,14 +1674,6 @@ msgstr "Konnte die Kontaktinformationen nicht empfangen." msgid "following" msgstr "folgen" -#: include/Contact.php:119 -msgid "stopped following" -msgstr "wird nicht mehr gefolgt" - -#: include/Contact.php:369 -msgid "Drop Contact" -msgstr "Kontakt löschen" - #: include/oembed.php:229 msgid "Embedded content" msgstr "Eingebetteter Inhalt" @@ -2224,149 +1699,6 @@ msgstr "$1 hat geschrieben:" msgid "Encrypted content" msgstr "Verschlüsselter Inhalt" -#: include/contact_selectors.php:32 -msgid "Unknown | Not categorised" -msgstr "Unbekannt | Nicht kategorisiert" - -#: include/contact_selectors.php:33 -msgid "Block immediately" -msgstr "Sofort blockieren" - -#: include/contact_selectors.php:34 -msgid "Shady, spammer, self-marketer" -msgstr "Zwielichtig, Spammer, Selbstdarsteller" - -#: include/contact_selectors.php:35 -msgid "Known to me, but no opinion" -msgstr "Ist mir bekannt, hab aber keine Meinung" - -#: include/contact_selectors.php:36 -msgid "OK, probably harmless" -msgstr "OK, wahrscheinlich harmlos" - -#: include/contact_selectors.php:37 -msgid "Reputable, has my trust" -msgstr "Seriös, hat mein Vertrauen" - -#: include/contact_selectors.php:56 mod/admin.php:859 -msgid "Frequently" -msgstr "immer wieder" - -#: include/contact_selectors.php:57 mod/admin.php:860 -msgid "Hourly" -msgstr "Stündlich" - -#: include/contact_selectors.php:58 mod/admin.php:861 -msgid "Twice daily" -msgstr "Zweimal täglich" - -#: include/contact_selectors.php:59 mod/admin.php:862 -msgid "Daily" -msgstr "Täglich" - -#: include/contact_selectors.php:60 -msgid "Weekly" -msgstr "Wöchentlich" - -#: include/contact_selectors.php:61 -msgid "Monthly" -msgstr "Monatlich" - -#: include/contact_selectors.php:76 mod/dfrn_request.php:866 -msgid "Friendica" -msgstr "Friendica" - -#: include/contact_selectors.php:77 -msgid "OStatus" -msgstr "OStatus" - -#: include/contact_selectors.php:78 -msgid "RSS/Atom" -msgstr "RSS/Atom" - -#: include/contact_selectors.php:79 include/contact_selectors.php:86 -#: mod/admin.php:1371 mod/admin.php:1384 mod/admin.php:1396 mod/admin.php:1414 -msgid "Email" -msgstr "E-Mail" - -#: include/contact_selectors.php:80 mod/dfrn_request.php:868 -#: mod/settings.php:827 -msgid "Diaspora" -msgstr "Diaspora" - -#: include/contact_selectors.php:81 -msgid "Facebook" -msgstr "Facebook" - -#: include/contact_selectors.php:82 -msgid "Zot!" -msgstr "Zott" - -#: include/contact_selectors.php:83 -msgid "LinkedIn" -msgstr "LinkedIn" - -#: include/contact_selectors.php:84 -msgid "XMPP/IM" -msgstr "XMPP/Chat" - -#: include/contact_selectors.php:85 -msgid "MySpace" -msgstr "MySpace" - -#: include/contact_selectors.php:87 -msgid "Google+" -msgstr "Google+" - -#: include/contact_selectors.php:88 -msgid "pump.io" -msgstr "pump.io" - -#: include/contact_selectors.php:89 -msgid "Twitter" -msgstr "Twitter" - -#: include/contact_selectors.php:90 -msgid "Diaspora Connector" -msgstr "Diaspora" - -#: include/contact_selectors.php:91 -msgid "GNU Social" -msgstr "GNU Social" - -#: include/contact_selectors.php:92 -msgid "App.net" -msgstr "App.net" - -#: include/contact_selectors.php:103 -msgid "Hubzilla/Redmatrix" -msgstr "Hubzilla/Redmatrix" - -#: include/dbstructure.php:26 -#, php-format -msgid "" -"\n" -"\t\t\tThe friendica developers released update %s recently,\n" -"\t\t\tbut when I tried to install it, something went terribly wrong.\n" -"\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n" -"\t\t\tfriendica developer if you can not help me on your own. My database might be invalid." -msgstr "\nDie Friendica-Entwickler haben vor kurzem das Update %s veröffentlicht, aber bei der Installation ging etwas schrecklich schief.\n\nDas Problem sollte so schnell wie möglich gelöst werden, aber ich schaffe es nicht alleine. Bitte kontaktiere einen Friendica-Entwickler falls Du mir nicht alleine helfen kannst. Meine Datenbank könnte ungültig sein." - -#: include/dbstructure.php:31 -#, php-format -msgid "" -"The error message is\n" -"[pre]%s[/pre]" -msgstr "Die Fehlermeldung lautet\n[pre]%s[/pre]" - -#: include/dbstructure.php:153 -msgid "Errors encountered creating database tables." -msgstr "Fehler aufgetreten während der Erzeugung der Datenbanktabellen." - -#: include/dbstructure.php:230 -msgid "Errors encountered performing database changes." -msgstr "Es sind Fehler beim Bearbeiten der Datenbank aufgetreten." - #: include/auth.php:45 msgid "Logged out." msgstr "Abgemeldet." @@ -2385,10 +1717,6 @@ msgstr "Beim Versuch Dich mit der von Dir angegebenen OpenID anzumelden trat ein msgid "The error message was:" msgstr "Die Fehlermeldung lautete:" -#: include/network.php:913 -msgid "view full size" -msgstr "Volle Größe anzeigen" - #: include/group.php:25 msgid "" "A deleted group with this name was revived. Existing item permissions " @@ -2521,11 +1849,11 @@ msgid "An error occurred creating your default profile. Please try again." msgstr "Bei der Erstellung des Standardprofils ist ein Fehler aufgetreten. Bitte versuche es noch einmal." #: include/user.php:345 include/user.php:352 include/user.php:359 -#: mod/photos.php:78 mod/photos.php:192 mod/photos.php:769 mod/photos.php:1232 -#: mod/photos.php:1255 mod/photos.php:1849 mod/profile_photo.php:74 -#: mod/profile_photo.php:81 mod/profile_photo.php:88 mod/profile_photo.php:210 -#: mod/profile_photo.php:302 mod/profile_photo.php:311 -#: view/theme/diabook/theme.php:500 +#: mod/profile_photo.php:74 mod/profile_photo.php:81 mod/profile_photo.php:88 +#: mod/profile_photo.php:210 mod/profile_photo.php:302 +#: mod/profile_photo.php:311 mod/photos.php:79 mod/photos.php:193 +#: mod/photos.php:770 mod/photos.php:1233 mod/photos.php:1256 +#: mod/photos.php:1850 view/theme/diabook/theme.php:500 msgid "Profile Photos" msgstr "Profilbilder" @@ -2573,21 +1901,6 @@ msgstr "\nDie Anmelde-Details sind die folgenden:\n\tAdresse der Seite:\t%3$s\n\ msgid "Registration details for %s" msgstr "Details der Registration von %s" -#: include/api.php:905 -#, 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:925 -#, 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:946 -#, 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/features.php:63 msgid "General Features" msgstr "Allgemeine Features" @@ -2799,6 +2112,10 @@ msgstr "Keine Neuigkeiten" msgid "Clear notifications" msgstr "Bereinige Benachrichtigungen" +#: include/nav.php:75 view/theme/frio/theme.php:243 boot.php:1620 +msgid "Logout" +msgstr "Abmelden" + #: include/nav.php:75 view/theme/frio/theme.php:243 msgid "End this session" msgstr "Diese Sitzung beenden" @@ -2835,11 +2152,15 @@ msgstr "Persönliche Notizen" msgid "Your personal notes" msgstr "Deine persönlichen Notizen" +#: include/nav.php:94 mod/bookmarklet.php:12 boot.php:1621 +msgid "Login" +msgstr "Anmeldung" + #: include/nav.php:94 msgid "Sign in" msgstr "Anmelden" -#: include/nav.php:107 include/nav.php:163 mod/notifications.php:99 +#: include/nav.php:107 include/nav.php:163 mod/notifications.php:545 #: view/theme/diabook/theme.php:123 msgid "Home" msgstr "Pinnwand" @@ -2848,6 +2169,10 @@ msgstr "Pinnwand" msgid "Home Page" msgstr "Homepage" +#: include/nav.php:111 mod/register.php:280 boot.php:1596 +msgid "Register" +msgstr "Registrieren" + #: include/nav.php:111 msgid "Create an account" msgstr "Nutzerkonto erstellen" @@ -2901,7 +2226,7 @@ msgstr "Information" msgid "Information about this friendica instance" msgstr "Informationen zu dieser Friendica Instanz" -#: include/nav.php:160 mod/notifications.php:87 mod/admin.php:402 +#: include/nav.php:160 mod/admin.php:402 mod/notifications.php:533 #: view/theme/frio/theme.php:253 msgid "Network" msgstr "Netzwerk" @@ -2918,7 +2243,7 @@ msgstr "Netzwerk zurücksetzen" msgid "Load Network page with no filters" msgstr "Netzwerk-Seite ohne Filter laden" -#: include/nav.php:168 mod/notifications.php:105 +#: include/nav.php:168 mod/notifications.php:551 msgid "Introductions" msgstr "Kontaktanfragen" @@ -2926,7 +2251,7 @@ msgstr "Kontaktanfragen" msgid "Friend Requests" msgstr "Kontaktanfragen" -#: include/nav.php:171 mod/notifications.php:271 +#: include/nav.php:171 mod/notifications.php:87 msgid "Notifications" msgstr "Benachrichtigungen" @@ -3012,6 +2337,25 @@ msgstr "Navigation" msgid "Site map" msgstr "Sitemap" +#: include/like.php:163 include/conversation.php:125 +#: include/conversation.php:134 include/conversation.php:261 +#: include/conversation.php:270 include/diaspora.php:1402 mod/tagger.php:62 +#: mod/subthread.php:87 view/theme/diabook/theme.php:466 +#: view/theme/diabook/theme.php:475 +msgid "status" +msgstr "Status" + +#: include/like.php:182 include/conversation.php:141 include/diaspora.php:1398 +#: 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:184 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:186 #, php-format msgid "%1$s is attending %2$s's %3$s" @@ -3027,6 +2371,10 @@ msgstr "%1$s nimmt nicht an %2$ss %3$s teil." msgid "%1$s may attend %2$s's %3$s" msgstr "%1$s nimmt eventuell an %2$ss %3$s teil." +#: include/message.php:15 include/message.php:173 +msgid "[no subject]" +msgstr "[kein Betreff]" + #: include/acl_selectors.php:327 msgid "Post to Email" msgstr "An E-Mail senden" @@ -3062,7 +2410,7 @@ msgstr "Cc: E-Mail-Addressen" msgid "Example: bob@example.com, mary@example.com" msgstr "Z.B.: bob@example.com, mary@example.com" -#: include/acl_selectors.php:349 mod/photos.php:1177 mod/photos.php:1562 +#: include/acl_selectors.php:349 mod/photos.php:1178 mod/photos.php:1563 msgid "Permissions" msgstr "Berechtigungen" @@ -3070,30 +2418,595 @@ msgstr "Berechtigungen" msgid "Close" msgstr "Schließen" -#: include/message.php:15 include/message.php:173 -msgid "[no subject]" -msgstr "[kein Betreff]" +#: include/contact_selectors.php:32 +msgid "Unknown | Not categorised" +msgstr "Unbekannt | Nicht kategorisiert" -#: index.php:240 mod/apps.php:7 -msgid "You must be logged in to use addons. " -msgstr "Sie müssen angemeldet sein um Addons benutzen zu können." +#: include/contact_selectors.php:33 +msgid "Block immediately" +msgstr "Sofort blockieren" -#: index.php:284 mod/help.php:53 mod/p.php:16 mod/p.php:43 mod/p.php:52 -#: mod/fetch.php:12 mod/fetch.php:39 mod/fetch.php:48 -msgid "Not Found" -msgstr "Nicht gefunden" +#: include/contact_selectors.php:34 +msgid "Shady, spammer, self-marketer" +msgstr "Zwielichtig, Spammer, Selbstdarsteller" -#: index.php:287 mod/help.php:56 -msgid "Page not found." -msgstr "Seite nicht gefunden." +#: include/contact_selectors.php:35 +msgid "Known to me, but no opinion" +msgstr "Ist mir bekannt, hab aber keine Meinung" -#: index.php:396 mod/profperm.php:19 mod/group.php:72 -msgid "Permission denied" -msgstr "Zugriff verweigert" +#: include/contact_selectors.php:36 +msgid "OK, probably harmless" +msgstr "OK, wahrscheinlich harmlos" -#: index.php:447 -msgid "toggle mobile" -msgstr "auf/von Mobile Ansicht wechseln" +#: include/contact_selectors.php:37 +msgid "Reputable, has my trust" +msgstr "Seriös, hat mein Vertrauen" + +#: include/contact_selectors.php:56 mod/admin.php:859 +msgid "Frequently" +msgstr "immer wieder" + +#: include/contact_selectors.php:57 mod/admin.php:860 +msgid "Hourly" +msgstr "Stündlich" + +#: include/contact_selectors.php:58 mod/admin.php:861 +msgid "Twice daily" +msgstr "Zweimal täglich" + +#: include/contact_selectors.php:59 mod/admin.php:862 +msgid "Daily" +msgstr "Täglich" + +#: include/contact_selectors.php:60 +msgid "Weekly" +msgstr "Wöchentlich" + +#: include/contact_selectors.php:61 +msgid "Monthly" +msgstr "Monatlich" + +#: include/contact_selectors.php:76 mod/dfrn_request.php:867 +msgid "Friendica" +msgstr "Friendica" + +#: include/contact_selectors.php:77 +msgid "OStatus" +msgstr "OStatus" + +#: include/contact_selectors.php:78 +msgid "RSS/Atom" +msgstr "RSS/Atom" + +#: include/contact_selectors.php:79 include/contact_selectors.php:86 +#: mod/admin.php:1371 mod/admin.php:1384 mod/admin.php:1396 mod/admin.php:1414 +msgid "Email" +msgstr "E-Mail" + +#: include/contact_selectors.php:80 mod/settings.php:827 +#: mod/dfrn_request.php:869 +msgid "Diaspora" +msgstr "Diaspora" + +#: include/contact_selectors.php:81 +msgid "Facebook" +msgstr "Facebook" + +#: include/contact_selectors.php:82 +msgid "Zot!" +msgstr "Zott" + +#: include/contact_selectors.php:83 +msgid "LinkedIn" +msgstr "LinkedIn" + +#: include/contact_selectors.php:84 +msgid "XMPP/IM" +msgstr "XMPP/Chat" + +#: include/contact_selectors.php:85 +msgid "MySpace" +msgstr "MySpace" + +#: include/contact_selectors.php:87 +msgid "Google+" +msgstr "Google+" + +#: include/contact_selectors.php:88 +msgid "pump.io" +msgstr "pump.io" + +#: include/contact_selectors.php:89 +msgid "Twitter" +msgstr "Twitter" + +#: include/contact_selectors.php:90 +msgid "Diaspora Connector" +msgstr "Diaspora" + +#: include/contact_selectors.php:91 +msgid "GNU Social" +msgstr "GNU Social" + +#: include/contact_selectors.php:92 +msgid "App.net" +msgstr "App.net" + +#: include/contact_selectors.php:103 +msgid "Hubzilla/Redmatrix" +msgstr "Hubzilla/Redmatrix" + +#: include/conversation.php:147 +#, php-format +msgid "%1$s attends %2$s's %3$s" +msgstr "%1$s nimmt an %2$ss %3$s teil." + +#: include/conversation.php:150 +#, php-format +msgid "%1$s doesn't attend %2$s's %3$s" +msgstr "%1$s nimmt nicht an %2$ss %3$s teil." + +#: include/conversation.php:153 +#, php-format +msgid "%1$s attends maybe %2$s's %3$s" +msgstr "%1$s nimmt eventuell an %2$ss %3$s teil." + +#: include/conversation.php:185 mod/dfrn_confirm.php:473 +#, php-format +msgid "%1$s is now friends with %2$s" +msgstr "%1$s ist nun mit %2$s befreundet" + +#: include/conversation.php:219 +#, php-format +msgid "%1$s poked %2$s" +msgstr "%1$s stupste %2$s" + +#: include/conversation.php:239 mod/mood.php:62 +#, php-format +msgid "%1$s is currently %2$s" +msgstr "%1$s ist momentan %2$s" + +#: include/conversation.php:278 mod/tagger.php:95 +#, php-format +msgid "%1$s tagged %2$s's %3$s with %4$s" +msgstr "%1$s hat %2$ss %3$s mit %4$s getaggt" + +#: include/conversation.php:303 +msgid "post/item" +msgstr "Nachricht/Beitrag" + +#: include/conversation.php:304 +#, php-format +msgid "%1$s marked %2$s's %3$s as favorite" +msgstr "%1$s hat %2$s\\s %3$s als Favorit markiert" + +#: include/conversation.php:587 mod/photos.php:1635 mod/profiles.php:345 +#: mod/content.php:372 +msgid "Likes" +msgstr "Likes" + +#: include/conversation.php:587 mod/photos.php:1635 mod/profiles.php:349 +#: mod/content.php:372 +msgid "Dislikes" +msgstr "Dislikes" + +#: include/conversation.php:588 include/conversation.php:1471 +#: mod/photos.php:1636 mod/content.php:373 +msgid "Attending" +msgid_plural "Attending" +msgstr[0] "Teilnehmend" +msgstr[1] "Teilnehmend" + +#: include/conversation.php:588 mod/photos.php:1636 mod/content.php:373 +msgid "Not attending" +msgstr "Nicht teilnehmend" + +#: include/conversation.php:588 mod/photos.php:1636 mod/content.php:373 +msgid "Might attend" +msgstr "Eventuell teilnehmend" + +#: include/conversation.php:710 mod/photos.php:1710 mod/content.php:453 +#: mod/content.php:758 object/Item.php:133 +msgid "Select" +msgstr "Auswählen" + +#: include/conversation.php:711 mod/admin.php:1388 mod/group.php:171 +#: mod/settings.php:726 mod/contacts.php:806 mod/contacts.php:1021 +#: mod/photos.php:1711 mod/content.php:454 mod/content.php:759 +#: object/Item.php:134 +msgid "Delete" +msgstr "Löschen" + +#: include/conversation.php:755 mod/content.php:487 mod/content.php:910 +#: mod/content.php:911 object/Item.php:367 object/Item.php:368 +#, php-format +msgid "View %s's profile @ %s" +msgstr "Das Profil von %s auf %s betrachten." + +#: include/conversation.php:767 object/Item.php:355 +msgid "Categories:" +msgstr "Kategorien:" + +#: include/conversation.php:768 object/Item.php:356 +msgid "Filed under:" +msgstr "Abgelegt unter:" + +#: include/conversation.php:775 mod/content.php:497 mod/content.php:923 +#: object/Item.php:381 +#, php-format +msgid "%s from %s" +msgstr "%s von %s" + +#: include/conversation.php:791 mod/content.php:513 +msgid "View in context" +msgstr "Im Zusammenhang betrachten" + +#: include/conversation.php:793 include/conversation.php:1255 +#: mod/editpost.php:124 mod/wallmessage.php:156 mod/message.php:356 +#: mod/message.php:548 mod/photos.php:1598 mod/content.php:515 +#: mod/content.php:948 object/Item.php:406 +msgid "Please wait" +msgstr "Bitte warten" + +#: include/conversation.php:872 +msgid "remove" +msgstr "löschen" + +#: include/conversation.php:876 +msgid "Delete Selected Items" +msgstr "Lösche die markierten Beiträge" + +#: include/conversation.php:964 +msgid "Follow Thread" +msgstr "Folge der Unterhaltung" + +#: include/conversation.php:965 include/Contact.php:364 +msgid "View Status" +msgstr "Pinnwand anschauen" + +#: include/conversation.php:966 include/conversation.php:980 +#: include/Contact.php:310 include/Contact.php:323 include/Contact.php:365 +#: mod/dirfind.php:203 mod/directory.php:163 mod/match.php:71 +#: mod/allfriends.php:65 mod/suggest.php:82 +msgid "View Profile" +msgstr "Profil anschauen" + +#: include/conversation.php:967 include/Contact.php:366 +msgid "View Photos" +msgstr "Bilder anschauen" + +#: include/conversation.php:968 include/Contact.php:367 +msgid "Network Posts" +msgstr "Netzwerkbeiträge" + +#: include/conversation.php:969 include/Contact.php:368 +msgid "Edit Contact" +msgstr "Kontakt bearbeiten" + +#: include/conversation.php:970 include/Contact.php:370 +msgid "Send PM" +msgstr "Private Nachricht senden" + +#: include/conversation.php:974 include/Contact.php:371 +msgid "Poke" +msgstr "Anstupsen" + +#: include/conversation.php:1088 +#, php-format +msgid "%s likes this." +msgstr "%s mag das." + +#: include/conversation.php:1091 +#, php-format +msgid "%s doesn't like this." +msgstr "%s mag das nicht." + +#: include/conversation.php:1094 +#, php-format +msgid "%s attends." +msgstr "%s nimmt teil." + +#: include/conversation.php:1097 +#, php-format +msgid "%s doesn't attend." +msgstr "%s nimmt nicht teil." + +#: include/conversation.php:1100 +#, php-format +msgid "%s attends maybe." +msgstr "%s nimmt eventuell teil." + +#: include/conversation.php:1110 +msgid "and" +msgstr "und" + +#: include/conversation.php:1116 +#, php-format +msgid ", and %d other people" +msgstr " und %d andere" + +#: include/conversation.php:1125 +#, php-format +msgid "%2$d people like this" +msgstr "%2$d Personen mögen das" + +#: include/conversation.php:1126 +#, php-format +msgid "%s like this." +msgstr "%s mögen das." + +#: include/conversation.php:1129 +#, php-format +msgid "%2$d people don't like this" +msgstr "%2$d Personen mögen das nicht" + +#: include/conversation.php:1130 +#, php-format +msgid "%s don't like this." +msgstr "%s mögen dies nicht." + +#: include/conversation.php:1133 +#, php-format +msgid "%2$d people attend" +msgstr "%2$d Personen nehmen teil" + +#: include/conversation.php:1134 +#, php-format +msgid "%s attend." +msgstr "%s nehmen teil." + +#: include/conversation.php:1137 +#, php-format +msgid "%2$d people don't attend" +msgstr "%2$d Personen nehmen nicht teil" + +#: include/conversation.php:1138 +#, php-format +msgid "%s don't attend." +msgstr "%s nehmen nicht teil." + +#: include/conversation.php:1141 +#, php-format +msgid "%2$d people anttend maybe" +msgstr "%2$d Personen nehmen eventuell teil" + +#: include/conversation.php:1142 +#, php-format +msgid "%s anttend maybe." +msgstr "%s nehmen vielleicht teil." + +#: include/conversation.php:1181 include/conversation.php:1199 +msgid "Visible to everybody" +msgstr "Für jedermann sichtbar" + +#: include/conversation.php:1182 include/conversation.php:1200 +#: mod/wallmessage.php:127 mod/wallmessage.php:135 mod/message.php:291 +#: mod/message.php:299 mod/message.php:442 mod/message.php:450 +msgid "Please enter a link URL:" +msgstr "Bitte gib die URL des Links ein:" + +#: include/conversation.php:1183 include/conversation.php:1201 +msgid "Please enter a video link/URL:" +msgstr "Bitte Link/URL zum Video einfügen:" + +#: include/conversation.php:1184 include/conversation.php:1202 +msgid "Please enter an audio link/URL:" +msgstr "Bitte Link/URL zum Audio einfügen:" + +#: include/conversation.php:1185 include/conversation.php:1203 +msgid "Tag term:" +msgstr "Tag:" + +#: include/conversation.php:1186 include/conversation.php:1204 +#: mod/filer.php:30 +msgid "Save to Folder:" +msgstr "In diesem Ordner speichern:" + +#: include/conversation.php:1187 include/conversation.php:1205 +msgid "Where are you right now?" +msgstr "Wo hältst Du Dich jetzt gerade auf?" + +#: include/conversation.php:1188 +msgid "Delete item(s)?" +msgstr "Einträge löschen?" + +#: include/conversation.php:1236 mod/photos.php:1597 +msgid "Share" +msgstr "Teilen" + +#: include/conversation.php:1237 mod/editpost.php:110 mod/wallmessage.php:154 +#: mod/message.php:354 mod/message.php:545 +msgid "Upload photo" +msgstr "Foto hochladen" + +#: include/conversation.php:1238 mod/editpost.php:111 +msgid "upload photo" +msgstr "Bild hochladen" + +#: include/conversation.php:1239 mod/editpost.php:112 +msgid "Attach file" +msgstr "Datei anhängen" + +#: include/conversation.php:1240 mod/editpost.php:113 +msgid "attach file" +msgstr "Datei anhängen" + +#: include/conversation.php:1241 mod/editpost.php:114 mod/wallmessage.php:155 +#: mod/message.php:355 mod/message.php:546 +msgid "Insert web link" +msgstr "Einen Link einfügen" + +#: include/conversation.php:1242 mod/editpost.php:115 +msgid "web link" +msgstr "Weblink" + +#: include/conversation.php:1243 mod/editpost.php:116 +msgid "Insert video link" +msgstr "Video-Adresse einfügen" + +#: include/conversation.php:1244 mod/editpost.php:117 +msgid "video link" +msgstr "Video-Link" + +#: include/conversation.php:1245 mod/editpost.php:118 +msgid "Insert audio link" +msgstr "Audio-Adresse einfügen" + +#: include/conversation.php:1246 mod/editpost.php:119 +msgid "audio link" +msgstr "Audio-Link" + +#: include/conversation.php:1247 mod/editpost.php:120 +msgid "Set your location" +msgstr "Deinen Standort festlegen" + +#: include/conversation.php:1248 mod/editpost.php:121 +msgid "set location" +msgstr "Ort setzen" + +#: include/conversation.php:1249 mod/editpost.php:122 +msgid "Clear browser location" +msgstr "Browser-Standort leeren" + +#: include/conversation.php:1250 mod/editpost.php:123 +msgid "clear location" +msgstr "Ort löschen" + +#: include/conversation.php:1252 mod/editpost.php:137 +msgid "Set title" +msgstr "Titel setzen" + +#: include/conversation.php:1254 mod/editpost.php:139 +msgid "Categories (comma-separated list)" +msgstr "Kategorien (kommasepariert)" + +#: include/conversation.php:1256 mod/editpost.php:125 +msgid "Permission settings" +msgstr "Berechtigungseinstellungen" + +#: include/conversation.php:1257 mod/editpost.php:154 +msgid "permissions" +msgstr "Zugriffsrechte" + +#: include/conversation.php:1265 mod/editpost.php:134 +msgid "Public post" +msgstr "Öffentlicher Beitrag" + +#: include/conversation.php:1270 mod/events.php:505 mod/editpost.php:145 +#: mod/photos.php:1619 mod/photos.php:1667 mod/photos.php:1755 +#: mod/content.php:737 object/Item.php:729 +msgid "Preview" +msgstr "Vorschau" + +#: include/conversation.php:1280 +msgid "Post to Groups" +msgstr "Poste an Gruppe" + +#: include/conversation.php:1281 +msgid "Post to Contacts" +msgstr "Poste an Kontakte" + +#: include/conversation.php:1282 +msgid "Private post" +msgstr "Privater Beitrag" + +#: include/conversation.php:1288 mod/editpost.php:153 +msgid "Browser" +msgstr "Browser" + +#: include/conversation.php:1443 +msgid "View all" +msgstr "Zeige alle" + +#: include/conversation.php:1465 +msgid "Like" +msgid_plural "Likes" +msgstr[0] "mag ich" +msgstr[1] "Mag ich" + +#: include/conversation.php:1468 +msgid "Dislike" +msgid_plural "Dislikes" +msgstr[0] "mag ich nicht" +msgstr[1] "Mag ich nicht" + +#: include/conversation.php:1474 +msgid "Not Attending" +msgid_plural "Not Attending" +msgstr[0] "Nicht teilnehmend " +msgstr[1] "Nicht teilnehmend" + +#: include/diaspora.php:1954 +msgid "Sharing notification from Diaspora network" +msgstr "Freigabe-Benachrichtigung von Diaspora" + +#: include/diaspora.php:2854 +msgid "Attachments:" +msgstr "Anhänge:" + +#: include/network.php:595 +msgid "view full size" +msgstr "Volle Größe anzeigen" + +#: include/plugin.php:522 include/plugin.php:524 +msgid "Click here to upgrade." +msgstr "Zum Upgraden hier klicken." + +#: include/plugin.php:530 +msgid "This action exceeds the limits set by your subscription plan." +msgstr "Diese Aktion überschreitet die Obergrenze Deines Abonnements." + +#: include/plugin.php:535 +msgid "This action is not available under your subscription plan." +msgstr "Diese Aktion ist in Deinem Abonnement nicht verfügbar." + +#: include/Contact.php:119 +msgid "stopped following" +msgstr "wird nicht mehr gefolgt" + +#: include/Contact.php:369 +msgid "Drop Contact" +msgstr "Kontakt löschen" + +#: include/api.php:974 +#, 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:994 +#, 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:1015 +#, 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/dbstructure.php:26 +#, php-format +msgid "" +"\n" +"\t\t\tThe friendica developers released update %s recently,\n" +"\t\t\tbut when I tried to install it, something went terribly wrong.\n" +"\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n" +"\t\t\tfriendica developer if you can not help me on your own. My database might be invalid." +msgstr "\nDie Friendica-Entwickler haben vor kurzem das Update %s veröffentlicht, aber bei der Installation ging etwas schrecklich schief.\n\nDas Problem sollte so schnell wie möglich gelöst werden, aber ich schaffe es nicht alleine. Bitte kontaktiere einen Friendica-Entwickler falls Du mir nicht alleine helfen kannst. Meine Datenbank könnte ungültig sein." + +#: include/dbstructure.php:31 +#, php-format +msgid "" +"The error message is\n" +"[pre]%s[/pre]" +msgstr "Die Fehlermeldung lautet\n[pre]%s[/pre]" + +#: include/dbstructure.php:153 +msgid "Errors encountered creating database tables." +msgstr "Fehler aufgetreten während der Erzeugung der Datenbanktabellen." + +#: include/dbstructure.php:230 +msgid "Errors encountered performing database changes." +msgstr "Es sind Fehler beim Bearbeiten der Datenbank aufgetreten." #: mod/regmod.php:55 msgid "Account approved." @@ -3141,11 +3054,11 @@ msgstr "Zugriff verweigert." msgid "Welcome to %s" msgstr "Willkommen zu %s" -#: mod/notify.php:60 mod/notifications.php:387 +#: mod/notify.php:60 mod/notifications.php:338 msgid "No more system notifications." msgstr "Keine weiteren Systembenachrichtigungen." -#: mod/notify.php:64 mod/notifications.php:391 +#: mod/notify.php:64 mod/notifications.php:318 msgid "System Notifications" msgstr "Systembenachrichtigungen" @@ -3154,8 +3067,8 @@ msgid "Remove term" msgstr "Begriff entfernen" #: mod/search.php:93 mod/search.php:99 mod/directory.php:37 -#: mod/viewcontacts.php:35 mod/videos.php:197 mod/photos.php:963 -#: mod/display.php:199 mod/community.php:22 mod/dfrn_request.php:789 +#: mod/viewcontacts.php:35 mod/videos.php:197 mod/display.php:199 +#: mod/community.php:22 mod/dfrn_request.php:790 mod/photos.php:964 msgid "Public access denied." msgstr "Öffentlicher Zugriff verweigert." @@ -3180,263 +3093,11 @@ msgstr "Keine Ergebnisse." msgid "Items tagged with: %s" msgstr "Beiträge die mit %s getaggt sind" -#: mod/search.php:232 mod/contacts.php:790 mod/network.php:146 +#: mod/search.php:232 mod/network.php:146 mod/contacts.php:795 #, php-format msgid "Results for: %s" msgstr "Ergebnisse für: %s" -#: mod/notifications.php:29 -msgid "Invalid request identifier." -msgstr "Invalid request identifier." - -#: mod/notifications.php:38 mod/notifications.php:182 -#: mod/notifications.php:262 -msgid "Discard" -msgstr "Verwerfen" - -#: mod/notifications.php:54 mod/notifications.php:181 -#: mod/notifications.php:261 mod/contacts.php:604 mod/contacts.php:799 -#: mod/contacts.php:1000 -msgid "Ignore" -msgstr "Ignorieren" - -#: mod/notifications.php:81 -msgid "System" -msgstr "System" - -#: mod/notifications.php:93 mod/profiles.php:696 mod/network.php:844 -msgid "Personal" -msgstr "Persönlich" - -#: mod/notifications.php:130 -msgid "Show Ignored Requests" -msgstr "Zeige ignorierte Anfragen" - -#: mod/notifications.php:130 -msgid "Hide Ignored Requests" -msgstr "Verberge ignorierte Anfragen" - -#: mod/notifications.php:166 mod/notifications.php:236 -msgid "Notification type: " -msgstr "Benachrichtigungstyp: " - -#: mod/notifications.php:167 -msgid "Friend Suggestion" -msgstr "Kontaktvorschlag" - -#: mod/notifications.php:169 -#, php-format -msgid "suggested by %s" -msgstr "vorgeschlagen von %s" - -#: mod/notifications.php:174 mod/notifications.php:253 mod/contacts.php:610 -msgid "Hide this contact from others" -msgstr "Verbirg diesen Kontakt vor andere" - -#: mod/notifications.php:175 mod/notifications.php:254 -msgid "Post a new friend activity" -msgstr "Neue-Kontakt Nachricht senden" - -#: mod/notifications.php:175 mod/notifications.php:254 -msgid "if applicable" -msgstr "falls anwendbar" - -#: mod/notifications.php:178 mod/notifications.php:259 mod/admin.php:1386 -msgid "Approve" -msgstr "Genehmigen" - -#: mod/notifications.php:198 -msgid "Claims to be known to you: " -msgstr "Behauptet Dich zu kennen: " - -#: mod/notifications.php:198 -msgid "yes" -msgstr "ja" - -#: mod/notifications.php:198 -msgid "no" -msgstr "nein" - -#: mod/notifications.php:199 -msgid "" -"Shall your connection be bidirectional or not? \"Friend\" implies that you " -"allow to read and you subscribe to their posts. \"Fan/Admirer\" means that " -"you allow to read but you do not want to read theirs. Approve as: " -msgstr "Soll Deine Beziehung beidseitig sein oder nicht? \"Kontakt\" bedeutet, ihr könnt gegenseitig die Beiträge des Anderen lesen dürft. \"Fan/Verehrer\", dass du das lesen deiner Beiträge erlaubst aber nicht die Beiträge der anderen Seite lesen möchtest. Genehmigen als:" - -#: mod/notifications.php:202 -msgid "" -"Shall your connection be bidirectional or not? \"Friend\" implies that you " -"allow to read and you subscribe to their posts. \"Sharer\" means that you " -"allow to read but you do not want to read theirs. Approve as: " -msgstr "Soll Deine Beziehung beidseitig sein oder nicht? \"Freund\" bedeutet, ihr gegenseitig die Beiträge des Anderen lesen dürft. \"Teilenden\", das du das lesen deiner Beiträge erlaubst aber nicht die Beiträge der anderen Seite lesen möchtest. Genehmigen als:" - -#: mod/notifications.php:210 -msgid "Friend" -msgstr "Kontakt" - -#: mod/notifications.php:211 -msgid "Sharer" -msgstr "Teilenden" - -#: mod/notifications.php:211 -msgid "Fan/Admirer" -msgstr "Fan/Verehrer" - -#: mod/notifications.php:237 -msgid "Friend/Connect Request" -msgstr "Kontakt-/Freundschaftsanfrage" - -#: mod/notifications.php:237 -msgid "New Follower" -msgstr "Neuer Bewunderer" - -#: mod/notifications.php:257 mod/contacts.php:621 mod/follow.php:126 -msgid "Profile URL" -msgstr "Profil URL" - -#: mod/notifications.php:268 -msgid "No introductions." -msgstr "Keine Kontaktanfragen." - -#: mod/notifications.php:309 mod/notifications.php:438 -#: mod/notifications.php:529 -#, php-format -msgid "%s liked %s's post" -msgstr "%s mag %ss Beitrag" - -#: mod/notifications.php:319 mod/notifications.php:448 -#: mod/notifications.php:539 -#, php-format -msgid "%s disliked %s's post" -msgstr "%s mag %ss Beitrag nicht" - -#: mod/notifications.php:334 mod/notifications.php:463 -#: mod/notifications.php:554 -#, php-format -msgid "%s is now friends with %s" -msgstr "%s ist jetzt mit %s befreundet" - -#: mod/notifications.php:341 mod/notifications.php:470 -#, php-format -msgid "%s created a new post" -msgstr "%s hat einen neuen Beitrag erstellt" - -#: mod/notifications.php:342 mod/notifications.php:471 -#: mod/notifications.php:564 -#, php-format -msgid "%s commented on %s's post" -msgstr "%s hat %ss Beitrag kommentiert" - -#: mod/notifications.php:357 -msgid "No more network notifications." -msgstr "Keine weiteren Netzwerk-Benachrichtigungen." - -#: mod/notifications.php:361 -msgid "Network Notifications" -msgstr "Netzwerk Benachrichtigungen" - -#: mod/notifications.php:486 -msgid "No more personal notifications." -msgstr "Keine weiteren persönlichen Benachrichtigungen" - -#: mod/notifications.php:490 -msgid "Personal Notifications" -msgstr "Persönliche Benachrichtigungen" - -#: mod/notifications.php:571 -msgid "No more home notifications." -msgstr "Keine weiteren Pinnwand-Benachrichtigungen" - -#: mod/notifications.php:575 -msgid "Home Notifications" -msgstr "Pinnwand Benachrichtigungen" - -#: mod/dfrn_confirm.php:65 mod/profiles.php:18 mod/profiles.php:133 -#: mod/profiles.php:179 mod/profiles.php:610 -msgid "Profile not found." -msgstr "Profil nicht gefunden." - -#: mod/dfrn_confirm.php:121 mod/fsuggest.php:20 mod/fsuggest.php:92 -#: mod/crepair.php:114 -msgid "Contact not found." -msgstr "Kontakt nicht gefunden." - -#: mod/dfrn_confirm.php:122 -msgid "" -"This may occasionally happen if contact was requested by both persons and it" -" has already been approved." -msgstr "Das kann passieren, wenn sich zwei Kontakte gegenseitig eingeladen haben und bereits einer angenommen wurde." - -#: mod/dfrn_confirm.php:241 -msgid "Response from remote site was not understood." -msgstr "Antwort der Gegenstelle unverständlich." - -#: mod/dfrn_confirm.php:250 mod/dfrn_confirm.php:255 -msgid "Unexpected response from remote site: " -msgstr "Unerwartete Antwort der Gegenstelle: " - -#: mod/dfrn_confirm.php:264 -msgid "Confirmation completed successfully." -msgstr "Bestätigung erfolgreich abgeschlossen." - -#: mod/dfrn_confirm.php:266 mod/dfrn_confirm.php:280 mod/dfrn_confirm.php:287 -msgid "Remote site reported: " -msgstr "Gegenstelle meldet: " - -#: mod/dfrn_confirm.php:278 -msgid "Temporary failure. Please wait and try again." -msgstr "Zeitweiser Fehler. Bitte warte einige Momente und versuche es dann noch einmal." - -#: mod/dfrn_confirm.php:285 -msgid "Introduction failed or was revoked." -msgstr "Kontaktanfrage schlug fehl oder wurde zurückgezogen." - -#: mod/dfrn_confirm.php:414 -msgid "Unable to set contact photo." -msgstr "Konnte das Bild des Kontakts nicht speichern." - -#: mod/dfrn_confirm.php:552 -#, php-format -msgid "No user record found for '%s' " -msgstr "Für '%s' wurde kein Nutzer gefunden" - -#: mod/dfrn_confirm.php:562 -msgid "Our site encryption key is apparently messed up." -msgstr "Der Verschlüsselungsschlüssel unserer Seite ist anscheinend nicht in Ordnung." - -#: mod/dfrn_confirm.php:573 -msgid "Empty site URL was provided or URL could not be decrypted by us." -msgstr "Leere URL für die Seite erhalten oder die URL konnte nicht entschlüsselt werden." - -#: mod/dfrn_confirm.php:594 -msgid "Contact record was not found for you on our site." -msgstr "Für diesen Kontakt wurde auf unserer Seite kein Eintrag gefunden." - -#: mod/dfrn_confirm.php:608 -#, php-format -msgid "Site public key not available in contact record for URL %s." -msgstr "Die Kontaktdaten für URL %s enthalten keinen Public Key für den Server." - -#: mod/dfrn_confirm.php:628 -msgid "" -"The ID provided by your system is a duplicate on our system. It should work " -"if you try again." -msgstr "Die ID, die uns Dein System angeboten hat, ist hier bereits vergeben. Bitte versuche es noch einmal." - -#: mod/dfrn_confirm.php:639 -msgid "Unable to set your contact credentials on our system." -msgstr "Deine Kontaktreferenzen konnten nicht in unserem System gespeichert werden." - -#: mod/dfrn_confirm.php:698 -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:770 -#, php-format -msgid "%1$s has joined %2$s" -msgstr "%1$s ist %2$s beigetreten" - #: mod/friendica.php:70 msgid "This is Friendica, version" msgstr "Dies ist Friendica, Version" @@ -3525,6 +3186,10 @@ 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:1635 +msgid "Password Reset" +msgstr "Passwort zurücksetzen" + #: mod/lostpass.php:110 msgid "Your password has been reset as requested." msgstr "Dein Passwort wurde wie gewünscht zurückgesetzt." @@ -3587,6 +3252,10 @@ msgid "" "your email for further instructions." msgstr "Gib Deine E-Mail-Adresse an und fordere ein neues Passwort an. Es werden Dir dann weitere Informationen per Mail zugesendet." +#: mod/lostpass.php:161 boot.php:1623 +msgid "Nickname or Email: " +msgstr "Spitzname oder E-Mail:" + #: mod/lostpass.php:162 msgid "Reset" msgstr "Zurücksetzen" @@ -3599,25 +3268,39 @@ msgstr "Kein Profil" msgid "Help:" msgstr "Hilfe:" +#: mod/help.php:53 mod/p.php:16 mod/p.php:43 mod/p.php:52 mod/fetch.php:12 +#: mod/fetch.php:39 mod/fetch.php:48 index.php:284 +msgid "Not Found" +msgstr "Nicht gefunden" + +#: mod/help.php:56 index.php:287 +msgid "Page not found." +msgstr "Seite nicht gefunden." + #: 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 msgid "Invalid request." msgstr "Ungültige Anfrage" -#: mod/wall_upload.php:151 mod/photos.php:805 mod/profile_photo.php:150 +#: mod/wall_upload.php:151 mod/profile_photo.php:150 mod/photos.php:806 #, php-format msgid "Image exceeds size limit of %s" msgstr "Bildgröße überschreitet das Limit von %s" -#: mod/wall_upload.php:188 mod/photos.php:845 mod/profile_photo.php:159 +#: mod/wall_upload.php:188 mod/profile_photo.php:159 mod/photos.php:846 msgid "Unable to process image." msgstr "Konnte das Bild nicht bearbeiten." -#: mod/wall_upload.php:221 mod/photos.php:872 mod/profile_photo.php:307 +#: mod/wall_upload.php:221 mod/profile_photo.php:307 mod/photos.php:873 msgid "Image upload failed." msgstr "Hochladen des Bildes gescheitert." +#: mod/fsuggest.php:20 mod/fsuggest.php:92 mod/crepair.php:114 +#: mod/dfrn_confirm.php:122 +msgid "Contact not found." +msgstr "Kontakt nicht gefunden." + #: mod/fsuggest.php:63 msgid "Friend suggestion sent." msgstr "Kontaktvorschlag gesendet." @@ -3631,18 +3314,17 @@ msgstr "Kontakte vorschlagen" msgid "Suggest a friend for %s" msgstr "Schlage %s einen Kontakt vor" -#: mod/fsuggest.php:107 mod/events.php:507 mod/invite.php:140 -#: mod/crepair.php:179 mod/content.php:728 mod/profiles.php:681 -#: mod/poke.php:199 mod/photos.php:1124 mod/photos.php:1248 -#: mod/photos.php:1566 mod/photos.php:1617 mod/photos.php:1665 -#: mod/photos.php:1753 mod/install.php:272 mod/install.php:312 -#: mod/contacts.php:575 mod/mood.php:137 mod/localtime.php:45 -#: mod/message.php:357 mod/message.php:547 mod/manage.php:143 -#: object/Item.php:720 view/theme/frio/config.php:59 -#: view/theme/cleanzero/config.php:80 view/theme/quattro/config.php:64 -#: view/theme/dispy/config.php:70 view/theme/vier/config.php:107 -#: view/theme/diabook/theme.php:633 view/theme/diabook/config.php:148 -#: view/theme/duepuntozero/config.php:59 +#: mod/fsuggest.php:107 mod/events.php:507 mod/invite.php:140 mod/poke.php:199 +#: mod/install.php:272 mod/install.php:312 mod/mood.php:137 +#: mod/localtime.php:45 mod/message.php:357 mod/message.php:547 +#: mod/manage.php:143 mod/contacts.php:577 mod/crepair.php:154 +#: mod/photos.php:1125 mod/photos.php:1249 mod/photos.php:1567 +#: mod/photos.php:1618 mod/photos.php:1666 mod/photos.php:1754 +#: mod/profiles.php:682 mod/content.php:728 object/Item.php:720 +#: view/theme/frio/config.php:59 view/theme/cleanzero/config.php:80 +#: view/theme/quattro/config.php:64 view/theme/dispy/config.php:70 +#: view/theme/vier/config.php:107 view/theme/diabook/theme.php:633 +#: view/theme/diabook/config.php:148 view/theme/duepuntozero/config.php:59 msgid "Submit" msgstr "Senden" @@ -3690,7 +3372,7 @@ msgstr "Anfangszeitpunkt und Titel werden benötigt" msgid "Event Starts:" msgstr "Veranstaltungsbeginn:" -#: mod/events.php:485 mod/events.php:497 mod/profiles.php:709 +#: mod/events.php:485 mod/events.php:497 mod/profiles.php:710 msgid "Required" msgstr "Benötigt" @@ -3789,13 +3471,13 @@ msgid "" "select \"Export account\"" msgstr "Um Deinen Account zu exportieren, rufe \"Einstellungen -> Persönliche Daten exportieren\" auf und wähle \"Account exportieren\"" -#: mod/nogroup.php:41 mod/viewcontacts.php:97 mod/contacts.php:584 -#: mod/contacts.php:939 +#: mod/nogroup.php:41 mod/viewcontacts.php:97 mod/contacts.php:586 +#: mod/contacts.php:944 #, php-format msgid "Visit %s's profile [%s]" msgstr "Besuche %ss Profil [%s]" -#: mod/nogroup.php:42 mod/contacts.php:940 +#: mod/nogroup.php:42 mod/contacts.php:945 msgid "Edit contact" msgstr "Kontakt bearbeiten" @@ -3937,9 +3619,9 @@ msgid "" "important, please visit http://friendica.com" msgstr "Für weitere Informationen über das Friendica Projekt und warum wir es für ein wichtiges Projekt halten, besuche bitte http://friendica.com" -#: mod/fbrowser.php:41 mod/fbrowser.php:62 mod/photos.php:62 -#: mod/photos.php:192 mod/photos.php:1106 mod/photos.php:1232 -#: mod/photos.php:1255 mod/photos.php:1825 mod/photos.php:1837 +#: mod/fbrowser.php:41 mod/fbrowser.php:62 mod/photos.php:63 +#: mod/photos.php:193 mod/photos.php:1107 mod/photos.php:1233 +#: mod/photos.php:1256 mod/photos.php:1826 mod/photos.php:1838 #: view/theme/diabook/theme.php:499 msgid "Contact Photos" msgstr "Kontaktbilder" @@ -3952,6 +3634,10 @@ msgstr "Dateien" msgid "System down for maintenance" msgstr "System zur Wartung abgeschaltet" +#: mod/profperm.php:19 mod/group.php:72 index.php:396 +msgid "Permission denied" +msgstr "Zugriff verweigert" + #: mod/profperm.php:25 mod/profperm.php:56 msgid "Invalid profile identifier." msgstr "Ungültiger Profil-Bezeichner." @@ -3976,98 +3662,6 @@ msgstr "Alle Kontakte (mit gesichertem Profilzugriff)" msgid "No contacts." msgstr "Keine Kontakte." -#: mod/crepair.php:87 -msgid "Contact settings applied." -msgstr "Einstellungen zum Kontakt angewandt." - -#: mod/crepair.php:89 -msgid "Contact update failed." -msgstr "Konnte den Kontakt nicht aktualisieren." - -#: mod/crepair.php:120 -msgid "" -"WARNING: This is highly advanced and if you enter incorrect" -" information your communications with this contact may stop working." -msgstr "ACHTUNG: Das sind Experten-Einstellungen! Wenn Du etwas Falsches eingibst, funktioniert die Kommunikation mit diesem Kontakt evtl. nicht mehr." - -#: mod/crepair.php:121 -msgid "" -"Please use your browser 'Back' button now if you are " -"uncertain what to do on this page." -msgstr "Bitte nutze den Zurück-Button Deines Browsers jetzt, wenn Du Dir unsicher bist, was Du tun willst." - -#: mod/crepair.php:134 mod/crepair.php:136 -msgid "No mirroring" -msgstr "Kein Spiegeln" - -#: mod/crepair.php:134 -msgid "Mirror as forwarded posting" -msgstr "Spiegeln als weitergeleitete Beiträge" - -#: mod/crepair.php:134 mod/crepair.php:136 -msgid "Mirror as my own posting" -msgstr "Spiegeln als meine eigenen Beiträge" - -#: mod/crepair.php:150 -msgid "Return to contact editor" -msgstr "Zurück zum Kontakteditor" - -#: mod/crepair.php:152 -msgid "Refetch contact data" -msgstr "Kontaktdaten neu laden" - -#: mod/crepair.php:153 mod/admin.php:1371 mod/admin.php:1384 -#: mod/admin.php:1396 mod/admin.php:1412 mod/settings.php:665 -#: mod/settings.php:691 -msgid "Name" -msgstr "Name" - -#: mod/crepair.php:154 -msgid "Account Nickname" -msgstr "Konto-Spitzname" - -#: mod/crepair.php:155 -msgid "@Tagname - overrides Name/Nickname" -msgstr "@Tagname - überschreibt Name/Spitzname" - -#: mod/crepair.php:156 -msgid "Account URL" -msgstr "Konto-URL" - -#: mod/crepair.php:157 -msgid "Friend Request URL" -msgstr "URL für Kontaktschaftsanfragen" - -#: mod/crepair.php:158 -msgid "Friend Confirm URL" -msgstr "URL für Bestätigungen von Kontaktanfragen" - -#: mod/crepair.php:159 -msgid "Notification Endpoint URL" -msgstr "URL-Endpunkt für Benachrichtigungen" - -#: mod/crepair.php:160 -msgid "Poll/Feed URL" -msgstr "Pull/Feed-URL" - -#: mod/crepair.php:161 -msgid "New photo from this URL" -msgstr "Neues Foto von dieser URL" - -#: mod/crepair.php:162 -msgid "Remote Self" -msgstr "Entfernte Konten" - -#: mod/crepair.php:165 -msgid "Mirror postings from this contact" -msgstr "Spiegle Beiträge dieses Kontakts" - -#: mod/crepair.php:167 -msgid "" -"Mark this contact as remote_self, this will cause friendica to repost new " -"entries from this contact." -msgstr "Markiere diesen Kontakt als remote_self (entferntes Konto), dies veranlasst Friendica alle Top-Level Beiträge dieses Kontakts an all Deine Kontakte zu senden." - #: mod/tagrm.php:41 msgid "Tag removed" msgstr "Tag entfernt" @@ -4287,7 +3881,7 @@ msgstr "Öffentliche Beiträge von Nutzer_innen dieser Seite" msgid "Global community page" msgstr "Globale Gemeinschaftsseite" -#: mod/admin.php:857 mod/contacts.php:529 +#: mod/admin.php:857 mod/contacts.php:530 msgid "Never" msgstr "Niemals" @@ -4295,7 +3889,7 @@ msgstr "Niemals" msgid "At post arrival" msgstr "Beim Empfang von Nachrichten" -#: mod/admin.php:866 mod/contacts.php:556 +#: mod/admin.php:866 mod/contacts.php:557 msgid "Disabled" msgstr "Deaktiviert" @@ -5235,6 +4829,11 @@ msgstr "Nutzer '%s' entsperrt" msgid "User '%s' blocked" msgstr "Nutzer '%s' gesperrt" +#: mod/admin.php:1371 mod/admin.php:1384 mod/admin.php:1396 mod/admin.php:1412 +#: mod/settings.php:665 mod/settings.php:691 mod/crepair.php:165 +msgid "Name" +msgstr "Name" + #: mod/admin.php:1371 mod/admin.php:1396 msgid "Register date" msgstr "Anmeldedatum" @@ -5275,17 +4874,21 @@ msgstr "Anfragedatum" msgid "No registrations." msgstr "Keine Neuanmeldungen." +#: mod/admin.php:1386 mod/notifications.php:139 mod/notifications.php:225 +msgid "Approve" +msgstr "Genehmigen" + #: mod/admin.php:1387 msgid "Deny" msgstr "Verwehren" -#: mod/admin.php:1389 mod/contacts.php:603 mod/contacts.php:798 -#: mod/contacts.php:992 +#: mod/admin.php:1389 mod/contacts.php:605 mod/contacts.php:803 +#: mod/contacts.php:997 msgid "Block" msgstr "Sperren" -#: mod/admin.php:1390 mod/contacts.php:603 mod/contacts.php:798 -#: mod/contacts.php:992 +#: mod/admin.php:1390 mod/contacts.php:605 mod/contacts.php:803 +#: mod/contacts.php:997 msgid "Unblock" msgstr "Entsperren" @@ -5497,164 +5100,6 @@ msgstr "Keine exportierbaren Daten gefunden" msgid "calendar" msgstr "Kalender" -#: mod/content.php:119 mod/network.php:468 -msgid "No such group" -msgstr "Es gibt keine solche Gruppe" - -#: mod/content.php:130 mod/network.php:495 mod/group.php:193 -msgid "Group is empty" -msgstr "Gruppe ist leer" - -#: mod/content.php:135 mod/network.php:499 -#, php-format -msgid "Group: %s" -msgstr "Gruppe: %s" - -#: mod/content.php:325 object/Item.php:95 -msgid "This entry was edited" -msgstr "Dieser Beitrag wurde bearbeitet." - -#: mod/content.php:621 object/Item.php:429 -#, php-format -msgid "%d comment" -msgid_plural "%d comments" -msgstr[0] "%d Kommentar" -msgstr[1] "%d Kommentare" - -#: mod/content.php:638 mod/photos.php:1405 object/Item.php:117 -msgid "Private Message" -msgstr "Private Nachricht" - -#: mod/content.php:702 mod/photos.php:1594 object/Item.php:263 -msgid "I like this (toggle)" -msgstr "Ich mag das (toggle)" - -#: mod/content.php:702 object/Item.php:263 -msgid "like" -msgstr "mag ich" - -#: mod/content.php:703 mod/photos.php:1595 object/Item.php:264 -msgid "I don't like this (toggle)" -msgstr "Ich mag das nicht (toggle)" - -#: mod/content.php:703 object/Item.php:264 -msgid "dislike" -msgstr "mag ich nicht" - -#: mod/content.php:705 object/Item.php:266 -msgid "Share this" -msgstr "Weitersagen" - -#: mod/content.php:705 object/Item.php:266 -msgid "share" -msgstr "Teilen" - -#: mod/content.php:725 mod/photos.php:1614 mod/photos.php:1662 -#: mod/photos.php:1750 object/Item.php:717 -msgid "This is you" -msgstr "Das bist Du" - -#: mod/content.php:729 object/Item.php:721 -msgid "Bold" -msgstr "Fett" - -#: mod/content.php:730 object/Item.php:722 -msgid "Italic" -msgstr "Kursiv" - -#: mod/content.php:731 object/Item.php:723 -msgid "Underline" -msgstr "Unterstrichen" - -#: mod/content.php:732 object/Item.php:724 -msgid "Quote" -msgstr "Zitat" - -#: mod/content.php:733 object/Item.php:725 -msgid "Code" -msgstr "Code" - -#: mod/content.php:734 object/Item.php:726 -msgid "Image" -msgstr "Bild" - -#: mod/content.php:735 object/Item.php:727 -msgid "Link" -msgstr "Link" - -#: mod/content.php:736 object/Item.php:728 -msgid "Video" -msgstr "Video" - -#: mod/content.php:746 mod/settings.php:725 object/Item.php:122 -#: object/Item.php:124 -msgid "Edit" -msgstr "Bearbeiten" - -#: mod/content.php:771 object/Item.php:227 -msgid "add star" -msgstr "markieren" - -#: mod/content.php:772 object/Item.php:228 -msgid "remove star" -msgstr "Markierung entfernen" - -#: mod/content.php:773 object/Item.php:229 -msgid "toggle star status" -msgstr "Markierung umschalten" - -#: mod/content.php:776 object/Item.php:232 -msgid "starred" -msgstr "markiert" - -#: mod/content.php:777 mod/content.php:798 object/Item.php:252 -msgid "add tag" -msgstr "Tag hinzufügen" - -#: mod/content.php:787 object/Item.php:240 -msgid "ignore thread" -msgstr "Thread ignorieren" - -#: mod/content.php:788 object/Item.php:241 -msgid "unignore thread" -msgstr "Thread nicht mehr ignorieren" - -#: mod/content.php:789 object/Item.php:242 -msgid "toggle ignore status" -msgstr "Ignoriert-Status ein-/ausschalten" - -#: mod/content.php:792 mod/ostatus_subscribe.php:69 object/Item.php:245 -msgid "ignored" -msgstr "Ignoriert" - -#: mod/content.php:803 object/Item.php:137 -msgid "save to folder" -msgstr "In Ordner speichern" - -#: mod/content.php:848 object/Item.php:201 -msgid "I will attend" -msgstr "Ich werde teilnehmen" - -#: mod/content.php:848 object/Item.php:201 -msgid "I will not attend" -msgstr "Ich werde nicht teilnehmen" - -#: mod/content.php:848 object/Item.php:201 -msgid "I might attend" -msgstr "Ich werde eventuell teilnehmen" - -#: mod/content.php:912 object/Item.php:369 -msgid "to" -msgstr "zu" - -#: mod/content.php:913 object/Item.php:371 -msgid "Wall-to-Wall" -msgstr "Wall-to-Wall" - -#: mod/content.php:914 object/Item.php:372 -msgid "via Wall-To-Wall:" -msgstr "via Wall-To-Wall:" - #: mod/repair_ostatus.php:14 msgid "Resubscribing to OStatus contacts" msgstr "Erneuern der OStatus Abonements" @@ -5714,11 +5159,11 @@ msgstr "Video Löschen" msgid "No videos selected" msgstr "Keine Videos ausgewählt" -#: mod/videos.php:308 mod/photos.php:1074 +#: mod/videos.php:308 mod/photos.php:1075 msgid "Access to this item is restricted." msgstr "Zugriff zu diesem Eintrag wurde eingeschränkt." -#: mod/videos.php:390 mod/photos.php:1877 +#: mod/videos.php:390 mod/photos.php:1878 msgid "View Album" msgstr "Album betrachten" @@ -5730,305 +5175,6 @@ msgstr "Neueste Videos" msgid "Upload New Videos" msgstr "Neues Video hochladen" -#: mod/profiles.php:37 -msgid "Profile deleted." -msgstr "Profil gelöscht." - -#: mod/profiles.php:55 mod/profiles.php:89 -msgid "Profile-" -msgstr "Profil-" - -#: mod/profiles.php:74 mod/profiles.php:117 -msgid "New profile created." -msgstr "Neues Profil angelegt." - -#: mod/profiles.php:95 -msgid "Profile unavailable to clone." -msgstr "Profil nicht zum Duplizieren verfügbar." - -#: mod/profiles.php:189 -msgid "Profile Name is required." -msgstr "Profilname ist erforderlich." - -#: mod/profiles.php:336 -msgid "Marital Status" -msgstr "Familienstand" - -#: mod/profiles.php:340 -msgid "Romantic Partner" -msgstr "Romanze" - -#: mod/profiles.php:352 -msgid "Work/Employment" -msgstr "Arbeit / Beschäftigung" - -#: mod/profiles.php:355 -msgid "Religion" -msgstr "Religion" - -#: mod/profiles.php:359 -msgid "Political Views" -msgstr "Politische Ansichten" - -#: mod/profiles.php:363 -msgid "Gender" -msgstr "Geschlecht" - -#: mod/profiles.php:367 -msgid "Sexual Preference" -msgstr "Sexuelle Vorlieben" - -#: mod/profiles.php:371 -msgid "Homepage" -msgstr "Webseite" - -#: mod/profiles.php:375 mod/profiles.php:695 -msgid "Interests" -msgstr "Interessen" - -#: mod/profiles.php:379 -msgid "Address" -msgstr "Adresse" - -#: mod/profiles.php:386 mod/profiles.php:691 -msgid "Location" -msgstr "Wohnort" - -#: mod/profiles.php:469 -msgid "Profile updated." -msgstr "Profil aktualisiert." - -#: mod/profiles.php:556 -msgid " and " -msgstr " und " - -#: mod/profiles.php:564 -msgid "public profile" -msgstr "öffentliches Profil" - -#: mod/profiles.php:567 -#, php-format -msgid "%1$s changed %2$s to “%3$s”" -msgstr "%1$s hat %2$s geändert auf “%3$s”" - -#: mod/profiles.php:568 -#, php-format -msgid " - Visit %1$s's %2$s" -msgstr " – %1$ss %2$s besuchen" - -#: mod/profiles.php:571 -#, php-format -msgid "%1$s has an updated %2$s, changing %3$s." -msgstr "%1$s hat folgendes aktualisiert %2$s, verändert wurde %3$s." - -#: mod/profiles.php:638 -msgid "Hide contacts and friends:" -msgstr "Kontakte und Freunde verbergen" - -#: mod/profiles.php:641 mod/profiles.php:645 mod/profiles.php:670 -#: mod/follow.php:110 mod/dfrn_request.php:860 mod/register.php:239 -#: mod/settings.php:1113 mod/settings.php:1119 mod/settings.php:1127 -#: mod/settings.php:1131 mod/settings.php:1136 mod/settings.php:1142 -#: mod/settings.php:1148 mod/settings.php:1154 mod/settings.php:1180 -#: mod/settings.php:1181 mod/settings.php:1182 mod/settings.php:1183 -#: mod/settings.php:1184 mod/api.php:106 -msgid "No" -msgstr "Nein" - -#: mod/profiles.php:643 -msgid "Hide your contact/friend list from viewers of this profile?" -msgstr "Liste der Kontakte vor Betrachtern dieses Profils verbergen?" - -#: mod/profiles.php:667 -msgid "Show more profile fields:" -msgstr "Zeige mehr Profil-Felder:" - -#: mod/profiles.php:679 -msgid "Profile Actions" -msgstr "Profilaktionen" - -#: mod/profiles.php:680 -msgid "Edit Profile Details" -msgstr "Profil bearbeiten" - -#: mod/profiles.php:682 -msgid "Change Profile Photo" -msgstr "Profilbild ändern" - -#: mod/profiles.php:683 -msgid "View this profile" -msgstr "Dieses Profil anzeigen" - -#: mod/profiles.php:685 -msgid "Create a new profile using these settings" -msgstr "Neues Profil anlegen und diese Einstellungen verwenden" - -#: mod/profiles.php:686 -msgid "Clone this profile" -msgstr "Dieses Profil duplizieren" - -#: mod/profiles.php:687 -msgid "Delete this profile" -msgstr "Dieses Profil löschen" - -#: mod/profiles.php:689 -msgid "Basic information" -msgstr "Grundinformationen" - -#: mod/profiles.php:690 -msgid "Profile picture" -msgstr "Profilbild" - -#: mod/profiles.php:692 -msgid "Preferences" -msgstr "Vorlieben" - -#: mod/profiles.php:693 -msgid "Status information" -msgstr "Status Informationen" - -#: mod/profiles.php:694 -msgid "Additional information" -msgstr "Zusätzliche Informationen" - -#: mod/profiles.php:697 -msgid "Relation" -msgstr "Beziehung" - -#: mod/profiles.php:700 mod/newmember.php:36 mod/profile_photo.php:250 -msgid "Upload Profile Photo" -msgstr "Profilbild hochladen" - -#: mod/profiles.php:701 -msgid "Your Gender:" -msgstr "Dein Geschlecht:" - -#: mod/profiles.php:702 -msgid "♥ Marital Status:" -msgstr "♥ Beziehungsstatus:" - -#: mod/profiles.php:704 -msgid "Example: fishing photography software" -msgstr "Beispiel: Fischen Fotografie Software" - -#: mod/profiles.php:709 -msgid "Profile Name:" -msgstr "Profilname:" - -#: mod/profiles.php:711 -msgid "" -"This is your public profile.
It may " -"be visible to anybody using the internet." -msgstr "Dies ist Dein öffentliches Profil.
Es könnte für jeden Nutzer des Internets sichtbar sein." - -#: mod/profiles.php:712 -msgid "Your Full Name:" -msgstr "Dein kompletter Name:" - -#: mod/profiles.php:713 -msgid "Title/Description:" -msgstr "Titel/Beschreibung:" - -#: mod/profiles.php:716 -msgid "Street Address:" -msgstr "Adresse:" - -#: mod/profiles.php:717 -msgid "Locality/City:" -msgstr "Wohnort:" - -#: mod/profiles.php:718 -msgid "Region/State:" -msgstr "Region/Bundesstaat:" - -#: mod/profiles.php:719 -msgid "Postal/Zip Code:" -msgstr "Postleitzahl:" - -#: mod/profiles.php:720 -msgid "Country:" -msgstr "Land:" - -#: mod/profiles.php:724 -msgid "Who: (if applicable)" -msgstr "Wer: (falls anwendbar)" - -#: mod/profiles.php:724 -msgid "Examples: cathy123, Cathy Williams, cathy@example.com" -msgstr "Beispiele: cathy123, Cathy Williams, cathy@example.com" - -#: mod/profiles.php:725 -msgid "Since [date]:" -msgstr "Seit [Datum]:" - -#: mod/profiles.php:727 -msgid "Tell us about yourself..." -msgstr "Erzähle uns ein bisschen von Dir …" - -#: mod/profiles.php:728 -msgid "Homepage URL:" -msgstr "Adresse der Homepage:" - -#: mod/profiles.php:731 -msgid "Religious Views:" -msgstr "Religiöse Ansichten:" - -#: mod/profiles.php:732 -msgid "Public Keywords:" -msgstr "Öffentliche Schlüsselwörter:" - -#: mod/profiles.php:732 -msgid "(Used for suggesting potential friends, can be seen by others)" -msgstr "(Wird verwendet, um potentielle Kontakte zu finden, kann von Kontakten eingesehen werden)" - -#: mod/profiles.php:733 -msgid "Private Keywords:" -msgstr "Private Schlüsselwörter:" - -#: mod/profiles.php:733 -msgid "(Used for searching profiles, never shown to others)" -msgstr "(Wird für die Suche nach Profilen verwendet und niemals veröffentlicht)" - -#: mod/profiles.php:736 -msgid "Musical interests" -msgstr "Musikalische Interessen" - -#: mod/profiles.php:737 -msgid "Books, literature" -msgstr "Bücher, Literatur" - -#: mod/profiles.php:738 -msgid "Television" -msgstr "Fernsehen" - -#: mod/profiles.php:739 -msgid "Film/dance/culture/entertainment" -msgstr "Filme/Tänze/Kultur/Unterhaltung" - -#: mod/profiles.php:740 -msgid "Hobbies/Interests" -msgstr "Hobbies/Interessen" - -#: mod/profiles.php:741 -msgid "Love/romance" -msgstr "Liebe/Romantik" - -#: mod/profiles.php:742 -msgid "Work/employment" -msgstr "Arbeit/Anstellung" - -#: mod/profiles.php:743 -msgid "School/education" -msgstr "Schule/Ausbildung" - -#: mod/profiles.php:744 -msgid "Contact information and Social Networks" -msgstr "Kontaktinformationen und Soziale Netzwerke" - -#: mod/profiles.php:786 -msgid "Edit/Manage Profiles" -msgstr "Bearbeite/Verwalte Profile" - #: mod/credits.php:16 msgid "Credits" msgstr "Credits" @@ -6064,185 +5210,6 @@ msgstr "Was willst Du mit dem Empfänger machen:" msgid "Make this post private" msgstr "Diesen Beitrag privat machen" -#: mod/photos.php:100 mod/photos.php:1886 -msgid "Recent Photos" -msgstr "Neueste Fotos" - -#: mod/photos.php:103 mod/photos.php:1307 mod/photos.php:1888 -msgid "Upload New Photos" -msgstr "Neue Fotos hochladen" - -#: mod/photos.php:117 mod/settings.php:36 -msgid "everybody" -msgstr "jeder" - -#: mod/photos.php:181 -msgid "Contact information unavailable" -msgstr "Kontaktinformationen nicht verfügbar" - -#: mod/photos.php:202 -msgid "Album not found." -msgstr "Album nicht gefunden." - -#: mod/photos.php:232 mod/photos.php:244 mod/photos.php:1249 -msgid "Delete Album" -msgstr "Album löschen" - -#: mod/photos.php:242 -msgid "Do you really want to delete this photo album and all its photos?" -msgstr "Möchtest Du wirklich dieses Foto-Album und all seine Foto löschen?" - -#: mod/photos.php:322 mod/photos.php:333 mod/photos.php:1567 -msgid "Delete Photo" -msgstr "Foto löschen" - -#: mod/photos.php:331 -msgid "Do you really want to delete this photo?" -msgstr "Möchtest Du wirklich dieses Foto löschen?" - -#: mod/photos.php:706 -#, php-format -msgid "%1$s was tagged in %2$s by %3$s" -msgstr "%1$s wurde von %3$s in %2$s getaggt" - -#: mod/photos.php:706 -msgid "a photo" -msgstr "einem Foto" - -#: mod/photos.php:813 -msgid "Image file is empty." -msgstr "Bilddatei ist leer." - -#: mod/photos.php:973 -msgid "No photos selected" -msgstr "Keine Bilder ausgewählt" - -#: mod/photos.php:1134 -#, php-format -msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." -msgstr "Du verwendest %1$.2f Mbyte von %2$.2f Mbyte des Foto-Speichers." - -#: mod/photos.php:1169 -msgid "Upload Photos" -msgstr "Bilder hochladen" - -#: mod/photos.php:1173 mod/photos.php:1244 -msgid "New album name: " -msgstr "Name des neuen Albums: " - -#: mod/photos.php:1174 -msgid "or existing album name: " -msgstr "oder existierender Albumname: " - -#: mod/photos.php:1175 -msgid "Do not show a status post for this upload" -msgstr "Keine Status-Mitteilung für diesen Beitrag anzeigen" - -#: mod/photos.php:1186 mod/photos.php:1571 mod/settings.php:1250 -msgid "Show to Groups" -msgstr "Zeige den Gruppen" - -#: mod/photos.php:1187 mod/photos.php:1572 mod/settings.php:1251 -msgid "Show to Contacts" -msgstr "Zeige den Kontakten" - -#: mod/photos.php:1188 -msgid "Private Photo" -msgstr "Privates Foto" - -#: mod/photos.php:1189 -msgid "Public Photo" -msgstr "Öffentliches Foto" - -#: mod/photos.php:1257 -msgid "Edit Album" -msgstr "Album bearbeiten" - -#: mod/photos.php:1263 -msgid "Show Newest First" -msgstr "Zeige neueste zuerst" - -#: mod/photos.php:1265 -msgid "Show Oldest First" -msgstr "Zeige älteste zuerst" - -#: mod/photos.php:1293 mod/photos.php:1871 -msgid "View Photo" -msgstr "Foto betrachten" - -#: mod/photos.php:1340 -msgid "Permission denied. Access to this item may be restricted." -msgstr "Zugriff verweigert. Zugriff zu diesem Eintrag könnte eingeschränkt sein." - -#: mod/photos.php:1342 -msgid "Photo not available" -msgstr "Foto nicht verfügbar" - -#: mod/photos.php:1398 -msgid "View photo" -msgstr "Fotos ansehen" - -#: mod/photos.php:1398 -msgid "Edit photo" -msgstr "Foto bearbeiten" - -#: mod/photos.php:1399 -msgid "Use as profile photo" -msgstr "Als Profilbild verwenden" - -#: mod/photos.php:1424 -msgid "View Full Size" -msgstr "Betrachte Originalgröße" - -#: mod/photos.php:1510 -msgid "Tags: " -msgstr "Tags: " - -#: mod/photos.php:1513 -msgid "[Remove any tag]" -msgstr "[Tag entfernen]" - -#: mod/photos.php:1553 -msgid "New album name" -msgstr "Name des neuen Albums" - -#: mod/photos.php:1554 -msgid "Caption" -msgstr "Bildunterschrift" - -#: mod/photos.php:1555 -msgid "Add a Tag" -msgstr "Tag hinzufügen" - -#: mod/photos.php:1555 -msgid "" -"Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" -msgstr "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" - -#: mod/photos.php:1556 -msgid "Do not rotate" -msgstr "Nicht rotieren" - -#: mod/photos.php:1557 -msgid "Rotate CW (right)" -msgstr "Drehen US (rechts)" - -#: mod/photos.php:1558 -msgid "Rotate CCW (left)" -msgstr "Drehen EUS (links)" - -#: mod/photos.php:1573 -msgid "Private photo" -msgstr "Privates Foto" - -#: mod/photos.php:1574 -msgid "Public photo" -msgstr "Öffentliches Foto" - -#: mod/photos.php:1800 -msgid "Map" -msgstr "Karte" - #: mod/install.php:139 msgid "Friendica Communications Server - Setup" msgstr "Friendica-Server für soziale Netzwerke – Setup" @@ -6601,328 +5568,7 @@ msgstr "Beitrag nicht verfügbar." msgid "Item was not found." msgstr "Beitrag konnte nicht gefunden werden." -#: mod/contacts.php:128 -#, php-format -msgid "%d contact edited." -msgid_plural "%d contacts edited." -msgstr[0] "%d Kontakt bearbeitet." -msgstr[1] "%d Kontakte bearbeitet." - -#: mod/contacts.php:159 mod/contacts.php:368 -msgid "Could not access contact record." -msgstr "Konnte nicht auf die Kontaktdaten zugreifen." - -#: mod/contacts.php:173 -msgid "Could not locate selected profile." -msgstr "Konnte das ausgewählte Profil nicht finden." - -#: mod/contacts.php:206 -msgid "Contact updated." -msgstr "Kontakt aktualisiert." - -#: mod/contacts.php:208 mod/dfrn_request.php:578 -msgid "Failed to update contact record." -msgstr "Aktualisierung der Kontaktdaten fehlgeschlagen." - -#: mod/contacts.php:389 -msgid "Contact has been blocked" -msgstr "Kontakt wurde blockiert" - -#: mod/contacts.php:389 -msgid "Contact has been unblocked" -msgstr "Kontakt wurde wieder freigegeben" - -#: mod/contacts.php:400 -msgid "Contact has been ignored" -msgstr "Kontakt wurde ignoriert" - -#: mod/contacts.php:400 -msgid "Contact has been unignored" -msgstr "Kontakt wird nicht mehr ignoriert" - -#: mod/contacts.php:412 -msgid "Contact has been archived" -msgstr "Kontakt wurde archiviert" - -#: mod/contacts.php:412 -msgid "Contact has been unarchived" -msgstr "Kontakt wurde aus dem Archiv geholt" - -#: mod/contacts.php:439 mod/contacts.php:794 -msgid "Do you really want to delete this contact?" -msgstr "Möchtest Du wirklich diesen Kontakt löschen?" - -#: mod/contacts.php:456 -msgid "Contact has been removed." -msgstr "Kontakt wurde entfernt." - -#: mod/contacts.php:497 -#, php-format -msgid "You are mutual friends with %s" -msgstr "Du hast mit %s eine beidseitige Freundschaft" - -#: mod/contacts.php:501 -#, php-format -msgid "You are sharing with %s" -msgstr "Du teilst mit %s" - -#: mod/contacts.php:506 -#, php-format -msgid "%s is sharing with you" -msgstr "%s teilt mit Dir" - -#: mod/contacts.php:526 -msgid "Private communications are not available for this contact." -msgstr "Private Kommunikation ist für diesen Kontakt nicht verfügbar." - -#: mod/contacts.php:533 -msgid "(Update was successful)" -msgstr "(Aktualisierung war erfolgreich)" - -#: mod/contacts.php:533 -msgid "(Update was not successful)" -msgstr "(Aktualisierung war nicht erfolgreich)" - -#: mod/contacts.php:535 mod/contacts.php:973 -msgid "Suggest friends" -msgstr "Kontakte vorschlagen" - -#: mod/contacts.php:539 -#, php-format -msgid "Network type: %s" -msgstr "Netzwerktyp: %s" - -#: mod/contacts.php:552 -msgid "Communications lost with this contact!" -msgstr "Verbindungen mit diesem Kontakt verloren!" - -#: mod/contacts.php:555 -msgid "Fetch further information for feeds" -msgstr "Weitere Informationen zu Feeds holen" - -#: mod/contacts.php:556 -msgid "Fetch information" -msgstr "Beziehe Information" - -#: mod/contacts.php:556 -msgid "Fetch information and keywords" -msgstr "Beziehe Information und Schlüsselworte" - -#: mod/contacts.php:576 -msgid "Profile Visibility" -msgstr "Profil-Sichtbarkeit" - -#: mod/contacts.php:577 -#, 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:578 -msgid "Contact Information / Notes" -msgstr "Kontakt Informationen / Notizen" - -#: mod/contacts.php:579 -msgid "Edit contact notes" -msgstr "Notizen zum Kontakt bearbeiten" - -#: mod/contacts.php:585 -msgid "Block/Unblock contact" -msgstr "Kontakt blockieren/freischalten" - -#: mod/contacts.php:586 -msgid "Ignore contact" -msgstr "Ignoriere den Kontakt" - -#: mod/contacts.php:587 -msgid "Repair URL settings" -msgstr "URL Einstellungen reparieren" - -#: mod/contacts.php:588 -msgid "View conversations" -msgstr "Unterhaltungen anzeigen" - -#: mod/contacts.php:594 -msgid "Last update:" -msgstr "Letzte Aktualisierung: " - -#: mod/contacts.php:596 -msgid "Update public posts" -msgstr "Öffentliche Beiträge aktualisieren" - -#: mod/contacts.php:598 mod/contacts.php:983 -msgid "Update now" -msgstr "Jetzt aktualisieren" - -#: mod/contacts.php:604 mod/contacts.php:799 mod/contacts.php:1000 -msgid "Unignore" -msgstr "Ignorieren aufheben" - -#: mod/contacts.php:607 -msgid "Currently blocked" -msgstr "Derzeit geblockt" - -#: mod/contacts.php:608 -msgid "Currently ignored" -msgstr "Derzeit ignoriert" - -#: mod/contacts.php:609 -msgid "Currently archived" -msgstr "Momentan archiviert" - -#: mod/contacts.php:610 -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:611 -msgid "Notification for new posts" -msgstr "Benachrichtigung bei neuen Beiträgen" - -#: mod/contacts.php:611 -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:614 -msgid "Blacklisted keywords" -msgstr "Blacklistete Schlüsselworte " - -#: mod/contacts.php:614 -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:629 -msgid "Actions" -msgstr "Aktionen" - -#: mod/contacts.php:632 -msgid "Contact Settings" -msgstr "Kontakteinstellungen" - -#: mod/contacts.php:677 -msgid "Suggestions" -msgstr "Kontaktvorschläge" - -#: mod/contacts.php:680 -msgid "Suggest potential friends" -msgstr "Kontakte vorschlagen" - -#: mod/contacts.php:685 mod/group.php:192 -msgid "All Contacts" -msgstr "Alle Kontakte" - -#: mod/contacts.php:688 -msgid "Show all contacts" -msgstr "Alle Kontakte anzeigen" - -#: mod/contacts.php:693 -msgid "Unblocked" -msgstr "Ungeblockt" - -#: mod/contacts.php:696 -msgid "Only show unblocked contacts" -msgstr "Nur nicht-blockierte Kontakte anzeigen" - -#: mod/contacts.php:702 -msgid "Blocked" -msgstr "Geblockt" - -#: mod/contacts.php:705 -msgid "Only show blocked contacts" -msgstr "Nur blockierte Kontakte anzeigen" - -#: mod/contacts.php:711 -msgid "Ignored" -msgstr "Ignoriert" - -#: mod/contacts.php:714 -msgid "Only show ignored contacts" -msgstr "Nur ignorierte Kontakte anzeigen" - -#: mod/contacts.php:720 -msgid "Archived" -msgstr "Archiviert" - -#: mod/contacts.php:723 -msgid "Only show archived contacts" -msgstr "Nur archivierte Kontakte anzeigen" - -#: mod/contacts.php:729 -msgid "Hidden" -msgstr "Verborgen" - -#: mod/contacts.php:732 -msgid "Only show hidden contacts" -msgstr "Nur verborgene Kontakte anzeigen" - -#: mod/contacts.php:789 -msgid "Search your contacts" -msgstr "Suche in deinen Kontakten" - -#: mod/contacts.php:797 mod/settings.php:158 mod/settings.php:689 -msgid "Update" -msgstr "Aktualisierungen" - -#: mod/contacts.php:800 mod/contacts.php:1008 -msgid "Archive" -msgstr "Archivieren" - -#: mod/contacts.php:800 mod/contacts.php:1008 -msgid "Unarchive" -msgstr "Aus Archiv zurückholen" - -#: mod/contacts.php:803 -msgid "Batch Actions" -msgstr "" - -#: mod/contacts.php:849 -msgid "View all contacts" -msgstr "Alle Kontakte anzeigen" - -#: mod/contacts.php:856 mod/common.php:134 -msgid "Common Friends" -msgstr "Gemeinsame Kontakte" - -#: mod/contacts.php:859 -msgid "View all common friends" -msgstr "Alle Kontakte anzeigen" - -#: mod/contacts.php:866 -msgid "Advanced Contact Settings" -msgstr "Fortgeschrittene Kontakteinstellungen" - -#: mod/contacts.php:911 -msgid "Mutual Friendship" -msgstr "Beidseitige Freundschaft" - -#: mod/contacts.php:915 -msgid "is a fan of yours" -msgstr "ist ein Fan von dir" - -#: mod/contacts.php:919 -msgid "you are a fan of" -msgstr "Du bist Fan von" - -#: mod/contacts.php:994 -msgid "Toggle Blocked status" -msgstr "Geblockt-Status ein-/ausschalten" - -#: mod/contacts.php:1002 -msgid "Toggle Ignored status" -msgstr "Ignoriert-Status ein-/ausschalten" - -#: mod/contacts.php:1010 -msgid "Toggle Archive status" -msgstr "Archiviert-Status ein-/ausschalten" - -#: mod/contacts.php:1018 -msgid "Delete contact" -msgstr "Lösche den Kontakt" - -#: mod/follow.php:19 mod/dfrn_request.php:873 +#: mod/follow.php:19 mod/dfrn_request.php:874 msgid "Submit Request" msgstr "Anfrage abschicken" @@ -6942,27 +5588,45 @@ msgstr "OStatus Unterstützung ist nicht aktiviert. Der Kontakt kann nicht zugef 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:109 mod/dfrn_request.php:859 +#: mod/follow.php:109 mod/dfrn_request.php:860 msgid "Please answer the following:" msgstr "Bitte beantworte folgendes:" -#: mod/follow.php:110 mod/dfrn_request.php:860 +#: mod/follow.php:110 mod/dfrn_request.php:861 #, php-format msgid "Does %s know you?" msgstr "Kennt %s Dich?" -#: mod/follow.php:111 mod/dfrn_request.php:864 +#: mod/follow.php:110 mod/register.php:239 mod/settings.php:1113 +#: mod/settings.php:1119 mod/settings.php:1127 mod/settings.php:1131 +#: mod/settings.php:1136 mod/settings.php:1142 mod/settings.php:1148 +#: mod/settings.php:1154 mod/settings.php:1180 mod/settings.php:1181 +#: mod/settings.php:1182 mod/settings.php:1183 mod/settings.php:1184 +#: mod/api.php:106 mod/dfrn_request.php:861 mod/profiles.php:642 +#: mod/profiles.php:646 mod/profiles.php:671 +msgid "No" +msgstr "Nein" + +#: mod/follow.php:111 mod/dfrn_request.php:865 msgid "Add a personal note:" msgstr "Eine persönliche Notiz beifügen:" -#: mod/follow.php:117 mod/dfrn_request.php:870 +#: mod/follow.php:117 mod/dfrn_request.php:871 msgid "Your Identity Address:" msgstr "Adresse Deines Profils:" +#: mod/follow.php:126 mod/contacts.php:624 mod/notifications.php:219 +msgid "Profile URL" +msgstr "Profil URL" + #: mod/follow.php:180 msgid "Contact added" msgstr "Kontakt hinzugefügt" +#: mod/apps.php:7 index.php:240 +msgid "You must be logged in to use addons. " +msgstr "Sie müssen angemeldet sein um Addons benutzen zu können." + #: mod/apps.php:11 msgid "Applications" msgstr "Anwendungen" @@ -6997,6 +5661,10 @@ msgstr "Eintrag wurde entfernt." msgid "No contacts in common." msgstr "Keine gemeinsamen Kontakte." +#: mod/common.php:134 mod/contacts.php:861 +msgid "Common Friends" +msgstr "Gemeinsame Kontakte" + #: mod/newmember.php:6 msgid "Welcome to Friendica" msgstr "Willkommen bei Friendica" @@ -7047,6 +5715,10 @@ msgid "" "potential friends know exactly how to find you." msgstr "Überprüfe die restlichen Einstellungen, insbesondere die Einstellungen zur Privatsphäre. Wenn Du Dein Profil nicht veröffentlichst, ist das als wenn Du Deine Telefonnummer nicht ins Telefonbuch einträgst. Im Allgemeinen solltest Du es veröffentlichen - außer all Deine Kontakte und potentiellen Kontakte wissen genau, wie sie Dich finden können." +#: mod/newmember.php:36 mod/profile_photo.php:250 mod/profiles.php:701 +msgid "Upload Profile Photo" +msgstr "Profilbild hochladen" + #: mod/newmember.php:36 msgid "" "Upload a profile photo if you have not done so already. Studies have shown " @@ -7204,6 +5876,19 @@ msgstr[1] "Warnung: Diese Gruppe beinhaltet %s Personen aus unsicheren Netzwerke 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:468 mod/content.php:119 +msgid "No such group" +msgstr "Es gibt keine solche Gruppe" + +#: mod/network.php:495 mod/group.php:193 mod/content.php:130 +msgid "Group is empty" +msgstr "Gruppe ist leer" + +#: mod/network.php:499 mod/content.php:135 +#, php-format +msgid "Group: %s" +msgstr "Gruppe: %s" + #: mod/network.php:527 msgid "Private messages to this person are at risk of public disclosure." msgstr "Private Nachrichten an diese Person könnten an die Öffentlichkeit gelangen." @@ -7228,6 +5913,10 @@ msgstr "Neueste Beiträge" msgid "Sort by Post Date" msgstr "Nach Beitragsdatum sortieren" +#: mod/network.php:844 mod/profiles.php:697 mod/notifications.php:539 +msgid "Personal" +msgstr "Persönlich" + #: mod/network.php:847 msgid "Posts that mention or involve you" msgstr "Beiträge, in denen es um Dich geht" @@ -7333,151 +6022,9 @@ msgstr "Gruppeneditor" msgid "Members" msgstr "Mitglieder" -#: mod/dfrn_request.php:99 -msgid "This introduction has already been accepted." -msgstr "Diese Kontaktanfrage wurde bereits akzeptiert." - -#: mod/dfrn_request.php:122 mod/dfrn_request.php:517 -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:127 mod/dfrn_request.php:522 -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:129 mod/dfrn_request.php:524 -msgid "Warning: profile location has no profile photo." -msgstr "Warnung: Es gibt kein Profilbild bei der angegebenen Profiladresse." - -#: mod/dfrn_request.php:132 mod/dfrn_request.php:527 -#, 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:177 -msgid "Introduction complete." -msgstr "Kontaktanfrage abgeschlossen." - -#: mod/dfrn_request.php:219 -msgid "Unrecoverable protocol error." -msgstr "Nicht behebbarer Protokollfehler." - -#: mod/dfrn_request.php:247 -msgid "Profile unavailable." -msgstr "Profil nicht verfügbar." - -#: mod/dfrn_request.php:272 -#, php-format -msgid "%s has received too many connection requests today." -msgstr "%s hat heute zu viele Kontaktanfragen erhalten." - -#: mod/dfrn_request.php:273 -msgid "Spam protection measures have been invoked." -msgstr "Maßnahmen zum Spamschutz wurden ergriffen." - -#: mod/dfrn_request.php:274 -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:336 -msgid "Invalid locator" -msgstr "Ungültiger Locator" - -#: mod/dfrn_request.php:345 -msgid "Invalid email address." -msgstr "Ungültige E-Mail-Adresse." - -#: mod/dfrn_request.php:372 -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:475 -msgid "You have already introduced yourself here." -msgstr "Du hast Dich hier bereits vorgestellt." - -#: mod/dfrn_request.php:479 -#, php-format -msgid "Apparently you are already friends with %s." -msgstr "Es scheint so, als ob Du bereits mit %s in Kontakt stehst." - -#: mod/dfrn_request.php:500 -msgid "Invalid profile URL." -msgstr "Ungültige Profil-URL." - -#: mod/dfrn_request.php:599 -msgid "Your introduction has been sent." -msgstr "Deine Kontaktanfrage wurde gesendet." - -#: mod/dfrn_request.php:639 -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:662 -msgid "Please login to confirm introduction." -msgstr "Bitte melde Dich an, um die Kontaktanfrage zu bestätigen." - -#: mod/dfrn_request.php:672 -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:686 mod/dfrn_request.php:703 -msgid "Confirm" -msgstr "Bestätigen" - -#: mod/dfrn_request.php:698 -msgid "Hide this contact" -msgstr "Verberge diesen Kontakt" - -#: mod/dfrn_request.php:701 -#, php-format -msgid "Welcome home %s." -msgstr "Willkommen zurück %s." - -#: mod/dfrn_request.php:702 -#, php-format -msgid "Please confirm your introduction/connection request to %s." -msgstr "Bitte bestätige Deine Kontaktanfrage bei %s." - -#: mod/dfrn_request.php:831 -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:852 -#, php-format -msgid "" -"If you are not yet a member of the free social web, follow this link to find a public Friendica site and " -"join us today." -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:857 -msgid "Friend/Connection Request" -msgstr "Kontaktanfrage" - -#: mod/dfrn_request.php:858 -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:867 -msgid "StatusNet/Federated Social Web" -msgstr "StatusNet/Federated Social Web" - -#: mod/dfrn_request.php:869 -#, php-format -msgid "" -" - please do not use this form. Instead, enter %s into your Diaspora search" -" bar." -msgstr " - bitte verwende dieses Formular nicht. Stattdessen suche nach %s in Deiner Diaspora Suchleiste." +#: mod/group.php:192 mod/contacts.php:690 +msgid "All Contacts" +msgstr "Alle Kontakte" #: mod/profile_photo.php:44 msgid "Image uploaded but image cropping failed." @@ -7626,6 +6173,10 @@ msgstr "Spitznamen wählen: " msgid "Import your profile to this friendica instance" msgstr "Importiere Dein Profil auf diese Friendica Instanz" +#: mod/settings.php:36 mod/photos.php:118 +msgid "everybody" +msgstr "jeder" + #: mod/settings.php:60 msgid "Display" msgstr "Anzeige" @@ -7646,6 +6197,10 @@ msgstr "Konto löschen" msgid "Missing some important data!" msgstr "Wichtige Daten fehlen!" +#: mod/settings.php:158 mod/settings.php:689 mod/contacts.php:802 +msgid "Update" +msgstr "Aktualisierungen" + #: mod/settings.php:269 msgid "Failed to connect with email account using the settings provided." msgstr "Verbindung zum E-Mail-Konto mit den angegebenen Einstellungen nicht möglich." @@ -7738,6 +6293,11 @@ msgstr "Du kannst dieses Programm nicht bearbeiten." msgid "Connected Apps" msgstr "Verbundene Programme" +#: mod/settings.php:725 mod/content.php:746 object/Item.php:122 +#: object/Item.php:124 +msgid "Edit" +msgstr "Bearbeiten" + #: mod/settings.php:727 msgid "Client key starts with" msgstr "Anwenderschlüssel beginnt mit" @@ -8171,6 +6731,14 @@ msgstr "Standard-Zugriffsrechte für Beiträge" msgid "(click to open/close)" msgstr "(klicke zum öffnen/schließen)" +#: mod/settings.php:1250 mod/photos.php:1187 mod/photos.php:1572 +msgid "Show to Groups" +msgstr "Zeige den Gruppen" + +#: mod/settings.php:1251 mod/photos.php:1188 mod/photos.php:1573 +msgid "Show to Contacts" +msgstr "Zeige den Kontakten" + #: mod/settings.php:1252 msgid "Default Private Post" msgstr "Privater Standardbeitrag" @@ -8458,6 +7026,10 @@ msgstr "Erfolg" msgid "failed" msgstr "Fehlgeschlagen" +#: mod/ostatus_subscribe.php:69 mod/content.php:792 object/Item.php:245 +msgid "ignored" +msgstr "Ignoriert" + #: mod/dfrn_poll.php:104 mod/dfrn_poll.php:537 #, php-format msgid "%1$s welcomes %2$s" @@ -8549,6 +7121,1384 @@ msgstr "Zwischen verschiedenen Identitäten oder Gemeinschafts-/Gruppenseiten we msgid "Select an identity to manage: " msgstr "Wähle eine Identität zum Verwalten aus: " +#: mod/contacts.php:128 +#, php-format +msgid "%d contact edited." +msgid_plural "%d contacts edited." +msgstr[0] "%d Kontakt bearbeitet." +msgstr[1] "%d Kontakte bearbeitet." + +#: mod/contacts.php:159 mod/contacts.php:368 +msgid "Could not access contact record." +msgstr "Konnte nicht auf die Kontaktdaten zugreifen." + +#: mod/contacts.php:173 +msgid "Could not locate selected profile." +msgstr "Konnte das ausgewählte Profil nicht finden." + +#: mod/contacts.php:206 +msgid "Contact updated." +msgstr "Kontakt aktualisiert." + +#: mod/contacts.php:208 mod/dfrn_request.php:579 +msgid "Failed to update contact record." +msgstr "Aktualisierung der Kontaktdaten fehlgeschlagen." + +#: mod/contacts.php:389 +msgid "Contact has been blocked" +msgstr "Kontakt wurde blockiert" + +#: mod/contacts.php:389 +msgid "Contact has been unblocked" +msgstr "Kontakt wurde wieder freigegeben" + +#: mod/contacts.php:400 +msgid "Contact has been ignored" +msgstr "Kontakt wurde ignoriert" + +#: mod/contacts.php:400 +msgid "Contact has been unignored" +msgstr "Kontakt wird nicht mehr ignoriert" + +#: mod/contacts.php:412 +msgid "Contact has been archived" +msgstr "Kontakt wurde archiviert" + +#: mod/contacts.php:412 +msgid "Contact has been unarchived" +msgstr "Kontakt wurde aus dem Archiv geholt" + +#: mod/contacts.php:437 +msgid "Drop contact" +msgstr "Kontakt löschen" + +#: mod/contacts.php:440 mod/contacts.php:799 +msgid "Do you really want to delete this contact?" +msgstr "Möchtest Du wirklich diesen Kontakt löschen?" + +#: mod/contacts.php:457 +msgid "Contact has been removed." +msgstr "Kontakt wurde entfernt." + +#: mod/contacts.php:498 +#, php-format +msgid "You are mutual friends with %s" +msgstr "Du hast mit %s eine beidseitige Freundschaft" + +#: mod/contacts.php:502 +#, php-format +msgid "You are sharing with %s" +msgstr "Du teilst mit %s" + +#: mod/contacts.php:507 +#, php-format +msgid "%s is sharing with you" +msgstr "%s teilt mit Dir" + +#: mod/contacts.php:527 +msgid "Private communications are not available for this contact." +msgstr "Private Kommunikation ist für diesen Kontakt nicht verfügbar." + +#: mod/contacts.php:534 +msgid "(Update was successful)" +msgstr "(Aktualisierung war erfolgreich)" + +#: mod/contacts.php:534 +msgid "(Update was not successful)" +msgstr "(Aktualisierung war nicht erfolgreich)" + +#: mod/contacts.php:536 mod/contacts.php:978 +msgid "Suggest friends" +msgstr "Kontakte vorschlagen" + +#: mod/contacts.php:540 +#, php-format +msgid "Network type: %s" +msgstr "Netzwerktyp: %s" + +#: mod/contacts.php:553 +msgid "Communications lost with this contact!" +msgstr "Verbindungen mit diesem Kontakt verloren!" + +#: mod/contacts.php:556 +msgid "Fetch further information for feeds" +msgstr "Weitere Informationen zu Feeds holen" + +#: mod/contacts.php:557 +msgid "Fetch information" +msgstr "Beziehe Information" + +#: mod/contacts.php:557 +msgid "Fetch information and keywords" +msgstr "Beziehe Information und Schlüsselworte" + +#: mod/contacts.php:575 +msgid "Contact" +msgstr "Kontakt: " + +#: mod/contacts.php:578 +msgid "Profile Visibility" +msgstr "Profil-Sichtbarkeit" + +#: mod/contacts.php:579 +#, php-format +msgid "" +"Please choose the profile you would like to display to %s when viewing your " +"profile securely." +msgstr "Bitte wähle eines Deiner Profile das angezeigt werden soll, wenn %s Dein Profil aufruft." + +#: mod/contacts.php:580 +msgid "Contact Information / Notes" +msgstr "Kontakt Informationen / Notizen" + +#: mod/contacts.php:581 +msgid "Edit contact notes" +msgstr "Notizen zum Kontakt bearbeiten" + +#: mod/contacts.php:587 +msgid "Block/Unblock contact" +msgstr "Kontakt blockieren/freischalten" + +#: mod/contacts.php:588 +msgid "Ignore contact" +msgstr "Ignoriere den Kontakt" + +#: mod/contacts.php:589 +msgid "Repair URL settings" +msgstr "URL Einstellungen reparieren" + +#: mod/contacts.php:590 +msgid "View conversations" +msgstr "Unterhaltungen anzeigen" + +#: mod/contacts.php:596 +msgid "Last update:" +msgstr "Letzte Aktualisierung: " + +#: mod/contacts.php:598 +msgid "Update public posts" +msgstr "Öffentliche Beiträge aktualisieren" + +#: mod/contacts.php:600 mod/contacts.php:988 +msgid "Update now" +msgstr "Jetzt aktualisieren" + +#: mod/contacts.php:606 mod/contacts.php:804 mod/contacts.php:1005 +msgid "Unignore" +msgstr "Ignorieren aufheben" + +#: mod/contacts.php:606 mod/contacts.php:804 mod/contacts.php:1005 +#: mod/notifications.php:54 mod/notifications.php:142 +#: mod/notifications.php:227 +msgid "Ignore" +msgstr "Ignorieren" + +#: mod/contacts.php:610 +msgid "Currently blocked" +msgstr "Derzeit geblockt" + +#: mod/contacts.php:611 +msgid "Currently ignored" +msgstr "Derzeit ignoriert" + +#: mod/contacts.php:612 +msgid "Currently archived" +msgstr "Momentan archiviert" + +#: mod/contacts.php:613 mod/notifications.php:135 mod/notifications.php:215 +msgid "Hide this contact from others" +msgstr "Verbirg diesen Kontakt vor andere" + +#: mod/contacts.php:613 +msgid "" +"Replies/likes to your public posts may still be visible" +msgstr "Antworten/Likes auf deine öffentlichen Beiträge könnten weiterhin sichtbar sein" + +#: mod/contacts.php:614 +msgid "Notification for new posts" +msgstr "Benachrichtigung bei neuen Beiträgen" + +#: mod/contacts.php:614 +msgid "Send a notification of every new post of this contact" +msgstr "Sende eine Benachrichtigung, wann immer dieser Kontakt einen neuen Beitrag schreibt." + +#: mod/contacts.php:617 +msgid "Blacklisted keywords" +msgstr "Blacklistete Schlüsselworte " + +#: mod/contacts.php:617 +msgid "" +"Comma separated list of keywords that should not be converted to hashtags, " +"when \"Fetch information and keywords\" is selected" +msgstr "Komma-Separierte Liste mit Schlüsselworten, die nicht in Hashtags konvertiert werden, wenn \"Beziehe Information und Schlüsselworte\" aktiviert wurde" + +#: mod/contacts.php:633 +msgid "Actions" +msgstr "Aktionen" + +#: mod/contacts.php:636 +msgid "Contact Settings" +msgstr "Kontakteinstellungen" + +#: mod/contacts.php:682 +msgid "Suggestions" +msgstr "Kontaktvorschläge" + +#: mod/contacts.php:685 +msgid "Suggest potential friends" +msgstr "Kontakte vorschlagen" + +#: mod/contacts.php:693 +msgid "Show all contacts" +msgstr "Alle Kontakte anzeigen" + +#: mod/contacts.php:698 +msgid "Unblocked" +msgstr "Ungeblockt" + +#: mod/contacts.php:701 +msgid "Only show unblocked contacts" +msgstr "Nur nicht-blockierte Kontakte anzeigen" + +#: mod/contacts.php:707 +msgid "Blocked" +msgstr "Geblockt" + +#: mod/contacts.php:710 +msgid "Only show blocked contacts" +msgstr "Nur blockierte Kontakte anzeigen" + +#: mod/contacts.php:716 +msgid "Ignored" +msgstr "Ignoriert" + +#: mod/contacts.php:719 +msgid "Only show ignored contacts" +msgstr "Nur ignorierte Kontakte anzeigen" + +#: mod/contacts.php:725 +msgid "Archived" +msgstr "Archiviert" + +#: mod/contacts.php:728 +msgid "Only show archived contacts" +msgstr "Nur archivierte Kontakte anzeigen" + +#: mod/contacts.php:734 +msgid "Hidden" +msgstr "Verborgen" + +#: mod/contacts.php:737 +msgid "Only show hidden contacts" +msgstr "Nur verborgene Kontakte anzeigen" + +#: mod/contacts.php:794 +msgid "Search your contacts" +msgstr "Suche in deinen Kontakten" + +#: mod/contacts.php:805 mod/contacts.php:1013 +msgid "Archive" +msgstr "Archivieren" + +#: mod/contacts.php:805 mod/contacts.php:1013 +msgid "Unarchive" +msgstr "Aus Archiv zurückholen" + +#: mod/contacts.php:808 +msgid "Batch Actions" +msgstr "Stapelverarbeitung" + +#: mod/contacts.php:854 +msgid "View all contacts" +msgstr "Alle Kontakte anzeigen" + +#: mod/contacts.php:864 +msgid "View all common friends" +msgstr "Alle Kontakte anzeigen" + +#: mod/contacts.php:871 +msgid "Advanced Contact Settings" +msgstr "Fortgeschrittene Kontakteinstellungen" + +#: mod/contacts.php:916 +msgid "Mutual Friendship" +msgstr "Beidseitige Freundschaft" + +#: mod/contacts.php:920 +msgid "is a fan of yours" +msgstr "ist ein Fan von dir" + +#: mod/contacts.php:924 +msgid "you are a fan of" +msgstr "Du bist Fan von" + +#: mod/contacts.php:999 +msgid "Toggle Blocked status" +msgstr "Geblockt-Status ein-/ausschalten" + +#: mod/contacts.php:1007 +msgid "Toggle Ignored status" +msgstr "Ignoriert-Status ein-/ausschalten" + +#: mod/contacts.php:1015 +msgid "Toggle Archive status" +msgstr "Archiviert-Status ein-/ausschalten" + +#: mod/contacts.php:1023 +msgid "Delete contact" +msgstr "Lösche den Kontakt" + +#: mod/crepair.php:87 +msgid "Contact settings applied." +msgstr "Einstellungen zum Kontakt angewandt." + +#: mod/crepair.php:89 +msgid "Contact update failed." +msgstr "Konnte den Kontakt nicht aktualisieren." + +#: mod/crepair.php:120 +msgid "" +"WARNING: This is highly advanced and if you enter incorrect" +" information your communications with this contact may stop working." +msgstr "ACHTUNG: Das sind Experten-Einstellungen! Wenn Du etwas Falsches eingibst, funktioniert die Kommunikation mit diesem Kontakt evtl. nicht mehr." + +#: mod/crepair.php:121 +msgid "" +"Please use your browser 'Back' button now if you are " +"uncertain what to do on this page." +msgstr "Bitte nutze den Zurück-Button Deines Browsers jetzt, wenn Du Dir unsicher bist, was Du tun willst." + +#: mod/crepair.php:134 mod/crepair.php:136 +msgid "No mirroring" +msgstr "Kein Spiegeln" + +#: mod/crepair.php:134 +msgid "Mirror as forwarded posting" +msgstr "Spiegeln als weitergeleitete Beiträge" + +#: mod/crepair.php:134 mod/crepair.php:136 +msgid "Mirror as my own posting" +msgstr "Spiegeln als meine eigenen Beiträge" + +#: mod/crepair.php:150 +msgid "Return to contact editor" +msgstr "Zurück zum Kontakteditor" + +#: mod/crepair.php:152 +msgid "Refetch contact data" +msgstr "Kontaktdaten neu laden" + +#: mod/crepair.php:156 +msgid "Remote Self" +msgstr "Entfernte Konten" + +#: mod/crepair.php:159 +msgid "Mirror postings from this contact" +msgstr "Spiegle Beiträge dieses Kontakts" + +#: mod/crepair.php:161 +msgid "" +"Mark this contact as remote_self, this will cause friendica to repost new " +"entries from this contact." +msgstr "Markiere diesen Kontakt als remote_self (entferntes Konto), dies veranlasst Friendica alle Top-Level Beiträge dieses Kontakts an all Deine Kontakte zu senden." + +#: mod/crepair.php:166 +msgid "Account Nickname" +msgstr "Konto-Spitzname" + +#: mod/crepair.php:167 +msgid "@Tagname - overrides Name/Nickname" +msgstr "@Tagname - überschreibt Name/Spitzname" + +#: mod/crepair.php:168 +msgid "Account URL" +msgstr "Konto-URL" + +#: mod/crepair.php:169 +msgid "Friend Request URL" +msgstr "URL für Kontaktschaftsanfragen" + +#: mod/crepair.php:170 +msgid "Friend Confirm URL" +msgstr "URL für Bestätigungen von Kontaktanfragen" + +#: mod/crepair.php:171 +msgid "Notification Endpoint URL" +msgstr "URL-Endpunkt für Benachrichtigungen" + +#: mod/crepair.php:172 +msgid "Poll/Feed URL" +msgstr "Pull/Feed-URL" + +#: mod/crepair.php:173 +msgid "New photo from this URL" +msgstr "Neues Foto von dieser URL" + +#: mod/dfrn_confirm.php:66 mod/profiles.php:19 mod/profiles.php:134 +#: mod/profiles.php:180 mod/profiles.php:611 +msgid "Profile not found." +msgstr "Profil nicht gefunden." + +#: mod/dfrn_confirm.php:123 +msgid "" +"This may occasionally happen if contact was requested by both persons and it" +" has already been approved." +msgstr "Das kann passieren, wenn sich zwei Kontakte gegenseitig eingeladen haben und bereits einer angenommen wurde." + +#: mod/dfrn_confirm.php:242 +msgid "Response from remote site was not understood." +msgstr "Antwort der Gegenstelle unverständlich." + +#: mod/dfrn_confirm.php:251 mod/dfrn_confirm.php:256 +msgid "Unexpected response from remote site: " +msgstr "Unerwartete Antwort der Gegenstelle: " + +#: mod/dfrn_confirm.php:265 +msgid "Confirmation completed successfully." +msgstr "Bestätigung erfolgreich abgeschlossen." + +#: mod/dfrn_confirm.php:267 mod/dfrn_confirm.php:281 mod/dfrn_confirm.php:288 +msgid "Remote site reported: " +msgstr "Gegenstelle meldet: " + +#: mod/dfrn_confirm.php:279 +msgid "Temporary failure. Please wait and try again." +msgstr "Zeitweiser Fehler. Bitte warte einige Momente und versuche es dann noch einmal." + +#: mod/dfrn_confirm.php:286 +msgid "Introduction failed or was revoked." +msgstr "Kontaktanfrage schlug fehl oder wurde zurückgezogen." + +#: mod/dfrn_confirm.php:415 +msgid "Unable to set contact photo." +msgstr "Konnte das Bild des Kontakts nicht speichern." + +#: mod/dfrn_confirm.php:553 +#, php-format +msgid "No user record found for '%s' " +msgstr "Für '%s' wurde kein Nutzer gefunden" + +#: mod/dfrn_confirm.php:563 +msgid "Our site encryption key is apparently messed up." +msgstr "Der Verschlüsselungsschlüssel unserer Seite ist anscheinend nicht in Ordnung." + +#: mod/dfrn_confirm.php:574 +msgid "Empty site URL was provided or URL could not be decrypted by us." +msgstr "Leere URL für die Seite erhalten oder die URL konnte nicht entschlüsselt werden." + +#: mod/dfrn_confirm.php:595 +msgid "Contact record was not found for you on our site." +msgstr "Für diesen Kontakt wurde auf unserer Seite kein Eintrag gefunden." + +#: mod/dfrn_confirm.php:609 +#, php-format +msgid "Site public key not available in contact record for URL %s." +msgstr "Die Kontaktdaten für URL %s enthalten keinen Public Key für den Server." + +#: mod/dfrn_confirm.php:629 +msgid "" +"The ID provided by your system is a duplicate on our system. It should work " +"if you try again." +msgstr "Die ID, die uns Dein System angeboten hat, ist hier bereits vergeben. Bitte versuche es noch einmal." + +#: mod/dfrn_confirm.php:640 +msgid "Unable to set your contact credentials on our system." +msgstr "Deine Kontaktreferenzen konnten nicht in unserem System gespeichert werden." + +#: mod/dfrn_confirm.php:699 +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:771 +#, php-format +msgid "%1$s has joined %2$s" +msgstr "%1$s ist %2$s beigetreten" + +#: mod/dfrn_request.php:100 +msgid "This introduction has already been accepted." +msgstr "Diese Kontaktanfrage wurde bereits akzeptiert." + +#: mod/dfrn_request.php:123 mod/dfrn_request.php:518 +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:128 mod/dfrn_request.php:523 +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:130 mod/dfrn_request.php:525 +msgid "Warning: profile location has no profile photo." +msgstr "Warnung: Es gibt kein Profilbild bei der angegebenen Profiladresse." + +#: mod/dfrn_request.php:133 mod/dfrn_request.php:528 +#, 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:178 +msgid "Introduction complete." +msgstr "Kontaktanfrage abgeschlossen." + +#: mod/dfrn_request.php:220 +msgid "Unrecoverable protocol error." +msgstr "Nicht behebbarer Protokollfehler." + +#: mod/dfrn_request.php:248 +msgid "Profile unavailable." +msgstr "Profil nicht verfügbar." + +#: mod/dfrn_request.php:273 +#, php-format +msgid "%s has received too many connection requests today." +msgstr "%s hat heute zu viele Kontaktanfragen erhalten." + +#: mod/dfrn_request.php:274 +msgid "Spam protection measures have been invoked." +msgstr "Maßnahmen zum Spamschutz wurden ergriffen." + +#: mod/dfrn_request.php:275 +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:337 +msgid "Invalid locator" +msgstr "Ungültiger Locator" + +#: mod/dfrn_request.php:346 +msgid "Invalid email address." +msgstr "Ungültige E-Mail-Adresse." + +#: mod/dfrn_request.php:373 +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:476 +msgid "You have already introduced yourself here." +msgstr "Du hast Dich hier bereits vorgestellt." + +#: mod/dfrn_request.php:480 +#, php-format +msgid "Apparently you are already friends with %s." +msgstr "Es scheint so, als ob Du bereits mit %s in Kontakt stehst." + +#: mod/dfrn_request.php:501 +msgid "Invalid profile URL." +msgstr "Ungültige Profil-URL." + +#: mod/dfrn_request.php:600 +msgid "Your introduction has been sent." +msgstr "Deine Kontaktanfrage wurde gesendet." + +#: mod/dfrn_request.php:640 +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:663 +msgid "Please login to confirm introduction." +msgstr "Bitte melde Dich an, um die Kontaktanfrage zu bestätigen." + +#: mod/dfrn_request.php:673 +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:687 mod/dfrn_request.php:704 +msgid "Confirm" +msgstr "Bestätigen" + +#: mod/dfrn_request.php:699 +msgid "Hide this contact" +msgstr "Verberge diesen Kontakt" + +#: mod/dfrn_request.php:702 +#, php-format +msgid "Welcome home %s." +msgstr "Willkommen zurück %s." + +#: mod/dfrn_request.php:703 +#, php-format +msgid "Please confirm your introduction/connection request to %s." +msgstr "Bitte bestätige Deine Kontaktanfrage bei %s." + +#: mod/dfrn_request.php:832 +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:853 +#, php-format +msgid "" +"If you are not yet a member of the free social web, follow this link to find a public Friendica site and " +"join us today." +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:858 +msgid "Friend/Connection Request" +msgstr "Kontaktanfrage" + +#: mod/dfrn_request.php:859 +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:868 +msgid "StatusNet/Federated Social Web" +msgstr "StatusNet/Federated Social Web" + +#: mod/dfrn_request.php:870 +#, php-format +msgid "" +" - please do not use this form. Instead, enter %s into your Diaspora search" +" bar." +msgstr " - bitte verwende dieses Formular nicht. Stattdessen suche nach %s in Deiner Diaspora Suchleiste." + +#: mod/photos.php:101 mod/photos.php:1887 +msgid "Recent Photos" +msgstr "Neueste Fotos" + +#: mod/photos.php:104 mod/photos.php:1308 mod/photos.php:1889 +msgid "Upload New Photos" +msgstr "Neue Fotos hochladen" + +#: mod/photos.php:182 +msgid "Contact information unavailable" +msgstr "Kontaktinformationen nicht verfügbar" + +#: mod/photos.php:203 +msgid "Album not found." +msgstr "Album nicht gefunden." + +#: mod/photos.php:233 mod/photos.php:245 mod/photos.php:1250 +msgid "Delete Album" +msgstr "Album löschen" + +#: mod/photos.php:243 +msgid "Do you really want to delete this photo album and all its photos?" +msgstr "Möchtest Du wirklich dieses Foto-Album und all seine Foto löschen?" + +#: mod/photos.php:323 mod/photos.php:334 mod/photos.php:1568 +msgid "Delete Photo" +msgstr "Foto löschen" + +#: mod/photos.php:332 +msgid "Do you really want to delete this photo?" +msgstr "Möchtest Du wirklich dieses Foto löschen?" + +#: mod/photos.php:707 +#, php-format +msgid "%1$s was tagged in %2$s by %3$s" +msgstr "%1$s wurde von %3$s in %2$s getaggt" + +#: mod/photos.php:707 +msgid "a photo" +msgstr "einem Foto" + +#: mod/photos.php:814 +msgid "Image file is empty." +msgstr "Bilddatei ist leer." + +#: mod/photos.php:974 +msgid "No photos selected" +msgstr "Keine Bilder ausgewählt" + +#: mod/photos.php:1135 +#, php-format +msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." +msgstr "Du verwendest %1$.2f Mbyte von %2$.2f Mbyte des Foto-Speichers." + +#: mod/photos.php:1170 +msgid "Upload Photos" +msgstr "Bilder hochladen" + +#: mod/photos.php:1174 mod/photos.php:1245 +msgid "New album name: " +msgstr "Name des neuen Albums: " + +#: mod/photos.php:1175 +msgid "or existing album name: " +msgstr "oder existierender Albumname: " + +#: mod/photos.php:1176 +msgid "Do not show a status post for this upload" +msgstr "Keine Status-Mitteilung für diesen Beitrag anzeigen" + +#: mod/photos.php:1189 +msgid "Private Photo" +msgstr "Privates Foto" + +#: mod/photos.php:1190 +msgid "Public Photo" +msgstr "Öffentliches Foto" + +#: mod/photos.php:1258 +msgid "Edit Album" +msgstr "Album bearbeiten" + +#: mod/photos.php:1264 +msgid "Show Newest First" +msgstr "Zeige neueste zuerst" + +#: mod/photos.php:1266 +msgid "Show Oldest First" +msgstr "Zeige älteste zuerst" + +#: mod/photos.php:1294 mod/photos.php:1872 +msgid "View Photo" +msgstr "Foto betrachten" + +#: mod/photos.php:1341 +msgid "Permission denied. Access to this item may be restricted." +msgstr "Zugriff verweigert. Zugriff zu diesem Eintrag könnte eingeschränkt sein." + +#: mod/photos.php:1343 +msgid "Photo not available" +msgstr "Foto nicht verfügbar" + +#: mod/photos.php:1399 +msgid "View photo" +msgstr "Fotos ansehen" + +#: mod/photos.php:1399 +msgid "Edit photo" +msgstr "Foto bearbeiten" + +#: mod/photos.php:1400 +msgid "Use as profile photo" +msgstr "Als Profilbild verwenden" + +#: mod/photos.php:1406 mod/content.php:638 object/Item.php:117 +msgid "Private Message" +msgstr "Private Nachricht" + +#: mod/photos.php:1425 +msgid "View Full Size" +msgstr "Betrachte Originalgröße" + +#: mod/photos.php:1511 +msgid "Tags: " +msgstr "Tags: " + +#: mod/photos.php:1514 +msgid "[Remove any tag]" +msgstr "[Tag entfernen]" + +#: mod/photos.php:1554 +msgid "New album name" +msgstr "Name des neuen Albums" + +#: mod/photos.php:1555 +msgid "Caption" +msgstr "Bildunterschrift" + +#: mod/photos.php:1556 +msgid "Add a Tag" +msgstr "Tag hinzufügen" + +#: mod/photos.php:1556 +msgid "" +"Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" +msgstr "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" + +#: mod/photos.php:1557 +msgid "Do not rotate" +msgstr "Nicht rotieren" + +#: mod/photos.php:1558 +msgid "Rotate CW (right)" +msgstr "Drehen US (rechts)" + +#: mod/photos.php:1559 +msgid "Rotate CCW (left)" +msgstr "Drehen EUS (links)" + +#: mod/photos.php:1574 +msgid "Private photo" +msgstr "Privates Foto" + +#: mod/photos.php:1575 +msgid "Public photo" +msgstr "Öffentliches Foto" + +#: mod/photos.php:1595 mod/content.php:702 object/Item.php:263 +msgid "I like this (toggle)" +msgstr "Ich mag das (toggle)" + +#: mod/photos.php:1596 mod/content.php:703 object/Item.php:264 +msgid "I don't like this (toggle)" +msgstr "Ich mag das nicht (toggle)" + +#: mod/photos.php:1615 mod/photos.php:1663 mod/photos.php:1751 +#: mod/content.php:725 object/Item.php:717 +msgid "This is you" +msgstr "Das bist Du" + +#: mod/photos.php:1617 mod/photos.php:1665 mod/photos.php:1753 +#: mod/content.php:727 mod/content.php:945 object/Item.php:403 +#: object/Item.php:719 boot.php:888 +msgid "Comment" +msgstr "Kommentar" + +#: mod/photos.php:1801 +msgid "Map" +msgstr "Karte" + +#: mod/profiles.php:38 +msgid "Profile deleted." +msgstr "Profil gelöscht." + +#: mod/profiles.php:56 mod/profiles.php:90 +msgid "Profile-" +msgstr "Profil-" + +#: mod/profiles.php:75 mod/profiles.php:118 +msgid "New profile created." +msgstr "Neues Profil angelegt." + +#: mod/profiles.php:96 +msgid "Profile unavailable to clone." +msgstr "Profil nicht zum Duplizieren verfügbar." + +#: mod/profiles.php:190 +msgid "Profile Name is required." +msgstr "Profilname ist erforderlich." + +#: mod/profiles.php:337 +msgid "Marital Status" +msgstr "Familienstand" + +#: mod/profiles.php:341 +msgid "Romantic Partner" +msgstr "Romanze" + +#: mod/profiles.php:353 +msgid "Work/Employment" +msgstr "Arbeit / Beschäftigung" + +#: mod/profiles.php:356 +msgid "Religion" +msgstr "Religion" + +#: mod/profiles.php:360 +msgid "Political Views" +msgstr "Politische Ansichten" + +#: mod/profiles.php:364 +msgid "Gender" +msgstr "Geschlecht" + +#: mod/profiles.php:368 +msgid "Sexual Preference" +msgstr "Sexuelle Vorlieben" + +#: mod/profiles.php:372 +msgid "Homepage" +msgstr "Webseite" + +#: mod/profiles.php:376 mod/profiles.php:696 +msgid "Interests" +msgstr "Interessen" + +#: mod/profiles.php:380 +msgid "Address" +msgstr "Adresse" + +#: mod/profiles.php:387 mod/profiles.php:692 +msgid "Location" +msgstr "Wohnort" + +#: mod/profiles.php:470 +msgid "Profile updated." +msgstr "Profil aktualisiert." + +#: mod/profiles.php:557 +msgid " and " +msgstr " und " + +#: mod/profiles.php:565 +msgid "public profile" +msgstr "öffentliches Profil" + +#: mod/profiles.php:568 +#, php-format +msgid "%1$s changed %2$s to “%3$s”" +msgstr "%1$s hat %2$s geändert auf “%3$s”" + +#: mod/profiles.php:569 +#, php-format +msgid " - Visit %1$s's %2$s" +msgstr " – %1$ss %2$s besuchen" + +#: mod/profiles.php:572 +#, php-format +msgid "%1$s has an updated %2$s, changing %3$s." +msgstr "%1$s hat folgendes aktualisiert %2$s, verändert wurde %3$s." + +#: mod/profiles.php:639 +msgid "Hide contacts and friends:" +msgstr "Kontakte und Freunde verbergen" + +#: mod/profiles.php:644 +msgid "Hide your contact/friend list from viewers of this profile?" +msgstr "Liste der Kontakte vor Betrachtern dieses Profils verbergen?" + +#: mod/profiles.php:668 +msgid "Show more profile fields:" +msgstr "Zeige mehr Profil-Felder:" + +#: mod/profiles.php:680 +msgid "Profile Actions" +msgstr "Profilaktionen" + +#: mod/profiles.php:681 +msgid "Edit Profile Details" +msgstr "Profil bearbeiten" + +#: mod/profiles.php:683 +msgid "Change Profile Photo" +msgstr "Profilbild ändern" + +#: mod/profiles.php:684 +msgid "View this profile" +msgstr "Dieses Profil anzeigen" + +#: mod/profiles.php:686 +msgid "Create a new profile using these settings" +msgstr "Neues Profil anlegen und diese Einstellungen verwenden" + +#: mod/profiles.php:687 +msgid "Clone this profile" +msgstr "Dieses Profil duplizieren" + +#: mod/profiles.php:688 +msgid "Delete this profile" +msgstr "Dieses Profil löschen" + +#: mod/profiles.php:690 +msgid "Basic information" +msgstr "Grundinformationen" + +#: mod/profiles.php:691 +msgid "Profile picture" +msgstr "Profilbild" + +#: mod/profiles.php:693 +msgid "Preferences" +msgstr "Vorlieben" + +#: mod/profiles.php:694 +msgid "Status information" +msgstr "Status Informationen" + +#: mod/profiles.php:695 +msgid "Additional information" +msgstr "Zusätzliche Informationen" + +#: mod/profiles.php:698 +msgid "Relation" +msgstr "Beziehung" + +#: mod/profiles.php:702 +msgid "Your Gender:" +msgstr "Dein Geschlecht:" + +#: mod/profiles.php:703 +msgid "♥ Marital Status:" +msgstr "♥ Beziehungsstatus:" + +#: mod/profiles.php:705 +msgid "Example: fishing photography software" +msgstr "Beispiel: Fischen Fotografie Software" + +#: mod/profiles.php:710 +msgid "Profile Name:" +msgstr "Profilname:" + +#: mod/profiles.php:712 +msgid "" +"This is your public profile.
It may " +"be visible to anybody using the internet." +msgstr "Dies ist Dein öffentliches Profil.
Es könnte für jeden Nutzer des Internets sichtbar sein." + +#: mod/profiles.php:713 +msgid "Your Full Name:" +msgstr "Dein kompletter Name:" + +#: mod/profiles.php:714 +msgid "Title/Description:" +msgstr "Titel/Beschreibung:" + +#: mod/profiles.php:717 +msgid "Street Address:" +msgstr "Adresse:" + +#: mod/profiles.php:718 +msgid "Locality/City:" +msgstr "Wohnort:" + +#: mod/profiles.php:719 +msgid "Region/State:" +msgstr "Region/Bundesstaat:" + +#: mod/profiles.php:720 +msgid "Postal/Zip Code:" +msgstr "Postleitzahl:" + +#: mod/profiles.php:721 +msgid "Country:" +msgstr "Land:" + +#: mod/profiles.php:725 +msgid "Who: (if applicable)" +msgstr "Wer: (falls anwendbar)" + +#: mod/profiles.php:725 +msgid "Examples: cathy123, Cathy Williams, cathy@example.com" +msgstr "Beispiele: cathy123, Cathy Williams, cathy@example.com" + +#: mod/profiles.php:726 +msgid "Since [date]:" +msgstr "Seit [Datum]:" + +#: mod/profiles.php:728 +msgid "Tell us about yourself..." +msgstr "Erzähle uns ein bisschen von Dir …" + +#: mod/profiles.php:729 +msgid "Homepage URL:" +msgstr "Adresse der Homepage:" + +#: mod/profiles.php:732 +msgid "Religious Views:" +msgstr "Religiöse Ansichten:" + +#: mod/profiles.php:733 +msgid "Public Keywords:" +msgstr "Öffentliche Schlüsselwörter:" + +#: mod/profiles.php:733 +msgid "(Used for suggesting potential friends, can be seen by others)" +msgstr "(Wird verwendet, um potentielle Kontakte zu finden, kann von Kontakten eingesehen werden)" + +#: mod/profiles.php:734 +msgid "Private Keywords:" +msgstr "Private Schlüsselwörter:" + +#: mod/profiles.php:734 +msgid "(Used for searching profiles, never shown to others)" +msgstr "(Wird für die Suche nach Profilen verwendet und niemals veröffentlicht)" + +#: mod/profiles.php:737 +msgid "Musical interests" +msgstr "Musikalische Interessen" + +#: mod/profiles.php:738 +msgid "Books, literature" +msgstr "Bücher, Literatur" + +#: mod/profiles.php:739 +msgid "Television" +msgstr "Fernsehen" + +#: mod/profiles.php:740 +msgid "Film/dance/culture/entertainment" +msgstr "Filme/Tänze/Kultur/Unterhaltung" + +#: mod/profiles.php:741 +msgid "Hobbies/Interests" +msgstr "Hobbies/Interessen" + +#: mod/profiles.php:742 +msgid "Love/romance" +msgstr "Liebe/Romantik" + +#: mod/profiles.php:743 +msgid "Work/employment" +msgstr "Arbeit/Anstellung" + +#: mod/profiles.php:744 +msgid "School/education" +msgstr "Schule/Ausbildung" + +#: mod/profiles.php:745 +msgid "Contact information and Social Networks" +msgstr "Kontaktinformationen und Soziale Netzwerke" + +#: mod/profiles.php:787 +msgid "Edit/Manage Profiles" +msgstr "Bearbeite/Verwalte Profile" + +#: mod/content.php:325 object/Item.php:95 +msgid "This entry was edited" +msgstr "Dieser Beitrag wurde bearbeitet." + +#: mod/content.php:621 object/Item.php:429 +#, php-format +msgid "%d comment" +msgid_plural "%d comments" +msgstr[0] "%d Kommentar" +msgstr[1] "%d Kommentare" + +#: mod/content.php:702 object/Item.php:263 +msgid "like" +msgstr "mag ich" + +#: mod/content.php:703 object/Item.php:264 +msgid "dislike" +msgstr "mag ich nicht" + +#: mod/content.php:705 object/Item.php:266 +msgid "Share this" +msgstr "Weitersagen" + +#: mod/content.php:705 object/Item.php:266 +msgid "share" +msgstr "Teilen" + +#: mod/content.php:729 object/Item.php:721 +msgid "Bold" +msgstr "Fett" + +#: mod/content.php:730 object/Item.php:722 +msgid "Italic" +msgstr "Kursiv" + +#: mod/content.php:731 object/Item.php:723 +msgid "Underline" +msgstr "Unterstrichen" + +#: mod/content.php:732 object/Item.php:724 +msgid "Quote" +msgstr "Zitat" + +#: mod/content.php:733 object/Item.php:725 +msgid "Code" +msgstr "Code" + +#: mod/content.php:734 object/Item.php:726 +msgid "Image" +msgstr "Bild" + +#: mod/content.php:735 object/Item.php:727 +msgid "Link" +msgstr "Link" + +#: mod/content.php:736 object/Item.php:728 +msgid "Video" +msgstr "Video" + +#: mod/content.php:771 object/Item.php:227 +msgid "add star" +msgstr "markieren" + +#: mod/content.php:772 object/Item.php:228 +msgid "remove star" +msgstr "Markierung entfernen" + +#: mod/content.php:773 object/Item.php:229 +msgid "toggle star status" +msgstr "Markierung umschalten" + +#: mod/content.php:776 object/Item.php:232 +msgid "starred" +msgstr "markiert" + +#: mod/content.php:777 mod/content.php:798 object/Item.php:252 +msgid "add tag" +msgstr "Tag hinzufügen" + +#: mod/content.php:787 object/Item.php:240 +msgid "ignore thread" +msgstr "Thread ignorieren" + +#: mod/content.php:788 object/Item.php:241 +msgid "unignore thread" +msgstr "Thread nicht mehr ignorieren" + +#: mod/content.php:789 object/Item.php:242 +msgid "toggle ignore status" +msgstr "Ignoriert-Status ein-/ausschalten" + +#: mod/content.php:803 object/Item.php:137 +msgid "save to folder" +msgstr "In Ordner speichern" + +#: mod/content.php:848 object/Item.php:201 +msgid "I will attend" +msgstr "Ich werde teilnehmen" + +#: mod/content.php:848 object/Item.php:201 +msgid "I will not attend" +msgstr "Ich werde nicht teilnehmen" + +#: mod/content.php:848 object/Item.php:201 +msgid "I might attend" +msgstr "Ich werde eventuell teilnehmen" + +#: mod/content.php:912 object/Item.php:369 +msgid "to" +msgstr "zu" + +#: mod/content.php:913 object/Item.php:371 +msgid "Wall-to-Wall" +msgstr "Wall-to-Wall" + +#: mod/content.php:914 object/Item.php:372 +msgid "via Wall-To-Wall:" +msgstr "via Wall-To-Wall:" + +#: mod/notifications.php:29 +msgid "Invalid request identifier." +msgstr "Invalid request identifier." + +#: mod/notifications.php:38 mod/notifications.php:143 +#: mod/notifications.php:228 +msgid "Discard" +msgstr "Verwerfen" + +#: mod/notifications.php:91 +msgid "Show Ignored Requests" +msgstr "Zeige ignorierte Anfragen" + +#: mod/notifications.php:91 +msgid "Hide Ignored Requests" +msgstr "Verberge ignorierte Anfragen" + +#: mod/notifications.php:127 mod/notifications.php:198 +msgid "Notification type: " +msgstr "Benachrichtigungstyp: " + +#: mod/notifications.php:128 +msgid "Friend Suggestion" +msgstr "Kontaktvorschlag" + +#: mod/notifications.php:130 +#, php-format +msgid "suggested by %s" +msgstr "vorgeschlagen von %s" + +#: mod/notifications.php:136 mod/notifications.php:216 +msgid "Post a new friend activity" +msgstr "Neue-Kontakt Nachricht senden" + +#: mod/notifications.php:136 mod/notifications.php:216 +msgid "if applicable" +msgstr "falls anwendbar" + +#: mod/notifications.php:159 +msgid "Claims to be known to you: " +msgstr "Behauptet Dich zu kennen: " + +#: mod/notifications.php:160 +msgid "yes" +msgstr "ja" + +#: mod/notifications.php:160 +msgid "no" +msgstr "nein" + +#: mod/notifications.php:161 +msgid "" +"Shall your connection be bidirectional or not? \"Friend\" implies that you " +"allow to read and you subscribe to their posts. \"Fan/Admirer\" means that " +"you allow to read but you do not want to read theirs. Approve as: " +msgstr "Soll Deine Beziehung beidseitig sein oder nicht? \"Kontakt\" bedeutet, ihr könnt gegenseitig die Beiträge des Anderen lesen dürft. \"Fan/Verehrer\", dass du das lesen deiner Beiträge erlaubst aber nicht die Beiträge der anderen Seite lesen möchtest. Genehmigen als:" + +#: mod/notifications.php:164 +msgid "" +"Shall your connection be bidirectional or not? \"Friend\" implies that you " +"allow to read and you subscribe to their posts. \"Sharer\" means that you " +"allow to read but you do not want to read theirs. Approve as: " +msgstr "Soll Deine Beziehung beidseitig sein oder nicht? \"Freund\" bedeutet, ihr gegenseitig die Beiträge des Anderen lesen dürft. \"Teilenden\", das du das lesen deiner Beiträge erlaubst aber nicht die Beiträge der anderen Seite lesen möchtest. Genehmigen als:" + +#: mod/notifications.php:172 +msgid "Friend" +msgstr "Kontakt" + +#: mod/notifications.php:173 +msgid "Sharer" +msgstr "Teilenden" + +#: mod/notifications.php:173 +msgid "Fan/Admirer" +msgstr "Fan/Verehrer" + +#: mod/notifications.php:199 +msgid "Friend/Connect Request" +msgstr "Kontakt-/Freundschaftsanfrage" + +#: mod/notifications.php:199 +msgid "New Follower" +msgstr "Neuer Bewunderer" + +#: mod/notifications.php:234 +msgid "No introductions." +msgstr "Keine Kontaktanfragen." + +#: mod/notifications.php:238 +msgid "Network Notifications" +msgstr "Netzwerk Benachrichtigungen" + +#: mod/notifications.php:265 mod/notifications.php:382 +#: mod/notifications.php:461 +#, php-format +msgid "%s liked %s's post" +msgstr "%s mag %ss Beitrag" + +#: mod/notifications.php:275 mod/notifications.php:392 +#: mod/notifications.php:471 +#, php-format +msgid "%s disliked %s's post" +msgstr "%s mag %ss Beitrag nicht" + +#: mod/notifications.php:290 mod/notifications.php:407 +#: mod/notifications.php:486 +#, php-format +msgid "%s is now friends with %s" +msgstr "%s ist jetzt mit %s befreundet" + +#: mod/notifications.php:297 mod/notifications.php:414 +#, php-format +msgid "%s created a new post" +msgstr "%s hat einen neuen Beitrag erstellt" + +#: mod/notifications.php:298 mod/notifications.php:415 +#: mod/notifications.php:496 +#, php-format +msgid "%s commented on %s's post" +msgstr "%s hat %ss Beitrag kommentiert" + +#: mod/notifications.php:313 +msgid "No more network notifications." +msgstr "Keine weiteren Netzwerk-Benachrichtigungen." + +#: mod/notifications.php:343 +msgid "Personal Notifications" +msgstr "Persönliche Benachrichtigungen" + +#: mod/notifications.php:430 +msgid "No more personal notifications." +msgstr "Keine weiteren persönlichen Benachrichtigungen" + +#: mod/notifications.php:435 +msgid "Home Notifications" +msgstr "Pinnwand Benachrichtigungen" + +#: mod/notifications.php:503 +msgid "No more home notifications." +msgstr "Keine weiteren Pinnwand-Benachrichtigungen" + +#: mod/notifications.php:527 +msgid "System" +msgstr "System" + #: object/Item.php:370 msgid "via" msgstr "via" @@ -8807,3 +8757,56 @@ msgstr "slackr" #: view/theme/duepuntozero/config.php:62 msgid "Variations" msgstr "Variationen" + +#: index.php:447 +msgid "toggle mobile" +msgstr "auf/von Mobile Ansicht wechseln" + +#: boot.php:887 +msgid "Delete this item?" +msgstr "Diesen Beitrag löschen?" + +#: boot.php:890 +msgid "show fewer" +msgstr "weniger anzeigen" + +#: boot.php:1483 +#, php-format +msgid "Update %s failed. See error logs." +msgstr "Update %s fehlgeschlagen. Bitte Fehlerprotokoll überprüfen." + +#: boot.php:1595 +msgid "Create a New Account" +msgstr "Neues Konto erstellen" + +#: boot.php:1624 +msgid "Password: " +msgstr "Passwort: " + +#: boot.php:1625 +msgid "Remember me" +msgstr "Anmeldedaten merken" + +#: boot.php:1628 +msgid "Or login using OpenID: " +msgstr "Oder melde Dich mit Deiner OpenID an: " + +#: boot.php:1634 +msgid "Forgot your password?" +msgstr "Passwort vergessen?" + +#: boot.php:1637 +msgid "Website Terms of Service" +msgstr "Website Nutzungsbedingungen" + +#: boot.php:1638 +msgid "terms of service" +msgstr "Nutzungsbedingungen" + +#: boot.php:1640 +msgid "Website Privacy Policy" +msgstr "Website Datenschutzerklärung" + +#: boot.php:1641 +msgid "privacy policy" +msgstr "Datenschutzerklärung" diff --git a/view/de/strings.php b/view/de/strings.php index bd16af7a02..1fb71df9e9 100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -5,25 +5,6 @@ function string_plural_select_de($n){ return ($n != 1);; }} ; -$a->strings["Delete this item?"] = "Diesen Beitrag löschen?"; -$a->strings["Comment"] = "Kommentar"; -$a->strings["show more"] = "mehr anzeigen"; -$a->strings["show fewer"] = "weniger anzeigen"; -$a->strings["Update %s failed. See error logs."] = "Update %s fehlgeschlagen. Bitte Fehlerprotokoll überprüfen."; -$a->strings["Create a New Account"] = "Neues Konto erstellen"; -$a->strings["Register"] = "Registrieren"; -$a->strings["Logout"] = "Abmelden"; -$a->strings["Login"] = "Anmeldung"; -$a->strings["Nickname or Email: "] = "Spitzname oder E-Mail:"; -$a->strings["Password: "] = "Passwort: "; -$a->strings["Remember me"] = "Anmeldedaten merken"; -$a->strings["Or login using OpenID: "] = "Oder melde Dich mit Deiner OpenID an: "; -$a->strings["Forgot your password?"] = "Passwort vergessen?"; -$a->strings["Password Reset"] = "Passwort zurücksetzen"; -$a->strings["Website Terms of Service"] = "Website Nutzungsbedingungen"; -$a->strings["terms of service"] = "Nutzungsbedingungen"; -$a->strings["Website Privacy Policy"] = "Website Datenschutzerklärung"; -$a->strings["privacy policy"] = "Datenschutzerklärung"; $a->strings["Miscellaneous"] = "Verschiedenes"; $a->strings["Birthday:"] = "Geburtstag:"; $a->strings["Age: "] = "Alter: "; @@ -73,6 +54,7 @@ $a->strings["%d contact in common"] = array( 0 => "%d gemeinsamer Kontakt", 1 => "%d gemeinsame Kontakte", ); +$a->strings["show more"] = "mehr anzeigen"; $a->strings["Friendica Notification"] = "Friendica-Benachrichtigung"; $a->strings["Thank You,"] = "Danke,"; $a->strings["%s Administrator"] = "der Administrator von %s"; @@ -133,15 +115,8 @@ $a->strings["You've received a registration request from '%1\$s' at %2\$s"] = "D $a->strings["You've received a [url=%1\$s]registration request[/url] from %2\$s."] = "Du hast eine [url=%1\$s]Registrierungsanfrage[/url] von %2\$s erhalten."; $a->strings["Full Name:\t%1\$s\\nSite Location:\t%2\$s\\nLogin Name:\t%3\$s (%4\$s)"] = "Kompletter Name:\t%1\$s\\nURL der Seite:\t%2\$s\\nLogin Name:\t%3\$s (%4\$s)"; $a->strings["Please visit %s to approve or reject the request."] = "Bitte besuche %s um die Anfrage zu bearbeiten."; -$a->strings["Click here to upgrade."] = "Zum Upgraden hier klicken."; -$a->strings["This action exceeds the limits set by your subscription plan."] = "Diese Aktion überschreitet die Obergrenze Deines Abonnements."; -$a->strings["This action is not available under your subscription plan."] = "Diese Aktion ist in Deinem Abonnement nicht verfügbar."; $a->strings["Forums"] = "Foren"; $a->strings["External link to forum"] = "Externer Link zum Forum"; -$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s mag %2\$ss %3\$s"; -$a->strings["status"] = "Status"; -$a->strings["Sharing notification from Diaspora network"] = "Freigabe-Benachrichtigung von Diaspora"; -$a->strings["Attachments:"] = "Anhänge:"; $a->strings["%s\\'s birthday"] = "%ss Geburtstag"; $a->strings["Error decoding account file"] = "Fehler beim Verarbeiten der Account Datei"; $a->strings["Error! No version data in file! This is not a Friendica account file?"] = "Fehler! Keine Versionsdaten in der Datei! Ist das wirklich eine Friendica Account Datei?"; @@ -341,7 +316,277 @@ $a->strings["comment"] = array( ); $a->strings["post"] = "Beitrag"; $a->strings["Item filed"] = "Beitrag abgelegt"; +$a->strings["Requested account is not available."] = "Das angefragte Profil ist nicht vorhanden."; +$a->strings["Requested profile is not available."] = "Das angefragte Profil ist nicht vorhanden."; +$a->strings["Edit profile"] = "Profil bearbeiten"; +$a->strings["Atom feed"] = "Atom-Feed"; +$a->strings["Message"] = "Nachricht"; +$a->strings["Profiles"] = "Profile"; +$a->strings["Manage/edit profiles"] = "Profile verwalten/editieren"; +$a->strings["Change profile photo"] = "Profilbild ändern"; +$a->strings["Create New Profile"] = "Neues Profil anlegen"; +$a->strings["Profile Image"] = "Profilbild"; +$a->strings["visible to everybody"] = "sichtbar für jeden"; +$a->strings["Edit visibility"] = "Sichtbarkeit bearbeiten"; +$a->strings["Forum"] = "Forum"; +$a->strings["Gender:"] = "Geschlecht:"; +$a->strings["Status:"] = "Status:"; +$a->strings["Homepage:"] = "Homepage:"; +$a->strings["About:"] = "Über:"; +$a->strings["Network:"] = "Netzwerk:"; +$a->strings["g A l F d"] = "l, d. F G \\U\\h\\r"; +$a->strings["F d"] = "d. F"; +$a->strings["[today]"] = "[heute]"; +$a->strings["Birthday Reminders"] = "Geburtstagserinnerungen"; +$a->strings["Birthdays this week:"] = "Geburtstage diese Woche:"; +$a->strings["[No description]"] = "[keine Beschreibung]"; +$a->strings["Event Reminders"] = "Veranstaltungserinnerungen"; +$a->strings["Events this week:"] = "Veranstaltungen diese Woche"; +$a->strings["Profile"] = "Profil"; +$a->strings["Full Name:"] = "Kompletter Name:"; +$a->strings["j F, Y"] = "j F, Y"; +$a->strings["j F"] = "j F"; +$a->strings["Age:"] = "Alter:"; +$a->strings["for %1\$d %2\$s"] = "für %1\$d %2\$s"; +$a->strings["Sexual Preference:"] = "Sexuelle Vorlieben:"; +$a->strings["Hometown:"] = "Heimatort:"; +$a->strings["Tags:"] = "Tags"; +$a->strings["Political Views:"] = "Politische Ansichten:"; +$a->strings["Religion:"] = "Religion:"; +$a->strings["Hobbies/Interests:"] = "Hobbies/Interessen:"; +$a->strings["Likes:"] = "Likes:"; +$a->strings["Dislikes:"] = "Dislikes:"; +$a->strings["Contact information and Social Networks:"] = "Kontaktinformationen und Soziale Netzwerke:"; +$a->strings["Musical interests:"] = "Musikalische Interessen:"; +$a->strings["Books, literature:"] = "Literatur/Bücher:"; +$a->strings["Television:"] = "Fernsehen:"; +$a->strings["Film/dance/culture/entertainment:"] = "Filme/Tänze/Kultur/Unterhaltung:"; +$a->strings["Love/Romance:"] = "Liebesleben:"; +$a->strings["Work/employment:"] = "Arbeit/Beschäftigung:"; +$a->strings["School/education:"] = "Schule/Ausbildung:"; +$a->strings["Forums:"] = "Foren:"; +$a->strings["Basic"] = "Allgemein"; +$a->strings["Advanced"] = "Erweitert"; +$a->strings["Status"] = "Status"; +$a->strings["Status Messages and Posts"] = "Statusnachrichten und Beiträge"; +$a->strings["Profile Details"] = "Profildetails"; +$a->strings["Photos"] = "Bilder"; +$a->strings["Photo Albums"] = "Fotoalben"; +$a->strings["Videos"] = "Videos"; +$a->strings["Events"] = "Veranstaltungen"; +$a->strings["Events and Calendar"] = "Ereignisse und Kalender"; +$a->strings["Personal Notes"] = "Persönliche Notizen"; +$a->strings["Only You Can See This"] = "Nur Du kannst das sehen"; +$a->strings["Disallowed profile URL."] = "Nicht erlaubte Profil-URL."; +$a->strings["Connect URL missing."] = "Connect-URL fehlt"; +$a->strings["This site is not configured to allow communications with other networks."] = "Diese Seite ist so konfiguriert, dass keine Kommunikation mit anderen Netzwerken erfolgen kann."; +$a->strings["No compatible communication protocols or feeds were discovered."] = "Es wurden keine kompatiblen Kommunikationsprotokolle oder Feeds gefunden."; +$a->strings["The profile address specified does not provide adequate information."] = "Die angegebene Profiladresse liefert unzureichende Informationen."; +$a->strings["An author or name was not found."] = "Es wurde kein Autor oder Name gefunden."; +$a->strings["No browser URL could be matched to this address."] = "Zu dieser Adresse konnte keine passende Browser URL gefunden werden."; +$a->strings["Unable to match @-style Identity Address with a known protocol or email contact."] = "Konnte die @-Adresse mit keinem der bekannten Protokolle oder Email-Kontakte abgleichen."; +$a->strings["Use mailto: in front of address to force email check."] = "Verwende mailto: vor der Email Adresse, um eine Überprüfung der E-Mail-Adresse zu erzwingen."; +$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "Die Adresse dieses Profils gehört zu einem Netzwerk, mit dem die Kommunikation auf dieser Seite ausgeschaltet wurde."; +$a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Eingeschränktes Profil. Diese Person wird keine direkten/privaten Nachrichten von Dir erhalten können."; +$a->strings["Unable to retrieve contact information."] = "Konnte die Kontaktinformationen nicht empfangen."; +$a->strings["following"] = "folgen"; +$a->strings["Embedded content"] = "Eingebetteter Inhalt"; +$a->strings["Embedding disabled"] = "Einbettungen deaktiviert"; +$a->strings["Image/photo"] = "Bild/Foto"; +$a->strings["%2\$s %3\$s"] = "%2\$s %3\$s"; +$a->strings["$1 wrote:"] = "$1 hat geschrieben:"; +$a->strings["Encrypted content"] = "Verschlüsselter Inhalt"; +$a->strings["Logged out."] = "Abgemeldet."; +$a->strings["Login failed."] = "Anmeldung fehlgeschlagen."; +$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Beim Versuch Dich mit der von Dir angegebenen OpenID anzumelden trat ein Problem auf. Bitte überprüfe, dass Du die OpenID richtig geschrieben hast."; +$a->strings["The error message was:"] = "Die Fehlermeldung lautete:"; +$a->strings["A deleted group with this name was revived. Existing item permissions may apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Eine gelöschte Gruppe mit diesem Namen wurde wiederbelebt. Bestehende Berechtigungseinstellungen könnten auf diese Gruppe oder zukünftige Mitglieder angewandt werden. Falls Du dies nicht möchtest, erstelle bitte eine andere Gruppe mit einem anderen Namen."; +$a->strings["Default privacy group for new contacts"] = "Voreingestellte Gruppe für neue Kontakte"; +$a->strings["Everybody"] = "Alle Kontakte"; +$a->strings["edit"] = "bearbeiten"; +$a->strings["Groups"] = "Gruppen"; +$a->strings["Edit groups"] = "Gruppen bearbeiten"; +$a->strings["Edit group"] = "Gruppe bearbeiten"; +$a->strings["Create a new group"] = "Neue Gruppe erstellen"; +$a->strings["Group Name: "] = "Gruppenname:"; +$a->strings["Contacts not in any group"] = "Kontakte in keiner Gruppe"; +$a->strings["add"] = "hinzufügen"; +$a->strings["Wall Photos"] = "Pinnwand-Bilder"; +$a->strings["(no subject)"] = "(kein Betreff)"; +$a->strings["Passwords do not match. Password unchanged."] = "Die Passwörter stimmen nicht überein. Das Passwort bleibt unverändert."; +$a->strings["An invitation is required."] = "Du benötigst eine Einladung."; +$a->strings["Invitation could not be verified."] = "Die Einladung konnte nicht überprüft werden."; +$a->strings["Invalid OpenID url"] = "Ungültige OpenID URL"; +$a->strings["Please enter the required information."] = "Bitte trage die erforderlichen Informationen ein."; +$a->strings["Please use a shorter name."] = "Bitte verwende einen kürzeren Namen."; +$a->strings["Name too short."] = "Der Name ist zu kurz."; +$a->strings["That doesn't appear to be your full (First Last) name."] = "Das scheint nicht Dein kompletter Name (Vor- und Nachname) zu sein."; +$a->strings["Your email domain is not among those allowed on this site."] = "Die Domain Deiner E-Mail Adresse ist auf dieser Seite nicht erlaubt."; +$a->strings["Not a valid email address."] = "Keine gültige E-Mail-Adresse."; +$a->strings["Cannot use that email."] = "Konnte diese E-Mail-Adresse nicht verwenden."; +$a->strings["Your \"nickname\" can only contain \"a-z\", \"0-9\" and \"_\"."] = "Dein Spitzname darf nur aus Buchstaben und Zahlen (\"a-z\",\"0-9\" und \"_\") bestehen."; +$a->strings["Nickname is already registered. Please choose another."] = "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen."; +$a->strings["Nickname was once registered here and may not be re-used. Please choose another."] = "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen."; +$a->strings["SERIOUS ERROR: Generation of security keys failed."] = "FATALER FEHLER: Sicherheitsschlüssel konnten nicht erzeugt werden."; +$a->strings["An error occurred during registration. Please try again."] = "Während der Anmeldung ist ein Fehler aufgetreten. Bitte versuche es noch einmal."; +$a->strings["default"] = "Standard"; +$a->strings["An error occurred creating your default profile. Please try again."] = "Bei der Erstellung des Standardprofils ist ein Fehler aufgetreten. Bitte versuche es noch einmal."; +$a->strings["Profile Photos"] = "Profilbilder"; +$a->strings["\n\t\tDear %1\$s,\n\t\t\tThank you for registering at %2\$s. Your account has been created.\n\t"] = "\nHallo %1\$s,\n\ndanke für Deine Registrierung auf %2\$s. Dein Account wurde eingerichtet."; +$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["Registration details for %s"] = "Details der Registration von %s"; +$a->strings["General Features"] = "Allgemeine Features"; +$a->strings["Multiple Profiles"] = "Mehrere Profile"; +$a->strings["Ability to create multiple profiles"] = "Möglichkeit mehrere Profile zu erstellen"; +$a->strings["Photo Location"] = "Aufnahmeort"; +$a->strings["Photo metadata is normally stripped. This extracts the location (if present) prior to stripping metadata and links it to a map."] = "Die Foto-Metadaten werden ausgelesen. Dadurch kann der Aufnahmeort (wenn vorhanden) in einer Karte angezeigt werden."; +$a->strings["Export Public Calendar"] = "Öffentlichen Kalender exportieren"; +$a->strings["Ability for visitors to download the public calendar"] = "Möglichkeit für Besucher den öffentlichen Kalender herunter zu laden"; +$a->strings["Post Composition Features"] = "Beitragserstellung Features"; +$a->strings["Richtext Editor"] = "Web-Editor"; +$a->strings["Enable richtext editor"] = "Den Web-Editor für neue Beiträge aktivieren"; +$a->strings["Post Preview"] = "Beitragsvorschau"; +$a->strings["Allow previewing posts and comments before publishing them"] = "Die Vorschau von Beiträgen und Kommentaren vor dem absenden erlauben."; +$a->strings["Auto-mention Forums"] = "Foren automatisch erwähnen"; +$a->strings["Add/remove mention when a fourm page is selected/deselected in ACL window."] = "Automatisch eine @-Erwähnung eines Forums einfügen/entfehrnen, wenn dieses im ACL Fenster de-/markiert wurde."; +$a->strings["Network Sidebar Widgets"] = "Widgets für Netzwerk und Seitenleiste"; +$a->strings["Search by Date"] = "Archiv"; +$a->strings["Ability to select posts by date ranges"] = "Möglichkeit die Beiträge nach Datumsbereichen zu sortieren"; +$a->strings["List Forums"] = "Zeige Foren"; +$a->strings["Enable widget to display the forums your are connected with"] = "Aktiviere Widget, um die Foren mit denen du verbunden bist anzuzeigen"; +$a->strings["Group Filter"] = "Gruppen Filter"; +$a->strings["Enable widget to display Network posts only from selected group"] = "Widget zur Darstellung der Beiträge nach Kontaktgruppen sortiert aktivieren."; +$a->strings["Network Filter"] = "Netzwerk Filter"; +$a->strings["Enable widget to display Network posts only from selected network"] = "Widget zum filtern der Beiträge in Abhängigkeit des Netzwerks aus dem der Ersteller sendet aktivieren."; +$a->strings["Saved Searches"] = "Gespeicherte Suchen"; +$a->strings["Save search terms for re-use"] = "Speichere Suchanfragen für spätere Wiederholung."; +$a->strings["Network Tabs"] = "Netzwerk Reiter"; +$a->strings["Network Personal Tab"] = "Netzwerk-Reiter: Persönlich"; +$a->strings["Enable tab to display only Network posts that you've interacted on"] = "Aktiviert einen Netzwerk-Reiter in dem Nachrichten angezeigt werden mit denen Du interagiert hast"; +$a->strings["Network New Tab"] = "Netzwerk-Reiter: Neue"; +$a->strings["Enable tab to display only new Network posts (from the last 12 hours)"] = "Aktiviert einen Netzwerk-Reiter in dem ausschließlich neue Beiträge (der letzten 12 Stunden) angezeigt werden"; +$a->strings["Network Shared Links Tab"] = "Netzwerk-Reiter: Geteilte Links"; +$a->strings["Enable tab to display only Network posts with links in them"] = "Aktiviert einen Netzwerk-Reiter der ausschließlich Nachrichten mit Links enthält"; +$a->strings["Post/Comment Tools"] = "Werkzeuge für Beiträge und Kommentare"; +$a->strings["Multiple Deletion"] = "Mehrere Beiträge löschen"; +$a->strings["Select and delete multiple posts/comments at once"] = "Mehrere Beiträge/Kommentare markieren und gleichzeitig löschen"; +$a->strings["Edit Sent Posts"] = "Gesendete Beiträge editieren"; +$a->strings["Edit and correct posts and comments after sending"] = "Erlaubt es Beiträge und Kommentare nach dem Senden zu editieren bzw.zu korrigieren."; +$a->strings["Tagging"] = "Tagging"; +$a->strings["Ability to tag existing posts"] = "Möglichkeit bereits existierende Beiträge nachträglich mit Tags zu versehen."; +$a->strings["Post Categories"] = "Beitragskategorien"; +$a->strings["Add categories to your posts"] = "Eigene Beiträge mit Kategorien versehen"; +$a->strings["Ability to file posts under folders"] = "Beiträge in Ordnern speichern aktivieren"; +$a->strings["Dislike Posts"] = "Beiträge 'nicht mögen'"; +$a->strings["Ability to dislike posts/comments"] = "Ermöglicht es Beiträge mit einem Klick 'nicht zu mögen'"; +$a->strings["Star Posts"] = "Beiträge Markieren"; +$a->strings["Ability to mark special posts with a star indicator"] = "Erlaubt es Beiträge mit einem Stern-Indikator zu markieren"; +$a->strings["Mute Post Notifications"] = "Benachrichtigungen für Beiträge Stumm schalten"; +$a->strings["Ability to mute notifications for a thread"] = "Möglichkeit Benachrichtigungen für einen Thread abbestellen zu können"; +$a->strings["Advanced Profile Settings"] = "Erweiterte Profil-Einstellungen"; +$a->strings["Show visitors public community forums at the Advanced Profile Page"] = "Zeige Besuchern öffentliche Gemeinschafts-Foren auf der Erweiterten Profil-Seite"; +$a->strings["Nothing new here"] = "Keine Neuigkeiten"; +$a->strings["Clear notifications"] = "Bereinige Benachrichtigungen"; +$a->strings["Logout"] = "Abmelden"; +$a->strings["End this session"] = "Diese Sitzung beenden"; +$a->strings["Your posts and conversations"] = "Deine Beiträge und Unterhaltungen"; +$a->strings["Your profile page"] = "Deine Profilseite"; +$a->strings["Your photos"] = "Deine Fotos"; +$a->strings["Your videos"] = "Deine Videos"; +$a->strings["Your events"] = "Deine Ereignisse"; +$a->strings["Personal notes"] = "Persönliche Notizen"; +$a->strings["Your personal notes"] = "Deine persönlichen Notizen"; +$a->strings["Login"] = "Anmeldung"; +$a->strings["Sign in"] = "Anmelden"; +$a->strings["Home"] = "Pinnwand"; +$a->strings["Home Page"] = "Homepage"; +$a->strings["Register"] = "Registrieren"; +$a->strings["Create an account"] = "Nutzerkonto erstellen"; +$a->strings["Help"] = "Hilfe"; +$a->strings["Help and documentation"] = "Hilfe und Dokumentation"; +$a->strings["Apps"] = "Apps"; +$a->strings["Addon applications, utilities, games"] = "Addon Anwendungen, Dienstprogramme, Spiele"; +$a->strings["Search site content"] = "Inhalt der Seite durchsuchen"; +$a->strings["Community"] = "Gemeinschaft"; +$a->strings["Conversations on this site"] = "Unterhaltungen auf dieser Seite"; +$a->strings["Conversations on the network"] = "Unterhaltungen im Netzwerk"; +$a->strings["Directory"] = "Verzeichnis"; +$a->strings["People directory"] = "Nutzerverzeichnis"; +$a->strings["Information"] = "Information"; +$a->strings["Information about this friendica instance"] = "Informationen zu dieser Friendica Instanz"; +$a->strings["Network"] = "Netzwerk"; +$a->strings["Conversations from your friends"] = "Unterhaltungen Deiner Kontakte"; +$a->strings["Network Reset"] = "Netzwerk zurücksetzen"; +$a->strings["Load Network page with no filters"] = "Netzwerk-Seite ohne Filter laden"; +$a->strings["Introductions"] = "Kontaktanfragen"; +$a->strings["Friend Requests"] = "Kontaktanfragen"; +$a->strings["Notifications"] = "Benachrichtigungen"; +$a->strings["See all notifications"] = "Alle Benachrichtigungen anzeigen"; +$a->strings["Mark as seen"] = "Als gelesen markieren"; +$a->strings["Mark all system notifications seen"] = "Markiere alle Systembenachrichtigungen als gelesen"; +$a->strings["Messages"] = "Nachrichten"; +$a->strings["Private mail"] = "Private E-Mail"; +$a->strings["Inbox"] = "Eingang"; +$a->strings["Outbox"] = "Ausgang"; +$a->strings["New Message"] = "Neue Nachricht"; +$a->strings["Manage"] = "Verwalten"; +$a->strings["Manage other pages"] = "Andere Seiten verwalten"; +$a->strings["Delegations"] = "Delegationen"; +$a->strings["Delegate Page Management"] = "Delegiere das Management für die Seite"; +$a->strings["Settings"] = "Einstellungen"; +$a->strings["Account settings"] = "Kontoeinstellungen"; +$a->strings["Manage/Edit Profiles"] = "Profile Verwalten/Editieren"; +$a->strings["Manage/edit friends and contacts"] = " Kontakte verwalten/editieren"; +$a->strings["Admin"] = "Administration"; +$a->strings["Site setup and configuration"] = "Einstellungen der Seite und Konfiguration"; +$a->strings["Navigation"] = "Navigation"; +$a->strings["Site map"] = "Sitemap"; +$a->strings["status"] = "Status"; +$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["[no subject]"] = "[kein Betreff]"; +$a->strings["Post to Email"] = "An E-Mail senden"; +$a->strings["Connectors disabled, since \"%s\" is enabled."] = "Konnektoren sind nicht verfügbar, da \"%s\" aktiv ist."; +$a->strings["Hide your profile details from unknown viewers?"] = "Profil-Details vor unbekannten Betrachtern verbergen?"; +$a->strings["Visible to everybody"] = "Für jeden sichtbar"; +$a->strings["show"] = "zeigen"; +$a->strings["don't show"] = "nicht zeigen"; +$a->strings["CC: email addresses"] = "Cc: E-Mail-Addressen"; +$a->strings["Example: bob@example.com, mary@example.com"] = "Z.B.: bob@example.com, mary@example.com"; +$a->strings["Permissions"] = "Berechtigungen"; +$a->strings["Close"] = "Schließen"; +$a->strings["Unknown | Not categorised"] = "Unbekannt | Nicht kategorisiert"; +$a->strings["Block immediately"] = "Sofort blockieren"; +$a->strings["Shady, spammer, self-marketer"] = "Zwielichtig, Spammer, Selbstdarsteller"; +$a->strings["Known to me, but no opinion"] = "Ist mir bekannt, hab aber keine Meinung"; +$a->strings["OK, probably harmless"] = "OK, wahrscheinlich harmlos"; +$a->strings["Reputable, has my trust"] = "Seriös, hat mein Vertrauen"; +$a->strings["Frequently"] = "immer wieder"; +$a->strings["Hourly"] = "Stündlich"; +$a->strings["Twice daily"] = "Zweimal täglich"; +$a->strings["Daily"] = "Täglich"; +$a->strings["Weekly"] = "Wöchentlich"; +$a->strings["Monthly"] = "Monatlich"; +$a->strings["Friendica"] = "Friendica"; +$a->strings["OStatus"] = "OStatus"; +$a->strings["RSS/Atom"] = "RSS/Atom"; +$a->strings["Email"] = "E-Mail"; +$a->strings["Diaspora"] = "Diaspora"; +$a->strings["Facebook"] = "Facebook"; +$a->strings["Zot!"] = "Zott"; +$a->strings["LinkedIn"] = "LinkedIn"; +$a->strings["XMPP/IM"] = "XMPP/Chat"; +$a->strings["MySpace"] = "MySpace"; +$a->strings["Google+"] = "Google+"; +$a->strings["pump.io"] = "pump.io"; +$a->strings["Twitter"] = "Twitter"; +$a->strings["Diaspora Connector"] = "Diaspora"; +$a->strings["GNU Social"] = "GNU Social"; +$a->strings["App.net"] = "App.net"; +$a->strings["Hubzilla/Redmatrix"] = "Hubzilla/Redmatrix"; $a->strings["%1\$s attends %2\$s's %3\$s"] = "%1\$s nimmt an %2\$ss %3\$s teil."; $a->strings["%1\$s doesn't attend %2\$s's %3\$s"] = "%1\$s nimmt nicht an %2\$ss %3\$s teil."; $a->strings["%1\$s attends maybe %2\$s's %3\$s"] = "%1\$s nimmt eventuell an %2\$ss %3\$s teil."; @@ -426,7 +671,6 @@ $a->strings["Preview"] = "Vorschau"; $a->strings["Post to Groups"] = "Poste an Gruppe"; $a->strings["Post to Contacts"] = "Poste an Kontakte"; $a->strings["Private post"] = "Privater Beitrag"; -$a->strings["Message"] = "Nachricht"; $a->strings["Browser"] = "Browser"; $a->strings["View all"] = "Zeige alle"; $a->strings["Like"] = array( @@ -441,286 +685,21 @@ $a->strings["Not Attending"] = array( 0 => "Nicht teilnehmend ", 1 => "Nicht teilnehmend", ); -$a->strings["Requested account is not available."] = "Das angefragte Profil ist nicht vorhanden."; -$a->strings["Requested profile is not available."] = "Das angefragte Profil ist nicht vorhanden."; -$a->strings["Edit profile"] = "Profil bearbeiten"; -$a->strings["Atom feed"] = "Atom-Feed"; -$a->strings["Profiles"] = "Profile"; -$a->strings["Manage/edit profiles"] = "Profile verwalten/editieren"; -$a->strings["Change profile photo"] = "Profilbild ändern"; -$a->strings["Create New Profile"] = "Neues Profil anlegen"; -$a->strings["Profile Image"] = "Profilbild"; -$a->strings["visible to everybody"] = "sichtbar für jeden"; -$a->strings["Edit visibility"] = "Sichtbarkeit bearbeiten"; -$a->strings["Forum"] = "Forum"; -$a->strings["Gender:"] = "Geschlecht:"; -$a->strings["Status:"] = "Status:"; -$a->strings["Homepage:"] = "Homepage:"; -$a->strings["About:"] = "Über:"; -$a->strings["Network:"] = "Netzwerk"; -$a->strings["g A l F d"] = "l, d. F G \\U\\h\\r"; -$a->strings["F d"] = "d. F"; -$a->strings["[today]"] = "[heute]"; -$a->strings["Birthday Reminders"] = "Geburtstagserinnerungen"; -$a->strings["Birthdays this week:"] = "Geburtstage diese Woche:"; -$a->strings["[No description]"] = "[keine Beschreibung]"; -$a->strings["Event Reminders"] = "Veranstaltungserinnerungen"; -$a->strings["Events this week:"] = "Veranstaltungen diese Woche"; -$a->strings["Profile"] = "Profil"; -$a->strings["Full Name:"] = "Kompletter Name:"; -$a->strings["j F, Y"] = "j F, Y"; -$a->strings["j F"] = "j F"; -$a->strings["Age:"] = "Alter:"; -$a->strings["for %1\$d %2\$s"] = "für %1\$d %2\$s"; -$a->strings["Sexual Preference:"] = "Sexuelle Vorlieben:"; -$a->strings["Hometown:"] = "Heimatort:"; -$a->strings["Tags:"] = "Tags"; -$a->strings["Political Views:"] = "Politische Ansichten:"; -$a->strings["Religion:"] = "Religion:"; -$a->strings["Hobbies/Interests:"] = "Hobbies/Interessen:"; -$a->strings["Likes:"] = "Likes:"; -$a->strings["Dislikes:"] = "Dislikes:"; -$a->strings["Contact information and Social Networks:"] = "Kontaktinformationen und Soziale Netzwerke:"; -$a->strings["Musical interests:"] = "Musikalische Interessen:"; -$a->strings["Books, literature:"] = "Literatur/Bücher:"; -$a->strings["Television:"] = "Fernsehen:"; -$a->strings["Film/dance/culture/entertainment:"] = "Filme/Tänze/Kultur/Unterhaltung:"; -$a->strings["Love/Romance:"] = "Liebesleben:"; -$a->strings["Work/employment:"] = "Arbeit/Beschäftigung:"; -$a->strings["School/education:"] = "Schule/Ausbildung:"; -$a->strings["Forums:"] = "Foren:"; -$a->strings["Basic"] = "Allgemein"; -$a->strings["Advanced"] = "Erweitert"; -$a->strings["Status"] = "Status"; -$a->strings["Status Messages and Posts"] = "Statusnachrichten und Beiträge"; -$a->strings["Profile Details"] = "Profildetails"; -$a->strings["Photos"] = "Bilder"; -$a->strings["Photo Albums"] = "Fotoalben"; -$a->strings["Videos"] = "Videos"; -$a->strings["Events"] = "Veranstaltungen"; -$a->strings["Events and Calendar"] = "Ereignisse und Kalender"; -$a->strings["Personal Notes"] = "Persönliche Notizen"; -$a->strings["Only You Can See This"] = "Nur Du kannst das sehen"; -$a->strings[" on Last.fm"] = " bei Last.fm"; -$a->strings["Disallowed profile URL."] = "Nicht erlaubte Profil-URL."; -$a->strings["Connect URL missing."] = "Connect-URL fehlt"; -$a->strings["This site is not configured to allow communications with other networks."] = "Diese Seite ist so konfiguriert, dass keine Kommunikation mit anderen Netzwerken erfolgen kann."; -$a->strings["No compatible communication protocols or feeds were discovered."] = "Es wurden keine kompatiblen Kommunikationsprotokolle oder Feeds gefunden."; -$a->strings["The profile address specified does not provide adequate information."] = "Die angegebene Profiladresse liefert unzureichende Informationen."; -$a->strings["An author or name was not found."] = "Es wurde kein Autor oder Name gefunden."; -$a->strings["No browser URL could be matched to this address."] = "Zu dieser Adresse konnte keine passende Browser URL gefunden werden."; -$a->strings["Unable to match @-style Identity Address with a known protocol or email contact."] = "Konnte die @-Adresse mit keinem der bekannten Protokolle oder Email-Kontakte abgleichen."; -$a->strings["Use mailto: in front of address to force email check."] = "Verwende mailto: vor der Email Adresse, um eine Überprüfung der E-Mail-Adresse zu erzwingen."; -$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "Die Adresse dieses Profils gehört zu einem Netzwerk, mit dem die Kommunikation auf dieser Seite ausgeschaltet wurde."; -$a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Eingeschränktes Profil. Diese Person wird keine direkten/privaten Nachrichten von Dir erhalten können."; -$a->strings["Unable to retrieve contact information."] = "Konnte die Kontaktinformationen nicht empfangen."; -$a->strings["following"] = "folgen"; +$a->strings["Sharing notification from Diaspora network"] = "Freigabe-Benachrichtigung von Diaspora"; +$a->strings["Attachments:"] = "Anhänge:"; +$a->strings["view full size"] = "Volle Größe anzeigen"; +$a->strings["Click here to upgrade."] = "Zum Upgraden hier klicken."; +$a->strings["This action exceeds the limits set by your subscription plan."] = "Diese Aktion überschreitet die Obergrenze Deines Abonnements."; +$a->strings["This action is not available under your subscription plan."] = "Diese Aktion ist in Deinem Abonnement nicht verfügbar."; $a->strings["stopped following"] = "wird nicht mehr gefolgt"; $a->strings["Drop Contact"] = "Kontakt löschen"; -$a->strings["Embedded content"] = "Eingebetteter Inhalt"; -$a->strings["Embedding disabled"] = "Einbettungen deaktiviert"; -$a->strings["Image/photo"] = "Bild/Foto"; -$a->strings["%2\$s %3\$s"] = "%2\$s %3\$s"; -$a->strings["$1 wrote:"] = "$1 hat geschrieben:"; -$a->strings["Encrypted content"] = "Verschlüsselter Inhalt"; -$a->strings["Unknown | Not categorised"] = "Unbekannt | Nicht kategorisiert"; -$a->strings["Block immediately"] = "Sofort blockieren"; -$a->strings["Shady, spammer, self-marketer"] = "Zwielichtig, Spammer, Selbstdarsteller"; -$a->strings["Known to me, but no opinion"] = "Ist mir bekannt, hab aber keine Meinung"; -$a->strings["OK, probably harmless"] = "OK, wahrscheinlich harmlos"; -$a->strings["Reputable, has my trust"] = "Seriös, hat mein Vertrauen"; -$a->strings["Frequently"] = "immer wieder"; -$a->strings["Hourly"] = "Stündlich"; -$a->strings["Twice daily"] = "Zweimal täglich"; -$a->strings["Daily"] = "Täglich"; -$a->strings["Weekly"] = "Wöchentlich"; -$a->strings["Monthly"] = "Monatlich"; -$a->strings["Friendica"] = "Friendica"; -$a->strings["OStatus"] = "OStatus"; -$a->strings["RSS/Atom"] = "RSS/Atom"; -$a->strings["Email"] = "E-Mail"; -$a->strings["Diaspora"] = "Diaspora"; -$a->strings["Facebook"] = "Facebook"; -$a->strings["Zot!"] = "Zott"; -$a->strings["LinkedIn"] = "LinkedIn"; -$a->strings["XMPP/IM"] = "XMPP/Chat"; -$a->strings["MySpace"] = "MySpace"; -$a->strings["Google+"] = "Google+"; -$a->strings["pump.io"] = "pump.io"; -$a->strings["Twitter"] = "Twitter"; -$a->strings["Diaspora Connector"] = "Diaspora"; -$a->strings["GNU Social"] = "GNU Social"; -$a->strings["App.net"] = "App.net"; -$a->strings["Hubzilla/Redmatrix"] = "Hubzilla/Redmatrix"; +$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["\n\t\t\tThe friendica developers released update %s recently,\n\t\t\tbut when I tried to install it, something went terribly wrong.\n\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."] = "\nDie Friendica-Entwickler haben vor kurzem das Update %s veröffentlicht, aber bei der Installation ging etwas schrecklich schief.\n\nDas Problem sollte so schnell wie möglich gelöst werden, aber ich schaffe es nicht alleine. Bitte kontaktiere einen Friendica-Entwickler falls Du mir nicht alleine helfen kannst. Meine Datenbank könnte ungültig sein."; $a->strings["The error message is\n[pre]%s[/pre]"] = "Die Fehlermeldung lautet\n[pre]%s[/pre]"; $a->strings["Errors encountered creating database tables."] = "Fehler aufgetreten während der Erzeugung der Datenbanktabellen."; $a->strings["Errors encountered performing database changes."] = "Es sind Fehler beim Bearbeiten der Datenbank aufgetreten."; -$a->strings["Logged out."] = "Abgemeldet."; -$a->strings["Login failed."] = "Anmeldung fehlgeschlagen."; -$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Beim Versuch Dich mit der von Dir angegebenen OpenID anzumelden trat ein Problem auf. Bitte überprüfe, dass Du die OpenID richtig geschrieben hast."; -$a->strings["The error message was:"] = "Die Fehlermeldung lautete:"; -$a->strings["view full size"] = "Volle Größe anzeigen"; -$a->strings["A deleted group with this name was revived. Existing item permissions may apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Eine gelöschte Gruppe mit diesem Namen wurde wiederbelebt. Bestehende Berechtigungseinstellungen könnten auf diese Gruppe oder zukünftige Mitglieder angewandt werden. Falls Du dies nicht möchtest, erstelle bitte eine andere Gruppe mit einem anderen Namen."; -$a->strings["Default privacy group for new contacts"] = "Voreingestellte Gruppe für neue Kontakte"; -$a->strings["Everybody"] = "Alle Kontakte"; -$a->strings["edit"] = "bearbeiten"; -$a->strings["Groups"] = "Gruppen"; -$a->strings["Edit groups"] = "Gruppen bearbeiten"; -$a->strings["Edit group"] = "Gruppe bearbeiten"; -$a->strings["Create a new group"] = "Neue Gruppe erstellen"; -$a->strings["Group Name: "] = "Gruppenname:"; -$a->strings["Contacts not in any group"] = "Kontakte in keiner Gruppe"; -$a->strings["add"] = "hinzufügen"; -$a->strings["Wall Photos"] = "Pinnwand-Bilder"; -$a->strings["(no subject)"] = "(kein Betreff)"; -$a->strings["Passwords do not match. Password unchanged."] = "Die Passwörter stimmen nicht überein. Das Passwort bleibt unverändert."; -$a->strings["An invitation is required."] = "Du benötigst eine Einladung."; -$a->strings["Invitation could not be verified."] = "Die Einladung konnte nicht überprüft werden."; -$a->strings["Invalid OpenID url"] = "Ungültige OpenID URL"; -$a->strings["Please enter the required information."] = "Bitte trage die erforderlichen Informationen ein."; -$a->strings["Please use a shorter name."] = "Bitte verwende einen kürzeren Namen."; -$a->strings["Name too short."] = "Der Name ist zu kurz."; -$a->strings["That doesn't appear to be your full (First Last) name."] = "Das scheint nicht Dein kompletter Name (Vor- und Nachname) zu sein."; -$a->strings["Your email domain is not among those allowed on this site."] = "Die Domain Deiner E-Mail Adresse ist auf dieser Seite nicht erlaubt."; -$a->strings["Not a valid email address."] = "Keine gültige E-Mail-Adresse."; -$a->strings["Cannot use that email."] = "Konnte diese E-Mail-Adresse nicht verwenden."; -$a->strings["Your \"nickname\" can only contain \"a-z\", \"0-9\" and \"_\"."] = "Dein Spitzname darf nur aus Buchstaben und Zahlen (\"a-z\",\"0-9\" und \"_\") bestehen."; -$a->strings["Nickname is already registered. Please choose another."] = "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen."; -$a->strings["Nickname was once registered here and may not be re-used. Please choose another."] = "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen."; -$a->strings["SERIOUS ERROR: Generation of security keys failed."] = "FATALER FEHLER: Sicherheitsschlüssel konnten nicht erzeugt werden."; -$a->strings["An error occurred during registration. Please try again."] = "Während der Anmeldung ist ein Fehler aufgetreten. Bitte versuche es noch einmal."; -$a->strings["default"] = "Standard"; -$a->strings["An error occurred creating your default profile. Please try again."] = "Bei der Erstellung des Standardprofils ist ein Fehler aufgetreten. Bitte versuche es noch einmal."; -$a->strings["Profile Photos"] = "Profilbilder"; -$a->strings["\n\t\tDear %1\$s,\n\t\t\tThank you for registering at %2\$s. Your account has been created.\n\t"] = "\nHallo %1\$s,\n\ndanke für Deine Registrierung auf %2\$s. Dein Account wurde eingerichtet."; -$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["Registration details for %s"] = "Details der Registration von %s"; -$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["General Features"] = "Allgemeine Features"; -$a->strings["Multiple Profiles"] = "Mehrere Profile"; -$a->strings["Ability to create multiple profiles"] = "Möglichkeit mehrere Profile zu erstellen"; -$a->strings["Photo Location"] = "Aufnahmeort"; -$a->strings["Photo metadata is normally stripped. This extracts the location (if present) prior to stripping metadata and links it to a map."] = "Die Foto-Metadaten werden ausgelesen. Dadurch kann der Aufnahmeort (wenn vorhanden) in einer Karte angezeigt werden."; -$a->strings["Export Public Calendar"] = "Öffentlichen Kalender exportieren"; -$a->strings["Ability for visitors to download the public calendar"] = "Möglichkeit für Besucher den öffentlichen Kalender herunter zu laden"; -$a->strings["Post Composition Features"] = "Beitragserstellung Features"; -$a->strings["Richtext Editor"] = "Web-Editor"; -$a->strings["Enable richtext editor"] = "Den Web-Editor für neue Beiträge aktivieren"; -$a->strings["Post Preview"] = "Beitragsvorschau"; -$a->strings["Allow previewing posts and comments before publishing them"] = "Die Vorschau von Beiträgen und Kommentaren vor dem absenden erlauben."; -$a->strings["Auto-mention Forums"] = "Foren automatisch erwähnen"; -$a->strings["Add/remove mention when a fourm page is selected/deselected in ACL window."] = "Automatisch eine @-Erwähnung eines Forums einfügen/entfehrnen, wenn dieses im ACL Fenster de-/markiert wurde."; -$a->strings["Network Sidebar Widgets"] = "Widgets für Netzwerk und Seitenleiste"; -$a->strings["Search by Date"] = "Archiv"; -$a->strings["Ability to select posts by date ranges"] = "Möglichkeit die Beiträge nach Datumsbereichen zu sortieren"; -$a->strings["List Forums"] = "Zeige Foren"; -$a->strings["Enable widget to display the forums your are connected with"] = "Aktiviere Widget, um die Foren mit denen du verbunden bist anzuzeigen"; -$a->strings["Group Filter"] = "Gruppen Filter"; -$a->strings["Enable widget to display Network posts only from selected group"] = "Widget zur Darstellung der Beiträge nach Kontaktgruppen sortiert aktivieren."; -$a->strings["Network Filter"] = "Netzwerk Filter"; -$a->strings["Enable widget to display Network posts only from selected network"] = "Widget zum filtern der Beiträge in Abhängigkeit des Netzwerks aus dem der Ersteller sendet aktivieren."; -$a->strings["Saved Searches"] = "Gespeicherte Suchen"; -$a->strings["Save search terms for re-use"] = "Speichere Suchanfragen für spätere Wiederholung."; -$a->strings["Network Tabs"] = "Netzwerk Reiter"; -$a->strings["Network Personal Tab"] = "Netzwerk-Reiter: Persönlich"; -$a->strings["Enable tab to display only Network posts that you've interacted on"] = "Aktiviert einen Netzwerk-Reiter in dem Nachrichten angezeigt werden mit denen Du interagiert hast"; -$a->strings["Network New Tab"] = "Netzwerk-Reiter: Neue"; -$a->strings["Enable tab to display only new Network posts (from the last 12 hours)"] = "Aktiviert einen Netzwerk-Reiter in dem ausschließlich neue Beiträge (der letzten 12 Stunden) angezeigt werden"; -$a->strings["Network Shared Links Tab"] = "Netzwerk-Reiter: Geteilte Links"; -$a->strings["Enable tab to display only Network posts with links in them"] = "Aktiviert einen Netzwerk-Reiter der ausschließlich Nachrichten mit Links enthält"; -$a->strings["Post/Comment Tools"] = "Werkzeuge für Beiträge und Kommentare"; -$a->strings["Multiple Deletion"] = "Mehrere Beiträge löschen"; -$a->strings["Select and delete multiple posts/comments at once"] = "Mehrere Beiträge/Kommentare markieren und gleichzeitig löschen"; -$a->strings["Edit Sent Posts"] = "Gesendete Beiträge editieren"; -$a->strings["Edit and correct posts and comments after sending"] = "Erlaubt es Beiträge und Kommentare nach dem Senden zu editieren bzw.zu korrigieren."; -$a->strings["Tagging"] = "Tagging"; -$a->strings["Ability to tag existing posts"] = "Möglichkeit bereits existierende Beiträge nachträglich mit Tags zu versehen."; -$a->strings["Post Categories"] = "Beitragskategorien"; -$a->strings["Add categories to your posts"] = "Eigene Beiträge mit Kategorien versehen"; -$a->strings["Ability to file posts under folders"] = "Beiträge in Ordnern speichern aktivieren"; -$a->strings["Dislike Posts"] = "Beiträge 'nicht mögen'"; -$a->strings["Ability to dislike posts/comments"] = "Ermöglicht es Beiträge mit einem Klick 'nicht zu mögen'"; -$a->strings["Star Posts"] = "Beiträge Markieren"; -$a->strings["Ability to mark special posts with a star indicator"] = "Erlaubt es Beiträge mit einem Stern-Indikator zu markieren"; -$a->strings["Mute Post Notifications"] = "Benachrichtigungen für Beiträge Stumm schalten"; -$a->strings["Ability to mute notifications for a thread"] = "Möglichkeit Benachrichtigungen für einen Thread abbestellen zu können"; -$a->strings["Advanced Profile Settings"] = "Erweiterte Profil-Einstellungen"; -$a->strings["Show visitors public community forums at the Advanced Profile Page"] = "Zeige Besuchern öffentliche Gemeinschafts-Foren auf der Erweiterten Profil-Seite"; -$a->strings["Nothing new here"] = "Keine Neuigkeiten"; -$a->strings["Clear notifications"] = "Bereinige Benachrichtigungen"; -$a->strings["End this session"] = "Diese Sitzung beenden"; -$a->strings["Your posts and conversations"] = "Deine Beiträge und Unterhaltungen"; -$a->strings["Your profile page"] = "Deine Profilseite"; -$a->strings["Your photos"] = "Deine Fotos"; -$a->strings["Your videos"] = "Deine Videos"; -$a->strings["Your events"] = "Deine Ereignisse"; -$a->strings["Personal notes"] = "Persönliche Notizen"; -$a->strings["Your personal notes"] = "Deine persönlichen Notizen"; -$a->strings["Sign in"] = "Anmelden"; -$a->strings["Home"] = "Pinnwand"; -$a->strings["Home Page"] = "Homepage"; -$a->strings["Create an account"] = "Nutzerkonto erstellen"; -$a->strings["Help"] = "Hilfe"; -$a->strings["Help and documentation"] = "Hilfe und Dokumentation"; -$a->strings["Apps"] = "Apps"; -$a->strings["Addon applications, utilities, games"] = "Addon Anwendungen, Dienstprogramme, Spiele"; -$a->strings["Search site content"] = "Inhalt der Seite durchsuchen"; -$a->strings["Community"] = "Gemeinschaft"; -$a->strings["Conversations on this site"] = "Unterhaltungen auf dieser Seite"; -$a->strings["Conversations on the network"] = "Unterhaltungen im Netzwerk"; -$a->strings["Directory"] = "Verzeichnis"; -$a->strings["People directory"] = "Nutzerverzeichnis"; -$a->strings["Information"] = "Information"; -$a->strings["Information about this friendica instance"] = "Informationen zu dieser Friendica Instanz"; -$a->strings["Network"] = "Netzwerk"; -$a->strings["Conversations from your friends"] = "Unterhaltungen Deiner Kontakte"; -$a->strings["Network Reset"] = "Netzwerk zurücksetzen"; -$a->strings["Load Network page with no filters"] = "Netzwerk-Seite ohne Filter laden"; -$a->strings["Introductions"] = "Kontaktanfragen"; -$a->strings["Friend Requests"] = "Kontaktanfragen"; -$a->strings["Notifications"] = "Benachrichtigungen"; -$a->strings["See all notifications"] = "Alle Benachrichtigungen anzeigen"; -$a->strings["Mark as seen"] = "Als gelesen markieren"; -$a->strings["Mark all system notifications seen"] = "Markiere alle Systembenachrichtigungen als gelesen"; -$a->strings["Messages"] = "Nachrichten"; -$a->strings["Private mail"] = "Private E-Mail"; -$a->strings["Inbox"] = "Eingang"; -$a->strings["Outbox"] = "Ausgang"; -$a->strings["New Message"] = "Neue Nachricht"; -$a->strings["Manage"] = "Verwalten"; -$a->strings["Manage other pages"] = "Andere Seiten verwalten"; -$a->strings["Delegations"] = "Delegationen"; -$a->strings["Delegate Page Management"] = "Delegiere das Management für die Seite"; -$a->strings["Settings"] = "Einstellungen"; -$a->strings["Account settings"] = "Kontoeinstellungen"; -$a->strings["Manage/Edit Profiles"] = "Profile Verwalten/Editieren"; -$a->strings["Manage/edit friends and contacts"] = " Kontakte verwalten/editieren"; -$a->strings["Admin"] = "Administration"; -$a->strings["Site setup and configuration"] = "Einstellungen der Seite und Konfiguration"; -$a->strings["Navigation"] = "Navigation"; -$a->strings["Site map"] = "Sitemap"; -$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["Hide your profile details from unknown viewers?"] = "Profil-Details vor unbekannten Betrachtern verbergen?"; -$a->strings["Visible to everybody"] = "Für jeden sichtbar"; -$a->strings["show"] = "zeigen"; -$a->strings["don't show"] = "nicht zeigen"; -$a->strings["CC: email addresses"] = "Cc: E-Mail-Addressen"; -$a->strings["Example: bob@example.com, mary@example.com"] = "Z.B.: bob@example.com, mary@example.com"; -$a->strings["Permissions"] = "Berechtigungen"; -$a->strings["Close"] = "Schließen"; -$a->strings["[no subject]"] = "[kein Betreff]"; -$a->strings["You must be logged in to use addons. "] = "Sie müssen angemeldet sein um Addons benutzen zu können."; -$a->strings["Not Found"] = "Nicht gefunden"; -$a->strings["Page not found."] = "Seite nicht gefunden."; -$a->strings["Permission denied"] = "Zugriff verweigert"; -$a->strings["toggle mobile"] = "auf/von Mobile Ansicht wechseln"; $a->strings["Account approved."] = "Konto freigegeben."; $a->strings["Registration revoked for %s"] = "Registrierung für %s wurde zurückgezogen"; $a->strings["Please login."] = "Bitte melde Dich an."; @@ -741,62 +720,6 @@ $a->strings["Only one search per minute is permitted for not logged in users."] $a->strings["No results."] = "Keine Ergebnisse."; $a->strings["Items tagged with: %s"] = "Beiträge die mit %s getaggt sind"; $a->strings["Results for: %s"] = "Ergebnisse für: %s"; -$a->strings["Invalid request identifier."] = "Invalid request identifier."; -$a->strings["Discard"] = "Verwerfen"; -$a->strings["Ignore"] = "Ignorieren"; -$a->strings["System"] = "System"; -$a->strings["Personal"] = "Persönlich"; -$a->strings["Show Ignored Requests"] = "Zeige ignorierte Anfragen"; -$a->strings["Hide Ignored Requests"] = "Verberge ignorierte Anfragen"; -$a->strings["Notification type: "] = "Benachrichtigungstyp: "; -$a->strings["Friend Suggestion"] = "Kontaktvorschlag"; -$a->strings["suggested by %s"] = "vorgeschlagen von %s"; -$a->strings["Hide this contact from others"] = "Verbirg diesen Kontakt vor andere"; -$a->strings["Post a new friend activity"] = "Neue-Kontakt Nachricht senden"; -$a->strings["if applicable"] = "falls anwendbar"; -$a->strings["Approve"] = "Genehmigen"; -$a->strings["Claims to be known to you: "] = "Behauptet Dich zu kennen: "; -$a->strings["yes"] = "ja"; -$a->strings["no"] = "nein"; -$a->strings["Shall your connection be bidirectional or not? \"Friend\" implies that you allow to read and you subscribe to their posts. \"Fan/Admirer\" means that you allow to read but you do not want to read theirs. Approve as: "] = "Soll Deine Beziehung beidseitig sein oder nicht? \"Kontakt\" bedeutet, ihr könnt gegenseitig die Beiträge des Anderen lesen dürft. \"Fan/Verehrer\", dass du das lesen deiner Beiträge erlaubst aber nicht die Beiträge der anderen Seite lesen möchtest. Genehmigen als:"; -$a->strings["Shall your connection be bidirectional or not? \"Friend\" implies that you allow to read and you subscribe to their posts. \"Sharer\" means that you allow to read but you do not want to read theirs. Approve as: "] = "Soll Deine Beziehung beidseitig sein oder nicht? \"Freund\" bedeutet, ihr gegenseitig die Beiträge des Anderen lesen dürft. \"Teilenden\", das du das lesen deiner Beiträge erlaubst aber nicht die Beiträge der anderen Seite lesen möchtest. Genehmigen als:"; -$a->strings["Friend"] = "Kontakt"; -$a->strings["Sharer"] = "Teilenden"; -$a->strings["Fan/Admirer"] = "Fan/Verehrer"; -$a->strings["Friend/Connect Request"] = "Kontakt-/Freundschaftsanfrage"; -$a->strings["New Follower"] = "Neuer Bewunderer"; -$a->strings["Profile URL"] = "Profil URL"; -$a->strings["No introductions."] = "Keine Kontaktanfragen."; -$a->strings["%s liked %s's post"] = "%s mag %ss Beitrag"; -$a->strings["%s disliked %s's post"] = "%s mag %ss Beitrag nicht"; -$a->strings["%s is now friends with %s"] = "%s ist jetzt mit %s befreundet"; -$a->strings["%s created a new post"] = "%s hat einen neuen Beitrag erstellt"; -$a->strings["%s commented on %s's post"] = "%s hat %ss Beitrag kommentiert"; -$a->strings["No more network notifications."] = "Keine weiteren Netzwerk-Benachrichtigungen."; -$a->strings["Network Notifications"] = "Netzwerk Benachrichtigungen"; -$a->strings["No more personal notifications."] = "Keine weiteren persönlichen Benachrichtigungen"; -$a->strings["Personal Notifications"] = "Persönliche Benachrichtigungen"; -$a->strings["No more home notifications."] = "Keine weiteren Pinnwand-Benachrichtigungen"; -$a->strings["Home Notifications"] = "Pinnwand Benachrichtigungen"; -$a->strings["Profile not found."] = "Profil nicht gefunden."; -$a->strings["Contact not found."] = "Kontakt nicht gefunden."; -$a->strings["This may occasionally happen if contact was requested by both persons and it has already been approved."] = "Das kann passieren, wenn sich zwei Kontakte gegenseitig eingeladen haben und bereits einer angenommen wurde."; -$a->strings["Response from remote site was not understood."] = "Antwort der Gegenstelle unverständlich."; -$a->strings["Unexpected response from remote site: "] = "Unerwartete Antwort der Gegenstelle: "; -$a->strings["Confirmation completed successfully."] = "Bestätigung erfolgreich abgeschlossen."; -$a->strings["Remote site reported: "] = "Gegenstelle meldet: "; -$a->strings["Temporary failure. Please wait and try again."] = "Zeitweiser Fehler. Bitte warte einige Momente und versuche es dann noch einmal."; -$a->strings["Introduction failed or was revoked."] = "Kontaktanfrage schlug fehl oder wurde zurückgezogen."; -$a->strings["Unable to set contact photo."] = "Konnte das Bild des Kontakts nicht speichern."; -$a->strings["No user record found for '%s' "] = "Für '%s' wurde kein Nutzer gefunden"; -$a->strings["Our site encryption key is apparently messed up."] = "Der Verschlüsselungsschlüssel unserer Seite ist anscheinend nicht in Ordnung."; -$a->strings["Empty site URL was provided or URL could not be decrypted by us."] = "Leere URL für die Seite erhalten oder die URL konnte nicht entschlüsselt werden."; -$a->strings["Contact record was not found for you on our site."] = "Für diesen Kontakt wurde auf unserer Seite kein Eintrag gefunden."; -$a->strings["Site public key not available in contact record for URL %s."] = "Die Kontaktdaten für URL %s enthalten keinen Public Key für den Server."; -$a->strings["The ID provided by your system is a duplicate on our system. It should work if you try again."] = "Die ID, die uns Dein System angeboten hat, ist hier bereits vergeben. Bitte versuche es noch einmal."; -$a->strings["Unable to set your contact credentials on our system."] = "Deine Kontaktreferenzen konnten nicht in unserem System gespeichert werden."; -$a->strings["Unable to update your contact profile details on our system"] = "Die Updates für Dein Profil konnten nicht gespeichert werden"; -$a->strings["%1\$s has joined %2\$s"] = "%1\$s ist %2\$s beigetreten"; $a->strings["This is Friendica, version"] = "Dies ist Friendica, Version"; $a->strings["running at web location"] = "die unter folgender Webadresse zu finden ist"; $a->strings["Please visit Friendica.com to learn more about the Friendica project."] = "Bitte besuche Friendica.com, um mehr über das Friendica Projekt zu erfahren."; @@ -811,6 +734,7 @@ $a->strings["\n\t\tDear %1\$s,\n\t\t\tA request was recently received at \"%2\$s $a->strings["\n\t\tFollow this link to verify your identity:\n\n\t\t%1\$s\n\n\t\tYou will then receive a follow-up message containing the new password.\n\t\tYou may change that password from your account settings page after logging in.\n\n\t\tThe login details are as follows:\n\n\t\tSite Location:\t%2\$s\n\t\tLogin Name:\t%3\$s"] = "\nUm Deine Identität zu verifizieren, folge bitte dem folgenden Link:\n\n%1\$s\n\nDu wirst eine weitere E-Mail mit Deinem neuen Passwort erhalten. Sobald Du Dich\nangemeldet hast, kannst Du Dein Passwort in den Einstellungen ändern.\n\nDie Anmeldedetails sind die folgenden:\n\nAdresse der Seite:\t%2\$s\nBenutzername:\t%3\$s"; $a->strings["Password reset requested at %s"] = "Anfrage zum Zurücksetzen des Passworts auf %s erhalten"; $a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Anfrage konnte nicht verifiziert werden. (Eventuell hast Du bereits eine ähnliche Anfrage gestellt.) Zurücksetzen des Passworts gescheitert."; +$a->strings["Password Reset"] = "Passwort zurücksetzen"; $a->strings["Your password has been reset as requested."] = "Dein Passwort wurde wie gewünscht zurückgesetzt."; $a->strings["Your new password is"] = "Dein neues Passwort lautet"; $a->strings["Save or copy your new password - and then"] = "Speichere oder kopiere Dein neues Passwort - und dann"; @@ -821,13 +745,17 @@ $a->strings["\n\t\t\t\tYour login details are as follows:\n\n\t\t\t\tSite Locati $a->strings["Your password has been changed at %s"] = "Auf %s wurde Dein Passwort geändert"; $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["No profile"] = "Kein Profil"; $a->strings["Help:"] = "Hilfe:"; +$a->strings["Not Found"] = "Nicht gefunden"; +$a->strings["Page not found."] = "Seite nicht gefunden."; $a->strings["Invalid request."] = "Ungültige Anfrage"; $a->strings["Image exceeds size limit of %s"] = "Bildgröße überschreitet das Limit von %s"; $a->strings["Unable to process image."] = "Konnte das Bild nicht bearbeiten."; $a->strings["Image upload failed."] = "Hochladen des Bildes gescheitert."; +$a->strings["Contact not found."] = "Kontakt nicht gefunden."; $a->strings["Friend suggestion sent."] = "Kontaktvorschlag gesendet."; $a->strings["Suggest Friends"] = "Kontakte vorschlagen"; $a->strings["Suggest a friend for %s"] = "Schlage %s einen Kontakt vor"; @@ -900,33 +828,13 @@ $a->strings["For more information about the Friendica project and why we feel it $a->strings["Contact Photos"] = "Kontaktbilder"; $a->strings["Files"] = "Dateien"; $a->strings["System down for maintenance"] = "System zur Wartung abgeschaltet"; +$a->strings["Permission denied"] = "Zugriff verweigert"; $a->strings["Invalid profile identifier."] = "Ungültiger Profil-Bezeichner."; $a->strings["Profile Visibility Editor"] = "Editor für die Profil-Sichtbarkeit"; $a->strings["Click on a contact to add or remove."] = "Klicke einen Kontakt an, um ihn hinzuzufügen oder zu entfernen"; $a->strings["Visible To"] = "Sichtbar für"; $a->strings["All Contacts (with secure profile access)"] = "Alle Kontakte (mit gesichertem Profilzugriff)"; $a->strings["No contacts."] = "Keine Kontakte."; -$a->strings["Contact settings applied."] = "Einstellungen zum Kontakt angewandt."; -$a->strings["Contact update failed."] = "Konnte den Kontakt nicht aktualisieren."; -$a->strings["WARNING: This is highly advanced and if you enter incorrect information your communications with this contact may stop working."] = "ACHTUNG: Das sind Experten-Einstellungen! Wenn Du etwas Falsches eingibst, funktioniert die Kommunikation mit diesem Kontakt evtl. nicht mehr."; -$a->strings["Please use your browser 'Back' button now if you are uncertain what to do on this page."] = "Bitte nutze den Zurück-Button Deines Browsers jetzt, wenn Du Dir unsicher bist, was Du tun willst."; -$a->strings["No mirroring"] = "Kein Spiegeln"; -$a->strings["Mirror as forwarded posting"] = "Spiegeln als weitergeleitete Beiträge"; -$a->strings["Mirror as my own posting"] = "Spiegeln als meine eigenen Beiträge"; -$a->strings["Return to contact editor"] = "Zurück zum Kontakteditor"; -$a->strings["Refetch contact data"] = "Kontaktdaten neu laden"; -$a->strings["Name"] = "Name"; -$a->strings["Account Nickname"] = "Konto-Spitzname"; -$a->strings["@Tagname - overrides Name/Nickname"] = "@Tagname - überschreibt Name/Spitzname"; -$a->strings["Account URL"] = "Konto-URL"; -$a->strings["Friend Request URL"] = "URL für Kontaktschaftsanfragen"; -$a->strings["Friend Confirm URL"] = "URL für Bestätigungen von Kontaktanfragen"; -$a->strings["Notification Endpoint URL"] = "URL-Endpunkt für Benachrichtigungen"; -$a->strings["Poll/Feed URL"] = "Pull/Feed-URL"; -$a->strings["New photo from this URL"] = "Neues Foto von dieser URL"; -$a->strings["Remote Self"] = "Entfernte Konten"; -$a->strings["Mirror postings from this contact"] = "Spiegle Beiträge dieses Kontakts"; -$a->strings["Mark this contact as remote_self, this will cause friendica to repost new entries from this contact."] = "Markiere diesen Kontakt als remote_self (entferntes Konto), dies veranlasst Friendica alle Top-Level Beiträge dieses Kontakts an all Deine Kontakte zu senden."; $a->strings["Tag removed"] = "Tag entfernt"; $a->strings["Remove Item Tag"] = "Gegenstands-Tag entfernen"; $a->strings["Select a tag to remove: "] = "Wähle ein Tag zum Entfernen aus: "; @@ -1180,6 +1088,7 @@ $a->strings["%s user deleted"] = array( $a->strings["User '%s' deleted"] = "Nutzer '%s' gelöscht"; $a->strings["User '%s' unblocked"] = "Nutzer '%s' entsperrt"; $a->strings["User '%s' blocked"] = "Nutzer '%s' gesperrt"; +$a->strings["Name"] = "Name"; $a->strings["Register date"] = "Anmeldedatum"; $a->strings["Last login"] = "Letzte Anmeldung"; $a->strings["Last item"] = "Letzter Beitrag"; @@ -1190,6 +1099,7 @@ $a->strings["User registrations waiting for confirm"] = "Neuanmeldungen, die auf $a->strings["User waiting for permanent deletion"] = "Nutzer wartet auf permanente Löschung"; $a->strings["Request date"] = "Anfragedatum"; $a->strings["No registrations."] = "Keine Neuanmeldungen."; +$a->strings["Approve"] = "Genehmigen"; $a->strings["Deny"] = "Verwehren"; $a->strings["Block"] = "Sperren"; $a->strings["Unblock"] = "Entsperren"; @@ -1240,47 +1150,6 @@ $a->strings["User not found"] = "Nutzer nicht gefunden"; $a->strings["This calendar format is not supported"] = "Dieses Kalenderformat wird nicht unterstützt."; $a->strings["No exportable data found"] = "Keine exportierbaren Daten gefunden"; $a->strings["calendar"] = "Kalender"; -$a->strings["No such group"] = "Es gibt keine solche Gruppe"; -$a->strings["Group is empty"] = "Gruppe ist leer"; -$a->strings["Group: %s"] = "Gruppe: %s"; -$a->strings["This entry was edited"] = "Dieser Beitrag wurde bearbeitet."; -$a->strings["%d comment"] = array( - 0 => "%d Kommentar", - 1 => "%d Kommentare", -); -$a->strings["Private Message"] = "Private Nachricht"; -$a->strings["I like this (toggle)"] = "Ich mag das (toggle)"; -$a->strings["like"] = "mag ich"; -$a->strings["I don't like this (toggle)"] = "Ich mag das nicht (toggle)"; -$a->strings["dislike"] = "mag ich nicht"; -$a->strings["Share this"] = "Weitersagen"; -$a->strings["share"] = "Teilen"; -$a->strings["This is you"] = "Das bist Du"; -$a->strings["Bold"] = "Fett"; -$a->strings["Italic"] = "Kursiv"; -$a->strings["Underline"] = "Unterstrichen"; -$a->strings["Quote"] = "Zitat"; -$a->strings["Code"] = "Code"; -$a->strings["Image"] = "Bild"; -$a->strings["Link"] = "Link"; -$a->strings["Video"] = "Video"; -$a->strings["Edit"] = "Bearbeiten"; -$a->strings["add star"] = "markieren"; -$a->strings["remove star"] = "Markierung entfernen"; -$a->strings["toggle star status"] = "Markierung umschalten"; -$a->strings["starred"] = "markiert"; -$a->strings["add tag"] = "Tag hinzufügen"; -$a->strings["ignore thread"] = "Thread ignorieren"; -$a->strings["unignore thread"] = "Thread nicht mehr ignorieren"; -$a->strings["toggle ignore status"] = "Ignoriert-Status ein-/ausschalten"; -$a->strings["ignored"] = "Ignoriert"; -$a->strings["save to folder"] = "In Ordner speichern"; -$a->strings["I will attend"] = "Ich werde teilnehmen"; -$a->strings["I will not attend"] = "Ich werde nicht teilnehmen"; -$a->strings["I might attend"] = "Ich werde eventuell teilnehmen"; -$a->strings["to"] = "zu"; -$a->strings["Wall-to-Wall"] = "Wall-to-Wall"; -$a->strings["via Wall-To-Wall:"] = "via Wall-To-Wall:"; $a->strings["Resubscribing to OStatus contacts"] = "Erneuern der OStatus Abonements"; $a->strings["Error"] = "Fehler"; $a->strings["Done"] = "Erledigt"; @@ -1299,78 +1168,6 @@ $a->strings["Access to this item is restricted."] = "Zugriff zu diesem Eintrag w $a->strings["View Album"] = "Album betrachten"; $a->strings["Recent Videos"] = "Neueste Videos"; $a->strings["Upload New Videos"] = "Neues Video hochladen"; -$a->strings["Profile deleted."] = "Profil gelöscht."; -$a->strings["Profile-"] = "Profil-"; -$a->strings["New profile created."] = "Neues Profil angelegt."; -$a->strings["Profile unavailable to clone."] = "Profil nicht zum Duplizieren verfügbar."; -$a->strings["Profile Name is required."] = "Profilname ist erforderlich."; -$a->strings["Marital Status"] = "Familienstand"; -$a->strings["Romantic Partner"] = "Romanze"; -$a->strings["Work/Employment"] = "Arbeit / Beschäftigung"; -$a->strings["Religion"] = "Religion"; -$a->strings["Political Views"] = "Politische Ansichten"; -$a->strings["Gender"] = "Geschlecht"; -$a->strings["Sexual Preference"] = "Sexuelle Vorlieben"; -$a->strings["Homepage"] = "Webseite"; -$a->strings["Interests"] = "Interessen"; -$a->strings["Address"] = "Adresse"; -$a->strings["Location"] = "Wohnort"; -$a->strings["Profile updated."] = "Profil aktualisiert."; -$a->strings[" and "] = " und "; -$a->strings["public profile"] = "öffentliches Profil"; -$a->strings["%1\$s changed %2\$s to “%3\$s”"] = "%1\$s hat %2\$s geändert auf “%3\$s”"; -$a->strings[" - Visit %1\$s's %2\$s"] = " – %1\$ss %2\$s besuchen"; -$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s hat folgendes aktualisiert %2\$s, verändert wurde %3\$s."; -$a->strings["Hide contacts and friends:"] = "Kontakte und Freunde verbergen"; -$a->strings["No"] = "Nein"; -$a->strings["Hide your contact/friend list from viewers of this profile?"] = "Liste der Kontakte vor Betrachtern dieses Profils verbergen?"; -$a->strings["Show more profile fields:"] = "Zeige mehr Profil-Felder:"; -$a->strings["Profile Actions"] = "Profilaktionen"; -$a->strings["Edit Profile Details"] = "Profil bearbeiten"; -$a->strings["Change Profile Photo"] = "Profilbild ändern"; -$a->strings["View this profile"] = "Dieses Profil anzeigen"; -$a->strings["Create a new profile using these settings"] = "Neues Profil anlegen und diese Einstellungen verwenden"; -$a->strings["Clone this profile"] = "Dieses Profil duplizieren"; -$a->strings["Delete this profile"] = "Dieses Profil löschen"; -$a->strings["Basic information"] = "Grundinformationen"; -$a->strings["Profile picture"] = "Profilbild"; -$a->strings["Preferences"] = "Vorlieben"; -$a->strings["Status information"] = "Status Informationen"; -$a->strings["Additional information"] = "Zusätzliche Informationen"; -$a->strings["Relation"] = "Beziehung"; -$a->strings["Upload Profile Photo"] = "Profilbild hochladen"; -$a->strings["Your Gender:"] = "Dein Geschlecht:"; -$a->strings["♥ Marital Status:"] = "♥ Beziehungsstatus:"; -$a->strings["Example: fishing photography software"] = "Beispiel: Fischen Fotografie Software"; -$a->strings["Profile Name:"] = "Profilname:"; -$a->strings["This is your public profile.
It may be visible to anybody using the internet."] = "Dies ist Dein öffentliches Profil.
Es könnte für jeden Nutzer des Internets sichtbar sein."; -$a->strings["Your Full Name:"] = "Dein kompletter Name:"; -$a->strings["Title/Description:"] = "Titel/Beschreibung:"; -$a->strings["Street Address:"] = "Adresse:"; -$a->strings["Locality/City:"] = "Wohnort:"; -$a->strings["Region/State:"] = "Region/Bundesstaat:"; -$a->strings["Postal/Zip Code:"] = "Postleitzahl:"; -$a->strings["Country:"] = "Land:"; -$a->strings["Who: (if applicable)"] = "Wer: (falls anwendbar)"; -$a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Beispiele: cathy123, Cathy Williams, cathy@example.com"; -$a->strings["Since [date]:"] = "Seit [Datum]:"; -$a->strings["Tell us about yourself..."] = "Erzähle uns ein bisschen von Dir …"; -$a->strings["Homepage URL:"] = "Adresse der Homepage:"; -$a->strings["Religious Views:"] = "Religiöse Ansichten:"; -$a->strings["Public Keywords:"] = "Öffentliche Schlüsselwörter:"; -$a->strings["(Used for suggesting potential friends, can be seen by others)"] = "(Wird verwendet, um potentielle Kontakte zu finden, kann von Kontakten eingesehen werden)"; -$a->strings["Private Keywords:"] = "Private Schlüsselwörter:"; -$a->strings["(Used for searching profiles, never shown to others)"] = "(Wird für die Suche nach Profilen verwendet und niemals veröffentlicht)"; -$a->strings["Musical interests"] = "Musikalische Interessen"; -$a->strings["Books, literature"] = "Bücher, Literatur"; -$a->strings["Television"] = "Fernsehen"; -$a->strings["Film/dance/culture/entertainment"] = "Filme/Tänze/Kultur/Unterhaltung"; -$a->strings["Hobbies/Interests"] = "Hobbies/Interessen"; -$a->strings["Love/romance"] = "Liebe/Romantik"; -$a->strings["Work/employment"] = "Arbeit/Anstellung"; -$a->strings["School/education"] = "Schule/Ausbildung"; -$a->strings["Contact information and Social Networks"] = "Kontaktinformationen und Soziale Netzwerke"; -$a->strings["Edit/Manage Profiles"] = "Bearbeite/Verwalte Profile"; $a->strings["Credits"] = "Credits"; $a->strings["Friendica is a community project, that would not be possible without the help of many people. Here is a list of those who have contributed to the code or the translation of Friendica. Thank you all!"] = "Friendica ist ein Gemeinschaftsprojekt, das nicht ohne die Hilfe vieler Personen möglich wäre. Hier ist eine Aufzählung der Personen, die zum Code oder der Übersetzung beigetragen haben. Dank an alle !"; $a->strings["- select -"] = "- auswählen -"; @@ -1379,50 +1176,6 @@ $a->strings["poke, prod or do other things to somebody"] = "Stupse Leute an oder $a->strings["Recipient"] = "Empfänger"; $a->strings["Choose what you wish to do to recipient"] = "Was willst Du mit dem Empfänger machen:"; $a->strings["Make this post private"] = "Diesen Beitrag privat machen"; -$a->strings["Recent Photos"] = "Neueste Fotos"; -$a->strings["Upload New Photos"] = "Neue Fotos hochladen"; -$a->strings["everybody"] = "jeder"; -$a->strings["Contact information unavailable"] = "Kontaktinformationen nicht verfügbar"; -$a->strings["Album not found."] = "Album nicht gefunden."; -$a->strings["Delete Album"] = "Album löschen"; -$a->strings["Do you really want to delete this photo album and all its photos?"] = "Möchtest Du wirklich dieses Foto-Album und all seine Foto löschen?"; -$a->strings["Delete Photo"] = "Foto löschen"; -$a->strings["Do you really want to delete this photo?"] = "Möchtest Du wirklich dieses Foto löschen?"; -$a->strings["%1\$s was tagged in %2\$s by %3\$s"] = "%1\$s wurde von %3\$s in %2\$s getaggt"; -$a->strings["a photo"] = "einem Foto"; -$a->strings["Image file is empty."] = "Bilddatei ist leer."; -$a->strings["No photos selected"] = "Keine Bilder ausgewählt"; -$a->strings["You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."] = "Du verwendest %1$.2f Mbyte von %2$.2f Mbyte des Foto-Speichers."; -$a->strings["Upload Photos"] = "Bilder hochladen"; -$a->strings["New album name: "] = "Name des neuen Albums: "; -$a->strings["or existing album name: "] = "oder existierender Albumname: "; -$a->strings["Do not show a status post for this upload"] = "Keine Status-Mitteilung für diesen Beitrag anzeigen"; -$a->strings["Show to Groups"] = "Zeige den Gruppen"; -$a->strings["Show to Contacts"] = "Zeige den Kontakten"; -$a->strings["Private Photo"] = "Privates Foto"; -$a->strings["Public Photo"] = "Öffentliches Foto"; -$a->strings["Edit Album"] = "Album bearbeiten"; -$a->strings["Show Newest First"] = "Zeige neueste zuerst"; -$a->strings["Show Oldest First"] = "Zeige älteste zuerst"; -$a->strings["View Photo"] = "Foto betrachten"; -$a->strings["Permission denied. Access to this item may be restricted."] = "Zugriff verweigert. Zugriff zu diesem Eintrag könnte eingeschränkt sein."; -$a->strings["Photo not available"] = "Foto nicht verfügbar"; -$a->strings["View photo"] = "Fotos ansehen"; -$a->strings["Edit photo"] = "Foto bearbeiten"; -$a->strings["Use as profile photo"] = "Als Profilbild verwenden"; -$a->strings["View Full Size"] = "Betrachte Originalgröße"; -$a->strings["Tags: "] = "Tags: "; -$a->strings["[Remove any tag]"] = "[Tag entfernen]"; -$a->strings["New album name"] = "Name des neuen Albums"; -$a->strings["Caption"] = "Bildunterschrift"; -$a->strings["Add a Tag"] = "Tag hinzufügen"; -$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"] = "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"; -$a->strings["Do not rotate"] = "Nicht rotieren"; -$a->strings["Rotate CW (right)"] = "Drehen US (rechts)"; -$a->strings["Rotate CCW (left)"] = "Drehen EUS (links)"; -$a->strings["Private photo"] = "Privates Foto"; -$a->strings["Public photo"] = "Öffentliches Foto"; -$a->strings["Map"] = "Karte"; $a->strings["Friendica Communications Server - Setup"] = "Friendica-Server für soziale Netzwerke – Setup"; $a->strings["Could not connect to database."] = "Verbindung zur Datenbank gescheitert."; $a->strings["Could not create table."] = "Tabelle konnte nicht angelegt werden."; @@ -1499,86 +1252,6 @@ $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for t $a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s folgt %2\$s %3\$s"; $a->strings["Item not available."] = "Beitrag nicht verfügbar."; $a->strings["Item was not found."] = "Beitrag konnte nicht gefunden werden."; -$a->strings["%d contact edited."] = array( - 0 => "%d Kontakt bearbeitet.", - 1 => "%d Kontakte bearbeitet.", -); -$a->strings["Could not access contact record."] = "Konnte nicht auf die Kontaktdaten zugreifen."; -$a->strings["Could not locate selected profile."] = "Konnte das ausgewählte Profil nicht finden."; -$a->strings["Contact updated."] = "Kontakt aktualisiert."; -$a->strings["Failed to update contact record."] = "Aktualisierung der Kontaktdaten fehlgeschlagen."; -$a->strings["Contact has been blocked"] = "Kontakt wurde blockiert"; -$a->strings["Contact has been unblocked"] = "Kontakt wurde wieder freigegeben"; -$a->strings["Contact has been ignored"] = "Kontakt wurde ignoriert"; -$a->strings["Contact has been unignored"] = "Kontakt wird nicht mehr ignoriert"; -$a->strings["Contact has been archived"] = "Kontakt wurde archiviert"; -$a->strings["Contact has been unarchived"] = "Kontakt wurde aus dem Archiv geholt"; -$a->strings["Do you really want to delete this contact?"] = "Möchtest Du wirklich diesen Kontakt löschen?"; -$a->strings["Contact has been removed."] = "Kontakt wurde entfernt."; -$a->strings["You are mutual friends with %s"] = "Du hast mit %s eine beidseitige Freundschaft"; -$a->strings["You are sharing with %s"] = "Du teilst mit %s"; -$a->strings["%s is sharing with you"] = "%s teilt mit Dir"; -$a->strings["Private communications are not available for this contact."] = "Private Kommunikation ist für diesen Kontakt nicht verfügbar."; -$a->strings["(Update was successful)"] = "(Aktualisierung war erfolgreich)"; -$a->strings["(Update was not successful)"] = "(Aktualisierung war nicht erfolgreich)"; -$a->strings["Suggest friends"] = "Kontakte vorschlagen"; -$a->strings["Network type: %s"] = "Netzwerktyp: %s"; -$a->strings["Communications lost with this contact!"] = "Verbindungen mit diesem Kontakt verloren!"; -$a->strings["Fetch further information for feeds"] = "Weitere Informationen zu Feeds holen"; -$a->strings["Fetch information"] = "Beziehe Information"; -$a->strings["Fetch information and keywords"] = "Beziehe Information und Schlüsselworte"; -$a->strings["Profile Visibility"] = "Profil-Sichtbarkeit"; -$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Bitte wähle eines Deiner Profile das angezeigt werden soll, wenn %s Dein Profil aufruft."; -$a->strings["Contact Information / Notes"] = "Kontakt Informationen / Notizen"; -$a->strings["Edit contact notes"] = "Notizen zum Kontakt bearbeiten"; -$a->strings["Block/Unblock contact"] = "Kontakt blockieren/freischalten"; -$a->strings["Ignore contact"] = "Ignoriere den Kontakt"; -$a->strings["Repair URL settings"] = "URL Einstellungen reparieren"; -$a->strings["View conversations"] = "Unterhaltungen anzeigen"; -$a->strings["Last update:"] = "Letzte Aktualisierung: "; -$a->strings["Update public posts"] = "Öffentliche Beiträge aktualisieren"; -$a->strings["Update now"] = "Jetzt aktualisieren"; -$a->strings["Unignore"] = "Ignorieren aufheben"; -$a->strings["Currently blocked"] = "Derzeit geblockt"; -$a->strings["Currently ignored"] = "Derzeit ignoriert"; -$a->strings["Currently archived"] = "Momentan archiviert"; -$a->strings["Replies/likes to your public posts may still be visible"] = "Antworten/Likes auf deine öffentlichen Beiträge könnten weiterhin sichtbar sein"; -$a->strings["Notification for new posts"] = "Benachrichtigung bei neuen Beiträgen"; -$a->strings["Send a notification of every new post of this contact"] = "Sende eine Benachrichtigung, wann immer dieser Kontakt einen neuen Beitrag schreibt."; -$a->strings["Blacklisted keywords"] = "Blacklistete Schlüsselworte "; -$a->strings["Comma separated list of keywords that should not be converted to hashtags, when \"Fetch information and keywords\" is selected"] = "Komma-Separierte Liste mit Schlüsselworten, die nicht in Hashtags konvertiert werden, wenn \"Beziehe Information und Schlüsselworte\" aktiviert wurde"; -$a->strings["Actions"] = "Aktionen"; -$a->strings["Contact Settings"] = "Kontakteinstellungen"; -$a->strings["Suggestions"] = "Kontaktvorschläge"; -$a->strings["Suggest potential friends"] = "Kontakte vorschlagen"; -$a->strings["All Contacts"] = "Alle Kontakte"; -$a->strings["Show all contacts"] = "Alle Kontakte anzeigen"; -$a->strings["Unblocked"] = "Ungeblockt"; -$a->strings["Only show unblocked contacts"] = "Nur nicht-blockierte Kontakte anzeigen"; -$a->strings["Blocked"] = "Geblockt"; -$a->strings["Only show blocked contacts"] = "Nur blockierte Kontakte anzeigen"; -$a->strings["Ignored"] = "Ignoriert"; -$a->strings["Only show ignored contacts"] = "Nur ignorierte Kontakte anzeigen"; -$a->strings["Archived"] = "Archiviert"; -$a->strings["Only show archived contacts"] = "Nur archivierte Kontakte anzeigen"; -$a->strings["Hidden"] = "Verborgen"; -$a->strings["Only show hidden contacts"] = "Nur verborgene Kontakte anzeigen"; -$a->strings["Search your contacts"] = "Suche in deinen Kontakten"; -$a->strings["Update"] = "Aktualisierungen"; -$a->strings["Archive"] = "Archivieren"; -$a->strings["Unarchive"] = "Aus Archiv zurückholen"; -$a->strings["Batch Actions"] = ""; -$a->strings["View all contacts"] = "Alle Kontakte anzeigen"; -$a->strings["Common Friends"] = "Gemeinsame Kontakte"; -$a->strings["View all common friends"] = "Alle Kontakte anzeigen"; -$a->strings["Advanced Contact Settings"] = "Fortgeschrittene Kontakteinstellungen"; -$a->strings["Mutual Friendship"] = "Beidseitige Freundschaft"; -$a->strings["is a fan of yours"] = "ist ein Fan von dir"; -$a->strings["you are a fan of"] = "Du bist Fan von"; -$a->strings["Toggle Blocked status"] = "Geblockt-Status ein-/ausschalten"; -$a->strings["Toggle Ignored status"] = "Ignoriert-Status ein-/ausschalten"; -$a->strings["Toggle Archive status"] = "Archiviert-Status ein-/ausschalten"; -$a->strings["Delete contact"] = "Lösche den Kontakt"; $a->strings["Submit Request"] = "Anfrage abschicken"; $a->strings["You already added this contact."] = "Du hast den Kontakt bereits hinzugefügt."; $a->strings["Diaspora support isn't enabled. Contact can't be added."] = "Diaspora Unterstützung ist nicht aktiviert. Der Kontakt kann nicht zugefügt werden."; @@ -1586,9 +1259,12 @@ $a->strings["OStatus support is disabled. Contact can't be added."] = "OStatus U $a->strings["The network type couldn't be detected. Contact can't be added."] = "Der Netzwerktype wurde nicht erkannt. Der Kontakt kann nicht hinzugefügt werden."; $a->strings["Please answer the following:"] = "Bitte beantworte folgendes:"; $a->strings["Does %s know you?"] = "Kennt %s Dich?"; +$a->strings["No"] = "Nein"; $a->strings["Add a personal note:"] = "Eine persönliche Notiz beifügen:"; $a->strings["Your Identity Address:"] = "Adresse Deines Profils:"; +$a->strings["Profile URL"] = "Profil URL"; $a->strings["Contact added"] = "Kontakt hinzugefügt"; +$a->strings["You must be logged in to use addons. "] = "Sie müssen angemeldet sein um Addons benutzen zu können."; $a->strings["Applications"] = "Anwendungen"; $a->strings["No installed applications."] = "Keine Applikationen installiert."; $a->strings["Do you really want to delete this suggestion?"] = "Möchtest Du wirklich diese Empfehlung löschen?"; @@ -1597,6 +1273,7 @@ $a->strings["Ignore/Hide"] = "Ignorieren/Verbergen"; $a->strings["Not Extended"] = "Nicht erweitert."; $a->strings["Item has been removed."] = "Eintrag wurde entfernt."; $a->strings["No contacts in common."] = "Keine gemeinsamen Kontakte."; +$a->strings["Common Friends"] = "Gemeinsame Kontakte"; $a->strings["Welcome to Friendica"] = "Willkommen bei Friendica"; $a->strings["New Member Checklist"] = "Checkliste für neue Mitglieder"; $a->strings["We would like to offer some tips and links to help make your experience enjoyable. Click any item to visit the relevant page. A link to this page will be visible from your home page for two weeks after your initial registration and then will quietly disappear."] = "Wir möchten Dir einige Tipps und Links anbieten, die Dir helfen könnten, den Einstieg angenehmer zu machen. Klicke auf ein Element, um die entsprechende Seite zu besuchen. Ein Link zu dieser Seite hier bleibt für Dich an Deiner Pinnwand für zwei Wochen nach dem Registrierungsdatum sichtbar und wird dann verschwinden."; @@ -1606,6 +1283,7 @@ $a->strings["On your Quick Start page - find a brief introduction to yo $a->strings["Go to Your Settings"] = "Gehe zu deinen Einstellungen"; $a->strings["On your Settings page - change your initial password. Also make a note of your Identity Address. This looks just like an email address - and will be useful in making friends on the free social web."] = "Ändere bitte unter Einstellungen dein Passwort. Außerdem merke dir deine Identifikationsadresse. Diese sieht aus wie eine E-Mail-Adresse und wird benötigt, um Kontakte mit anderen im Friendica Netzwerk zu knüpfen.."; $a->strings["Review the other settings, particularly the privacy settings. An unpublished directory listing is like having an unlisted phone number. In general, you should probably publish your listing - unless all of your friends and potential friends know exactly how to find you."] = "Überprüfe die restlichen Einstellungen, insbesondere die Einstellungen zur Privatsphäre. Wenn Du Dein Profil nicht veröffentlichst, ist das als wenn Du Deine Telefonnummer nicht ins Telefonbuch einträgst. Im Allgemeinen solltest Du es veröffentlichen - außer all Deine Kontakte und potentiellen Kontakte wissen genau, wie sie Dich finden können."; +$a->strings["Upload Profile Photo"] = "Profilbild hochladen"; $a->strings["Upload a profile photo if you have not done so already. Studies have shown that people with real photos of themselves are ten times more likely to make friends than people who do not."] = "Lade ein Profilbild hoch, falls Du es noch nicht getan hast. Studien haben gezeigt, dass es zehnmal wahrscheinlicher ist neue Kontakte zu finden, wenn Du ein Bild von Dir selbst verwendest, als wenn Du dies nicht tust."; $a->strings["Edit Your Profile"] = "Editiere dein Profil"; $a->strings["Edit your default profile to your liking. Review the settings for hiding your list of friends and hiding the profile from unknown visitors."] = "Editiere Dein Standard Profil nach Deinen Vorlieben. Überprüfe die Einstellungen zum Verbergen Deiner Kontaktliste vor unbekannten Betrachtern des Profils."; @@ -1639,12 +1317,16 @@ $a->strings["Warning: This group contains %s member from an insecure network."] 1 => "Warnung: Diese Gruppe beinhaltet %s Personen aus unsicheren Netzwerken.", ); $a->strings["Private messages to this group are at risk of public disclosure."] = "Private Nachrichten an diese Gruppe könnten an die Öffentlichkeit geraten."; +$a->strings["No such group"] = "Es gibt keine solche Gruppe"; +$a->strings["Group is empty"] = "Gruppe ist leer"; +$a->strings["Group: %s"] = "Gruppe: %s"; $a->strings["Private messages to this person are at risk of public disclosure."] = "Private Nachrichten an diese Person könnten an die Öffentlichkeit gelangen."; $a->strings["Invalid contact."] = "Ungültiger Kontakt."; $a->strings["Commented Order"] = "Neueste Kommentare"; $a->strings["Sort by Comment Date"] = "Nach Kommentardatum sortieren"; $a->strings["Posted Order"] = "Neueste Beiträge"; $a->strings["Sort by Post Date"] = "Nach Beitragsdatum sortieren"; +$a->strings["Personal"] = "Persönlich"; $a->strings["Posts that mention or involve you"] = "Beiträge, in denen es um Dich geht"; $a->strings["New"] = "Neue"; $a->strings["Activity Stream - by date"] = "Aktivitäten-Stream - nach Datum"; @@ -1670,40 +1352,7 @@ $a->strings["Group removed."] = "Gruppe entfernt."; $a->strings["Unable to remove group."] = "Konnte die Gruppe nicht entfernen."; $a->strings["Group Editor"] = "Gruppeneditor"; $a->strings["Members"] = "Mitglieder"; -$a->strings["This introduction has already been accepted."] = "Diese Kontaktanfrage wurde bereits akzeptiert."; -$a->strings["Profile location is not valid or does not contain profile information."] = "Profiladresse ist ungültig oder stellt keine Profildaten zur Verfügung."; -$a->strings["Warning: profile location has no identifiable owner name."] = "Warnung: Es konnte kein Name des Besitzers von der angegebenen Profiladresse gefunden werden."; -$a->strings["Warning: profile location has no profile photo."] = "Warnung: Es gibt kein Profilbild bei der angegebenen Profiladresse."; -$a->strings["%d required parameter was not found at the given location"] = array( - 0 => "%d benötigter Parameter wurde an der angegebenen Stelle nicht gefunden", - 1 => "%d benötigte Parameter wurden an der angegebenen Stelle nicht gefunden", -); -$a->strings["Introduction complete."] = "Kontaktanfrage abgeschlossen."; -$a->strings["Unrecoverable protocol error."] = "Nicht behebbarer Protokollfehler."; -$a->strings["Profile unavailable."] = "Profil nicht verfügbar."; -$a->strings["%s has received too many connection requests today."] = "%s hat heute zu viele Kontaktanfragen erhalten."; -$a->strings["Spam protection measures have been invoked."] = "Maßnahmen zum Spamschutz wurden ergriffen."; -$a->strings["Friends are advised to please try again in 24 hours."] = "Freunde sind angehalten, es in 24 Stunden erneut zu versuchen."; -$a->strings["Invalid locator"] = "Ungültiger Locator"; -$a->strings["Invalid email address."] = "Ungültige E-Mail-Adresse."; -$a->strings["This account has not been configured for email. Request failed."] = "Dieses Konto ist nicht für E-Mail konfiguriert. Anfrage fehlgeschlagen."; -$a->strings["You have already introduced yourself here."] = "Du hast Dich hier bereits vorgestellt."; -$a->strings["Apparently you are already friends with %s."] = "Es scheint so, als ob Du bereits mit %s in Kontakt stehst."; -$a->strings["Invalid profile URL."] = "Ungültige Profil-URL."; -$a->strings["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"; -$a->strings["Hide this contact"] = "Verberge diesen Kontakt"; -$a->strings["Welcome home %s."] = "Willkommen zurück %s."; -$a->strings["Please confirm your introduction/connection request to %s."] = "Bitte bestätige Deine Kontaktanfrage bei %s."; -$a->strings["Please enter your 'Identity Address' from one of the following supported communications networks:"] = "Bitte gib die Adresse Deines Profils in einem der unterstützten sozialen Netzwerke an:"; -$a->strings["If you are not yet a member of the free social web, follow this link to find a public Friendica site and join us today."] = "Wenn du noch kein Mitglied dieses freien sozialen Netzwerks bist, folge diesem Link um einen öffentlichen Friendica-Server zu finden und beizutreten."; -$a->strings["Friend/Connection Request"] = "Kontaktanfrage"; -$a->strings["Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"] = "Beispiele: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"; -$a->strings["StatusNet/Federated Social Web"] = "StatusNet/Federated Social Web"; -$a->strings[" - please do not use this form. Instead, enter %s into your Diaspora search bar."] = " - bitte verwende dieses Formular nicht. Stattdessen suche nach %s in Deiner Diaspora Suchleiste."; +$a->strings["All Contacts"] = "Alle Kontakte"; $a->strings["Image uploaded but image cropping failed."] = "Bild hochgeladen, aber das Zuschneiden schlug fehl."; $a->strings["Image size reduction [%s] failed."] = "Verkleinern der Bildgröße von [%s] scheiterte."; $a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Drücke Umschalt+Neu Laden oder leere den Browser-Cache, falls das neue Foto nicht gleich angezeigt wird."; @@ -1737,11 +1386,13 @@ $a->strings["Confirm:"] = "Bestätigen:"; $a->strings["Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be 'nickname@\$sitename'."] = "Wähle einen Spitznamen für Dein Profil. Dieser muss mit einem Buchstaben beginnen. Die Adresse Deines Profils auf dieser Seite wird 'spitzname@\$sitename' sein."; $a->strings["Choose a nickname: "] = "Spitznamen wählen: "; $a->strings["Import your profile to this friendica instance"] = "Importiere Dein Profil auf diese Friendica Instanz"; +$a->strings["everybody"] = "jeder"; $a->strings["Display"] = "Anzeige"; $a->strings["Social Networks"] = "Soziale Netzwerke"; $a->strings["Connected apps"] = "Verbundene Programme"; $a->strings["Remove account"] = "Konto löschen"; $a->strings["Missing some important data!"] = "Wichtige Daten fehlen!"; +$a->strings["Update"] = "Aktualisierungen"; $a->strings["Failed to connect with email account using the settings provided."] = "Verbindung zum E-Mail-Konto mit den angegebenen Einstellungen nicht möglich."; $a->strings["Email settings updated."] = "E-Mail Einstellungen bearbeitet."; $a->strings["Features updated"] = "Features aktualisiert"; @@ -1765,6 +1416,7 @@ $a->strings["Redirect"] = "Umleiten"; $a->strings["Icon url"] = "Icon URL"; $a->strings["You can't edit this application."] = "Du kannst dieses Programm nicht bearbeiten."; $a->strings["Connected Apps"] = "Verbundene Programme"; +$a->strings["Edit"] = "Bearbeiten"; $a->strings["Client key starts with"] = "Anwenderschlüssel beginnt mit"; $a->strings["No name"] = "Kein Name"; $a->strings["Remove authorization"] = "Autorisierung entziehen"; @@ -1868,6 +1520,8 @@ $a->strings["Maximum Friend Requests/Day:"] = "Maximale Anzahl vonKontaktanfrage $a->strings["(to prevent spam abuse)"] = "(um SPAM zu vermeiden)"; $a->strings["Default Post Permissions"] = "Standard-Zugriffsrechte für Beiträge"; $a->strings["(click to open/close)"] = "(klicke zum öffnen/schließen)"; +$a->strings["Show to Groups"] = "Zeige den Gruppen"; +$a->strings["Show to Contacts"] = "Zeige den Kontakten"; $a->strings["Default Private Post"] = "Privater Standardbeitrag"; $a->strings["Default Public Post"] = "Öffentlicher Standardbeitrag"; $a->strings["Default Permissions for New Posts"] = "Standardberechtigungen für neue Beiträge"; @@ -1936,6 +1590,7 @@ $a->strings["Couldn't fetch information for contact."] = "Konnte die Kontaktinfo $a->strings["Couldn't fetch friends for contact."] = "Konnte die Kontaktliste des Kontakts nicht abfragen."; $a->strings["success"] = "Erfolg"; $a->strings["failed"] = "Fehlgeschlagen"; +$a->strings["ignored"] = "Ignoriert"; $a->strings["%1\$s welcomes %2\$s"] = "%1\$s heißt %2\$s herzlich willkommen"; $a->strings["Tips for New Members"] = "Tipps für neue Nutzer"; $a->strings["Unable to locate contact information."] = "Konnte die Kontaktinformationen nicht finden."; @@ -1959,6 +1614,339 @@ $a->strings["%d message"] = array( $a->strings["Manage Identities and/or Pages"] = "Verwalte Identitäten und/oder Seiten"; $a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "Zwischen verschiedenen Identitäten oder Gemeinschafts-/Gruppenseiten wechseln, die Deine Kontoinformationen teilen oder zu denen Du „Verwalten“-Befugnisse bekommen hast."; $a->strings["Select an identity to manage: "] = "Wähle eine Identität zum Verwalten aus: "; +$a->strings["%d contact edited."] = array( + 0 => "%d Kontakt bearbeitet.", + 1 => "%d Kontakte bearbeitet.", +); +$a->strings["Could not access contact record."] = "Konnte nicht auf die Kontaktdaten zugreifen."; +$a->strings["Could not locate selected profile."] = "Konnte das ausgewählte Profil nicht finden."; +$a->strings["Contact updated."] = "Kontakt aktualisiert."; +$a->strings["Failed to update contact record."] = "Aktualisierung der Kontaktdaten fehlgeschlagen."; +$a->strings["Contact has been blocked"] = "Kontakt wurde blockiert"; +$a->strings["Contact has been unblocked"] = "Kontakt wurde wieder freigegeben"; +$a->strings["Contact has been ignored"] = "Kontakt wurde ignoriert"; +$a->strings["Contact has been unignored"] = "Kontakt wird nicht mehr ignoriert"; +$a->strings["Contact has been archived"] = "Kontakt wurde archiviert"; +$a->strings["Contact has been unarchived"] = "Kontakt wurde aus dem Archiv geholt"; +$a->strings["Drop contact"] = "Kontakt löschen"; +$a->strings["Do you really want to delete this contact?"] = "Möchtest Du wirklich diesen Kontakt löschen?"; +$a->strings["Contact has been removed."] = "Kontakt wurde entfernt."; +$a->strings["You are mutual friends with %s"] = "Du hast mit %s eine beidseitige Freundschaft"; +$a->strings["You are sharing with %s"] = "Du teilst mit %s"; +$a->strings["%s is sharing with you"] = "%s teilt mit Dir"; +$a->strings["Private communications are not available for this contact."] = "Private Kommunikation ist für diesen Kontakt nicht verfügbar."; +$a->strings["(Update was successful)"] = "(Aktualisierung war erfolgreich)"; +$a->strings["(Update was not successful)"] = "(Aktualisierung war nicht erfolgreich)"; +$a->strings["Suggest friends"] = "Kontakte vorschlagen"; +$a->strings["Network type: %s"] = "Netzwerktyp: %s"; +$a->strings["Communications lost with this contact!"] = "Verbindungen mit diesem Kontakt verloren!"; +$a->strings["Fetch further information for feeds"] = "Weitere Informationen zu Feeds holen"; +$a->strings["Fetch information"] = "Beziehe Information"; +$a->strings["Fetch information and keywords"] = "Beziehe Information und Schlüsselworte"; +$a->strings["Contact"] = "Kontakt: "; +$a->strings["Profile Visibility"] = "Profil-Sichtbarkeit"; +$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Bitte wähle eines Deiner Profile das angezeigt werden soll, wenn %s Dein Profil aufruft."; +$a->strings["Contact Information / Notes"] = "Kontakt Informationen / Notizen"; +$a->strings["Edit contact notes"] = "Notizen zum Kontakt bearbeiten"; +$a->strings["Block/Unblock contact"] = "Kontakt blockieren/freischalten"; +$a->strings["Ignore contact"] = "Ignoriere den Kontakt"; +$a->strings["Repair URL settings"] = "URL Einstellungen reparieren"; +$a->strings["View conversations"] = "Unterhaltungen anzeigen"; +$a->strings["Last update:"] = "Letzte Aktualisierung: "; +$a->strings["Update public posts"] = "Öffentliche Beiträge aktualisieren"; +$a->strings["Update now"] = "Jetzt aktualisieren"; +$a->strings["Unignore"] = "Ignorieren aufheben"; +$a->strings["Ignore"] = "Ignorieren"; +$a->strings["Currently blocked"] = "Derzeit geblockt"; +$a->strings["Currently ignored"] = "Derzeit ignoriert"; +$a->strings["Currently archived"] = "Momentan archiviert"; +$a->strings["Hide this contact from others"] = "Verbirg diesen Kontakt vor andere"; +$a->strings["Replies/likes to your public posts may still be visible"] = "Antworten/Likes auf deine öffentlichen Beiträge könnten weiterhin sichtbar sein"; +$a->strings["Notification for new posts"] = "Benachrichtigung bei neuen Beiträgen"; +$a->strings["Send a notification of every new post of this contact"] = "Sende eine Benachrichtigung, wann immer dieser Kontakt einen neuen Beitrag schreibt."; +$a->strings["Blacklisted keywords"] = "Blacklistete Schlüsselworte "; +$a->strings["Comma separated list of keywords that should not be converted to hashtags, when \"Fetch information and keywords\" is selected"] = "Komma-Separierte Liste mit Schlüsselworten, die nicht in Hashtags konvertiert werden, wenn \"Beziehe Information und Schlüsselworte\" aktiviert wurde"; +$a->strings["Actions"] = "Aktionen"; +$a->strings["Contact Settings"] = "Kontakteinstellungen"; +$a->strings["Suggestions"] = "Kontaktvorschläge"; +$a->strings["Suggest potential friends"] = "Kontakte vorschlagen"; +$a->strings["Show all contacts"] = "Alle Kontakte anzeigen"; +$a->strings["Unblocked"] = "Ungeblockt"; +$a->strings["Only show unblocked contacts"] = "Nur nicht-blockierte Kontakte anzeigen"; +$a->strings["Blocked"] = "Geblockt"; +$a->strings["Only show blocked contacts"] = "Nur blockierte Kontakte anzeigen"; +$a->strings["Ignored"] = "Ignoriert"; +$a->strings["Only show ignored contacts"] = "Nur ignorierte Kontakte anzeigen"; +$a->strings["Archived"] = "Archiviert"; +$a->strings["Only show archived contacts"] = "Nur archivierte Kontakte anzeigen"; +$a->strings["Hidden"] = "Verborgen"; +$a->strings["Only show hidden contacts"] = "Nur verborgene Kontakte anzeigen"; +$a->strings["Search your contacts"] = "Suche in deinen Kontakten"; +$a->strings["Archive"] = "Archivieren"; +$a->strings["Unarchive"] = "Aus Archiv zurückholen"; +$a->strings["Batch Actions"] = "Stapelverarbeitung"; +$a->strings["View all contacts"] = "Alle Kontakte anzeigen"; +$a->strings["View all common friends"] = "Alle Kontakte anzeigen"; +$a->strings["Advanced Contact Settings"] = "Fortgeschrittene Kontakteinstellungen"; +$a->strings["Mutual Friendship"] = "Beidseitige Freundschaft"; +$a->strings["is a fan of yours"] = "ist ein Fan von dir"; +$a->strings["you are a fan of"] = "Du bist Fan von"; +$a->strings["Toggle Blocked status"] = "Geblockt-Status ein-/ausschalten"; +$a->strings["Toggle Ignored status"] = "Ignoriert-Status ein-/ausschalten"; +$a->strings["Toggle Archive status"] = "Archiviert-Status ein-/ausschalten"; +$a->strings["Delete contact"] = "Lösche den Kontakt"; +$a->strings["Contact settings applied."] = "Einstellungen zum Kontakt angewandt."; +$a->strings["Contact update failed."] = "Konnte den Kontakt nicht aktualisieren."; +$a->strings["WARNING: This is highly advanced and if you enter incorrect information your communications with this contact may stop working."] = "ACHTUNG: Das sind Experten-Einstellungen! Wenn Du etwas Falsches eingibst, funktioniert die Kommunikation mit diesem Kontakt evtl. nicht mehr."; +$a->strings["Please use your browser 'Back' button now if you are uncertain what to do on this page."] = "Bitte nutze den Zurück-Button Deines Browsers jetzt, wenn Du Dir unsicher bist, was Du tun willst."; +$a->strings["No mirroring"] = "Kein Spiegeln"; +$a->strings["Mirror as forwarded posting"] = "Spiegeln als weitergeleitete Beiträge"; +$a->strings["Mirror as my own posting"] = "Spiegeln als meine eigenen Beiträge"; +$a->strings["Return to contact editor"] = "Zurück zum Kontakteditor"; +$a->strings["Refetch contact data"] = "Kontaktdaten neu laden"; +$a->strings["Remote Self"] = "Entfernte Konten"; +$a->strings["Mirror postings from this contact"] = "Spiegle Beiträge dieses Kontakts"; +$a->strings["Mark this contact as remote_self, this will cause friendica to repost new entries from this contact."] = "Markiere diesen Kontakt als remote_self (entferntes Konto), dies veranlasst Friendica alle Top-Level Beiträge dieses Kontakts an all Deine Kontakte zu senden."; +$a->strings["Account Nickname"] = "Konto-Spitzname"; +$a->strings["@Tagname - overrides Name/Nickname"] = "@Tagname - überschreibt Name/Spitzname"; +$a->strings["Account URL"] = "Konto-URL"; +$a->strings["Friend Request URL"] = "URL für Kontaktschaftsanfragen"; +$a->strings["Friend Confirm URL"] = "URL für Bestätigungen von Kontaktanfragen"; +$a->strings["Notification Endpoint URL"] = "URL-Endpunkt für Benachrichtigungen"; +$a->strings["Poll/Feed URL"] = "Pull/Feed-URL"; +$a->strings["New photo from this URL"] = "Neues Foto von dieser URL"; +$a->strings["Profile not found."] = "Profil nicht gefunden."; +$a->strings["This may occasionally happen if contact was requested by both persons and it has already been approved."] = "Das kann passieren, wenn sich zwei Kontakte gegenseitig eingeladen haben und bereits einer angenommen wurde."; +$a->strings["Response from remote site was not understood."] = "Antwort der Gegenstelle unverständlich."; +$a->strings["Unexpected response from remote site: "] = "Unerwartete Antwort der Gegenstelle: "; +$a->strings["Confirmation completed successfully."] = "Bestätigung erfolgreich abgeschlossen."; +$a->strings["Remote site reported: "] = "Gegenstelle meldet: "; +$a->strings["Temporary failure. Please wait and try again."] = "Zeitweiser Fehler. Bitte warte einige Momente und versuche es dann noch einmal."; +$a->strings["Introduction failed or was revoked."] = "Kontaktanfrage schlug fehl oder wurde zurückgezogen."; +$a->strings["Unable to set contact photo."] = "Konnte das Bild des Kontakts nicht speichern."; +$a->strings["No user record found for '%s' "] = "Für '%s' wurde kein Nutzer gefunden"; +$a->strings["Our site encryption key is apparently messed up."] = "Der Verschlüsselungsschlüssel unserer Seite ist anscheinend nicht in Ordnung."; +$a->strings["Empty site URL was provided or URL could not be decrypted by us."] = "Leere URL für die Seite erhalten oder die URL konnte nicht entschlüsselt werden."; +$a->strings["Contact record was not found for you on our site."] = "Für diesen Kontakt wurde auf unserer Seite kein Eintrag gefunden."; +$a->strings["Site public key not available in contact record for URL %s."] = "Die Kontaktdaten für URL %s enthalten keinen Public Key für den Server."; +$a->strings["The ID provided by your system is a duplicate on our system. It should work if you try again."] = "Die ID, die uns Dein System angeboten hat, ist hier bereits vergeben. Bitte versuche es noch einmal."; +$a->strings["Unable to set your contact credentials on our system."] = "Deine Kontaktreferenzen konnten nicht in unserem System gespeichert werden."; +$a->strings["Unable to update your contact profile details on our system"] = "Die Updates für Dein Profil konnten nicht gespeichert werden"; +$a->strings["%1\$s has joined %2\$s"] = "%1\$s ist %2\$s beigetreten"; +$a->strings["This introduction has already been accepted."] = "Diese Kontaktanfrage wurde bereits akzeptiert."; +$a->strings["Profile location is not valid or does not contain profile information."] = "Profiladresse ist ungültig oder stellt keine Profildaten zur Verfügung."; +$a->strings["Warning: profile location has no identifiable owner name."] = "Warnung: Es konnte kein Name des Besitzers von der angegebenen Profiladresse gefunden werden."; +$a->strings["Warning: profile location has no profile photo."] = "Warnung: Es gibt kein Profilbild bei der angegebenen Profiladresse."; +$a->strings["%d required parameter was not found at the given location"] = array( + 0 => "%d benötigter Parameter wurde an der angegebenen Stelle nicht gefunden", + 1 => "%d benötigte Parameter wurden an der angegebenen Stelle nicht gefunden", +); +$a->strings["Introduction complete."] = "Kontaktanfrage abgeschlossen."; +$a->strings["Unrecoverable protocol error."] = "Nicht behebbarer Protokollfehler."; +$a->strings["Profile unavailable."] = "Profil nicht verfügbar."; +$a->strings["%s has received too many connection requests today."] = "%s hat heute zu viele Kontaktanfragen erhalten."; +$a->strings["Spam protection measures have been invoked."] = "Maßnahmen zum Spamschutz wurden ergriffen."; +$a->strings["Friends are advised to please try again in 24 hours."] = "Freunde sind angehalten, es in 24 Stunden erneut zu versuchen."; +$a->strings["Invalid locator"] = "Ungültiger Locator"; +$a->strings["Invalid email address."] = "Ungültige E-Mail-Adresse."; +$a->strings["This account has not been configured for email. Request failed."] = "Dieses Konto ist nicht für E-Mail konfiguriert. Anfrage fehlgeschlagen."; +$a->strings["You have already introduced yourself here."] = "Du hast Dich hier bereits vorgestellt."; +$a->strings["Apparently you are already friends with %s."] = "Es scheint so, als ob Du bereits mit %s in Kontakt stehst."; +$a->strings["Invalid profile URL."] = "Ungültige Profil-URL."; +$a->strings["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"; +$a->strings["Hide this contact"] = "Verberge diesen Kontakt"; +$a->strings["Welcome home %s."] = "Willkommen zurück %s."; +$a->strings["Please confirm your introduction/connection request to %s."] = "Bitte bestätige Deine Kontaktanfrage bei %s."; +$a->strings["Please enter your 'Identity Address' from one of the following supported communications networks:"] = "Bitte gib die Adresse Deines Profils in einem der unterstützten sozialen Netzwerke an:"; +$a->strings["If you are not yet a member of the free social web, follow this link to find a public Friendica site and join us today."] = "Wenn du noch kein Mitglied dieses freien sozialen Netzwerks bist, folge diesem Link um einen öffentlichen Friendica-Server zu finden und beizutreten."; +$a->strings["Friend/Connection Request"] = "Kontaktanfrage"; +$a->strings["Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"] = "Beispiele: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"; +$a->strings["StatusNet/Federated Social Web"] = "StatusNet/Federated Social Web"; +$a->strings[" - please do not use this form. Instead, enter %s into your Diaspora search bar."] = " - bitte verwende dieses Formular nicht. Stattdessen suche nach %s in Deiner Diaspora Suchleiste."; +$a->strings["Recent Photos"] = "Neueste Fotos"; +$a->strings["Upload New Photos"] = "Neue Fotos hochladen"; +$a->strings["Contact information unavailable"] = "Kontaktinformationen nicht verfügbar"; +$a->strings["Album not found."] = "Album nicht gefunden."; +$a->strings["Delete Album"] = "Album löschen"; +$a->strings["Do you really want to delete this photo album and all its photos?"] = "Möchtest Du wirklich dieses Foto-Album und all seine Foto löschen?"; +$a->strings["Delete Photo"] = "Foto löschen"; +$a->strings["Do you really want to delete this photo?"] = "Möchtest Du wirklich dieses Foto löschen?"; +$a->strings["%1\$s was tagged in %2\$s by %3\$s"] = "%1\$s wurde von %3\$s in %2\$s getaggt"; +$a->strings["a photo"] = "einem Foto"; +$a->strings["Image file is empty."] = "Bilddatei ist leer."; +$a->strings["No photos selected"] = "Keine Bilder ausgewählt"; +$a->strings["You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."] = "Du verwendest %1$.2f Mbyte von %2$.2f Mbyte des Foto-Speichers."; +$a->strings["Upload Photos"] = "Bilder hochladen"; +$a->strings["New album name: "] = "Name des neuen Albums: "; +$a->strings["or existing album name: "] = "oder existierender Albumname: "; +$a->strings["Do not show a status post for this upload"] = "Keine Status-Mitteilung für diesen Beitrag anzeigen"; +$a->strings["Private Photo"] = "Privates Foto"; +$a->strings["Public Photo"] = "Öffentliches Foto"; +$a->strings["Edit Album"] = "Album bearbeiten"; +$a->strings["Show Newest First"] = "Zeige neueste zuerst"; +$a->strings["Show Oldest First"] = "Zeige älteste zuerst"; +$a->strings["View Photo"] = "Foto betrachten"; +$a->strings["Permission denied. Access to this item may be restricted."] = "Zugriff verweigert. Zugriff zu diesem Eintrag könnte eingeschränkt sein."; +$a->strings["Photo not available"] = "Foto nicht verfügbar"; +$a->strings["View photo"] = "Fotos ansehen"; +$a->strings["Edit photo"] = "Foto bearbeiten"; +$a->strings["Use as profile photo"] = "Als Profilbild verwenden"; +$a->strings["Private Message"] = "Private Nachricht"; +$a->strings["View Full Size"] = "Betrachte Originalgröße"; +$a->strings["Tags: "] = "Tags: "; +$a->strings["[Remove any tag]"] = "[Tag entfernen]"; +$a->strings["New album name"] = "Name des neuen Albums"; +$a->strings["Caption"] = "Bildunterschrift"; +$a->strings["Add a Tag"] = "Tag hinzufügen"; +$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"] = "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"; +$a->strings["Do not rotate"] = "Nicht rotieren"; +$a->strings["Rotate CW (right)"] = "Drehen US (rechts)"; +$a->strings["Rotate CCW (left)"] = "Drehen EUS (links)"; +$a->strings["Private photo"] = "Privates Foto"; +$a->strings["Public photo"] = "Öffentliches Foto"; +$a->strings["I like this (toggle)"] = "Ich mag das (toggle)"; +$a->strings["I don't like this (toggle)"] = "Ich mag das nicht (toggle)"; +$a->strings["This is you"] = "Das bist Du"; +$a->strings["Comment"] = "Kommentar"; +$a->strings["Map"] = "Karte"; +$a->strings["Profile deleted."] = "Profil gelöscht."; +$a->strings["Profile-"] = "Profil-"; +$a->strings["New profile created."] = "Neues Profil angelegt."; +$a->strings["Profile unavailable to clone."] = "Profil nicht zum Duplizieren verfügbar."; +$a->strings["Profile Name is required."] = "Profilname ist erforderlich."; +$a->strings["Marital Status"] = "Familienstand"; +$a->strings["Romantic Partner"] = "Romanze"; +$a->strings["Work/Employment"] = "Arbeit / Beschäftigung"; +$a->strings["Religion"] = "Religion"; +$a->strings["Political Views"] = "Politische Ansichten"; +$a->strings["Gender"] = "Geschlecht"; +$a->strings["Sexual Preference"] = "Sexuelle Vorlieben"; +$a->strings["Homepage"] = "Webseite"; +$a->strings["Interests"] = "Interessen"; +$a->strings["Address"] = "Adresse"; +$a->strings["Location"] = "Wohnort"; +$a->strings["Profile updated."] = "Profil aktualisiert."; +$a->strings[" and "] = " und "; +$a->strings["public profile"] = "öffentliches Profil"; +$a->strings["%1\$s changed %2\$s to “%3\$s”"] = "%1\$s hat %2\$s geändert auf “%3\$s”"; +$a->strings[" - Visit %1\$s's %2\$s"] = " – %1\$ss %2\$s besuchen"; +$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s hat folgendes aktualisiert %2\$s, verändert wurde %3\$s."; +$a->strings["Hide contacts and friends:"] = "Kontakte und Freunde verbergen"; +$a->strings["Hide your contact/friend list from viewers of this profile?"] = "Liste der Kontakte vor Betrachtern dieses Profils verbergen?"; +$a->strings["Show more profile fields:"] = "Zeige mehr Profil-Felder:"; +$a->strings["Profile Actions"] = "Profilaktionen"; +$a->strings["Edit Profile Details"] = "Profil bearbeiten"; +$a->strings["Change Profile Photo"] = "Profilbild ändern"; +$a->strings["View this profile"] = "Dieses Profil anzeigen"; +$a->strings["Create a new profile using these settings"] = "Neues Profil anlegen und diese Einstellungen verwenden"; +$a->strings["Clone this profile"] = "Dieses Profil duplizieren"; +$a->strings["Delete this profile"] = "Dieses Profil löschen"; +$a->strings["Basic information"] = "Grundinformationen"; +$a->strings["Profile picture"] = "Profilbild"; +$a->strings["Preferences"] = "Vorlieben"; +$a->strings["Status information"] = "Status Informationen"; +$a->strings["Additional information"] = "Zusätzliche Informationen"; +$a->strings["Relation"] = "Beziehung"; +$a->strings["Your Gender:"] = "Dein Geschlecht:"; +$a->strings["♥ Marital Status:"] = "♥ Beziehungsstatus:"; +$a->strings["Example: fishing photography software"] = "Beispiel: Fischen Fotografie Software"; +$a->strings["Profile Name:"] = "Profilname:"; +$a->strings["This is your public profile.
It may be visible to anybody using the internet."] = "Dies ist Dein öffentliches Profil.
Es könnte für jeden Nutzer des Internets sichtbar sein."; +$a->strings["Your Full Name:"] = "Dein kompletter Name:"; +$a->strings["Title/Description:"] = "Titel/Beschreibung:"; +$a->strings["Street Address:"] = "Adresse:"; +$a->strings["Locality/City:"] = "Wohnort:"; +$a->strings["Region/State:"] = "Region/Bundesstaat:"; +$a->strings["Postal/Zip Code:"] = "Postleitzahl:"; +$a->strings["Country:"] = "Land:"; +$a->strings["Who: (if applicable)"] = "Wer: (falls anwendbar)"; +$a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Beispiele: cathy123, Cathy Williams, cathy@example.com"; +$a->strings["Since [date]:"] = "Seit [Datum]:"; +$a->strings["Tell us about yourself..."] = "Erzähle uns ein bisschen von Dir …"; +$a->strings["Homepage URL:"] = "Adresse der Homepage:"; +$a->strings["Religious Views:"] = "Religiöse Ansichten:"; +$a->strings["Public Keywords:"] = "Öffentliche Schlüsselwörter:"; +$a->strings["(Used for suggesting potential friends, can be seen by others)"] = "(Wird verwendet, um potentielle Kontakte zu finden, kann von Kontakten eingesehen werden)"; +$a->strings["Private Keywords:"] = "Private Schlüsselwörter:"; +$a->strings["(Used for searching profiles, never shown to others)"] = "(Wird für die Suche nach Profilen verwendet und niemals veröffentlicht)"; +$a->strings["Musical interests"] = "Musikalische Interessen"; +$a->strings["Books, literature"] = "Bücher, Literatur"; +$a->strings["Television"] = "Fernsehen"; +$a->strings["Film/dance/culture/entertainment"] = "Filme/Tänze/Kultur/Unterhaltung"; +$a->strings["Hobbies/Interests"] = "Hobbies/Interessen"; +$a->strings["Love/romance"] = "Liebe/Romantik"; +$a->strings["Work/employment"] = "Arbeit/Anstellung"; +$a->strings["School/education"] = "Schule/Ausbildung"; +$a->strings["Contact information and Social Networks"] = "Kontaktinformationen und Soziale Netzwerke"; +$a->strings["Edit/Manage Profiles"] = "Bearbeite/Verwalte Profile"; +$a->strings["This entry was edited"] = "Dieser Beitrag wurde bearbeitet."; +$a->strings["%d comment"] = array( + 0 => "%d Kommentar", + 1 => "%d Kommentare", +); +$a->strings["like"] = "mag ich"; +$a->strings["dislike"] = "mag ich nicht"; +$a->strings["Share this"] = "Weitersagen"; +$a->strings["share"] = "Teilen"; +$a->strings["Bold"] = "Fett"; +$a->strings["Italic"] = "Kursiv"; +$a->strings["Underline"] = "Unterstrichen"; +$a->strings["Quote"] = "Zitat"; +$a->strings["Code"] = "Code"; +$a->strings["Image"] = "Bild"; +$a->strings["Link"] = "Link"; +$a->strings["Video"] = "Video"; +$a->strings["add star"] = "markieren"; +$a->strings["remove star"] = "Markierung entfernen"; +$a->strings["toggle star status"] = "Markierung umschalten"; +$a->strings["starred"] = "markiert"; +$a->strings["add tag"] = "Tag hinzufügen"; +$a->strings["ignore thread"] = "Thread ignorieren"; +$a->strings["unignore thread"] = "Thread nicht mehr ignorieren"; +$a->strings["toggle ignore status"] = "Ignoriert-Status ein-/ausschalten"; +$a->strings["save to folder"] = "In Ordner speichern"; +$a->strings["I will attend"] = "Ich werde teilnehmen"; +$a->strings["I will not attend"] = "Ich werde nicht teilnehmen"; +$a->strings["I might attend"] = "Ich werde eventuell teilnehmen"; +$a->strings["to"] = "zu"; +$a->strings["Wall-to-Wall"] = "Wall-to-Wall"; +$a->strings["via Wall-To-Wall:"] = "via Wall-To-Wall:"; +$a->strings["Invalid request identifier."] = "Invalid request identifier."; +$a->strings["Discard"] = "Verwerfen"; +$a->strings["Show Ignored Requests"] = "Zeige ignorierte Anfragen"; +$a->strings["Hide Ignored Requests"] = "Verberge ignorierte Anfragen"; +$a->strings["Notification type: "] = "Benachrichtigungstyp: "; +$a->strings["Friend Suggestion"] = "Kontaktvorschlag"; +$a->strings["suggested by %s"] = "vorgeschlagen von %s"; +$a->strings["Post a new friend activity"] = "Neue-Kontakt Nachricht senden"; +$a->strings["if applicable"] = "falls anwendbar"; +$a->strings["Claims to be known to you: "] = "Behauptet Dich zu kennen: "; +$a->strings["yes"] = "ja"; +$a->strings["no"] = "nein"; +$a->strings["Shall your connection be bidirectional or not? \"Friend\" implies that you allow to read and you subscribe to their posts. \"Fan/Admirer\" means that you allow to read but you do not want to read theirs. Approve as: "] = "Soll Deine Beziehung beidseitig sein oder nicht? \"Kontakt\" bedeutet, ihr könnt gegenseitig die Beiträge des Anderen lesen dürft. \"Fan/Verehrer\", dass du das lesen deiner Beiträge erlaubst aber nicht die Beiträge der anderen Seite lesen möchtest. Genehmigen als:"; +$a->strings["Shall your connection be bidirectional or not? \"Friend\" implies that you allow to read and you subscribe to their posts. \"Sharer\" means that you allow to read but you do not want to read theirs. Approve as: "] = "Soll Deine Beziehung beidseitig sein oder nicht? \"Freund\" bedeutet, ihr gegenseitig die Beiträge des Anderen lesen dürft. \"Teilenden\", das du das lesen deiner Beiträge erlaubst aber nicht die Beiträge der anderen Seite lesen möchtest. Genehmigen als:"; +$a->strings["Friend"] = "Kontakt"; +$a->strings["Sharer"] = "Teilenden"; +$a->strings["Fan/Admirer"] = "Fan/Verehrer"; +$a->strings["Friend/Connect Request"] = "Kontakt-/Freundschaftsanfrage"; +$a->strings["New Follower"] = "Neuer Bewunderer"; +$a->strings["No introductions."] = "Keine Kontaktanfragen."; +$a->strings["Network Notifications"] = "Netzwerk Benachrichtigungen"; +$a->strings["%s liked %s's post"] = "%s mag %ss Beitrag"; +$a->strings["%s disliked %s's post"] = "%s mag %ss Beitrag nicht"; +$a->strings["%s is now friends with %s"] = "%s ist jetzt mit %s befreundet"; +$a->strings["%s created a new post"] = "%s hat einen neuen Beitrag erstellt"; +$a->strings["%s commented on %s's post"] = "%s hat %ss Beitrag kommentiert"; +$a->strings["No more network notifications."] = "Keine weiteren Netzwerk-Benachrichtigungen."; +$a->strings["Personal Notifications"] = "Persönliche Benachrichtigungen"; +$a->strings["No more personal notifications."] = "Keine weiteren persönlichen Benachrichtigungen"; +$a->strings["Home Notifications"] = "Pinnwand Benachrichtigungen"; +$a->strings["No more home notifications."] = "Keine weiteren Pinnwand-Benachrichtigungen"; +$a->strings["System"] = "System"; $a->strings["via"] = "via"; $a->strings["Repeat the image"] = "Bild wiederholen"; $a->strings["Will repeat your image to fill the background."] = "Wiederholt das Bild um den Hintergrund auszufüllen."; @@ -2020,3 +2008,16 @@ $a->strings["darkzero"] = "darkzero"; $a->strings["comix"] = "comix"; $a->strings["slackr"] = "slackr"; $a->strings["Variations"] = "Variationen"; +$a->strings["toggle mobile"] = "auf/von Mobile Ansicht wechseln"; +$a->strings["Delete this item?"] = "Diesen Beitrag löschen?"; +$a->strings["show fewer"] = "weniger anzeigen"; +$a->strings["Update %s failed. See error logs."] = "Update %s fehlgeschlagen. Bitte Fehlerprotokoll überprüfen."; +$a->strings["Create a New Account"] = "Neues Konto erstellen"; +$a->strings["Password: "] = "Passwort: "; +$a->strings["Remember me"] = "Anmeldedaten merken"; +$a->strings["Or login using OpenID: "] = "Oder melde Dich mit Deiner OpenID an: "; +$a->strings["Forgot your password?"] = "Passwort vergessen?"; +$a->strings["Website Terms of Service"] = "Website Nutzungsbedingungen"; +$a->strings["terms of service"] = "Nutzungsbedingungen"; +$a->strings["Website Privacy Policy"] = "Website Datenschutzerklärung"; +$a->strings["privacy policy"] = "Datenschutzerklärung"; From d673f44c5bf4f57c89767f26077ce2092e12b9c5 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Wed, 3 Aug 2016 10:03:05 +0200 Subject: [PATCH 021/352] Split cron jobs in cronjobs, introduce fastlane for high priority tasks --- include/cron.php | 82 +++++++++++++++++++++++++++----------------- include/cronjobs.php | 81 +++++++++++++++++++++++++++++++++++++++++++ include/poller.php | 18 ++++++++++ 3 files changed, 149 insertions(+), 32 deletions(-) create mode 100644 include/cronjobs.php diff --git a/include/cron.php b/include/cron.php index 82c8cc7a16..6afbeca1bd 100644 --- a/include/cron.php +++ b/include/cron.php @@ -80,43 +80,38 @@ function cron_run(&$argv, &$argc){ proc_run(PRIORITY_LOW,"include/discover_poco.php", "checkcontact"); - // expire any expired accounts + // Expire and remove user entries + cron_expire_and_remove_users(); - q("UPDATE user SET `account_expired` = 1 where `account_expired` = 0 - AND `account_expires_on` != '0000-00-00 00:00:00' - AND `account_expires_on` < UTC_TIMESTAMP() "); + // If the worker is active, split the jobs in several sub processes + if (get_config("system", "worker")) { + // Check OStatus conversations + proc_run(PRIORITY_MEDIUM, "include/cronjobs.php", "ostatus_mentions"); - // delete user and contact records for recently removed accounts + // Check every conversation + proc_run(PRIORITY_MEDIUM, "include/cronjobs.php", "ostatus_conversations"); - $r = q("SELECT * FROM `user` WHERE `account_removed` = 1 AND `account_expires_on` < UTC_TIMESTAMP() - INTERVAL 3 DAY"); - if ($r) { - foreach($r as $user) { - q("DELETE FROM `contact` WHERE `uid` = %d", intval($user['uid'])); - q("DELETE FROM `user` WHERE `uid` = %d", intval($user['uid'])); - } + // Call possible post update functions + proc_run(PRIORITY_LOW, "include/cronjobs.php", "post_update"); + + // update nodeinfo data + proc_run(PRIORITY_LOW, "include/cronjobs.php", "nodeinfo"); + } else { + // Check OStatus conversations + // Check only conversations with mentions (for a longer time) + ostatus::check_conversations(true); + + // Check every conversation + ostatus::check_conversations(false); + + // Call possible post update functions + // see include/post_update.php for more details + post_update(); + + // update nodeinfo data + nodeinfo_cron(); } - $abandon_days = intval(get_config('system','account_abandon_days')); - if($abandon_days < 1) - $abandon_days = 0; - - // Check OStatus conversations - // Check only conversations with mentions (for a longer time) - ostatus::check_conversations(true); - - // Check every conversation - ostatus::check_conversations(false); - - // Call possible post update functions - // see include/post_update.php for more details - post_update(); - - // update nodeinfo data - nodeinfo_cron(); - - /// @TODO Regenerate usage statistics - // q("ANALYZE TABLE `item`"); - // once daily run birthday_updates and then expire in background $d1 = get_config('system','last_expire_day'); @@ -152,6 +147,25 @@ function cron_run(&$argv, &$argc){ return; } +/** + * @brief Expire and remove user entries + */ +function cron_expire_and_remove_users() { + // expire any expired accounts + q("UPDATE user SET `account_expired` = 1 where `account_expired` = 0 + AND `account_expires_on` != '0000-00-00 00:00:00' + AND `account_expires_on` < UTC_TIMESTAMP() "); + + // delete user and contact records for recently removed accounts + $r = q("SELECT * FROM `user` WHERE `account_removed` AND `account_expires_on` < UTC_TIMESTAMP() - INTERVAL 3 DAY"); + if ($r) { + foreach($r as $user) { + q("DELETE FROM `contact` WHERE `uid` = %d", intval($user['uid'])); + q("DELETE FROM `user` WHERE `uid` = %d", intval($user['uid'])); + } + } +} + /** * @brief Poll contacts for unreceived messages * @@ -197,6 +211,10 @@ function cron_poll_contacts($argc, $argv) { // and which have a polling address and ignore Diaspora since // we are unable to match those posts with a Diaspora GUID and prevent duplicates. + $abandon_days = intval(get_config('system','account_abandon_days')); + if($abandon_days < 1) + $abandon_days = 0; + $abandon_sql = (($abandon_days) ? sprintf(" AND `user`.`login_date` > UTC_TIMESTAMP() - INTERVAL %d DAY ", intval($abandon_days)) : '' diff --git a/include/cronjobs.php b/include/cronjobs.php new file mode 100644 index 0000000000..ed27e23293 --- /dev/null +++ b/include/cronjobs.php @@ -0,0 +1,81 @@ +set_baseurl(get_config('system','url')); + + // No parameter set? So return + if ($argc <= 1) + return; + + // Check OStatus conversations + // Check only conversations with mentions (for a longer time) + if ($argv[1] == 'ostatus_mentions') { + ostatus::check_conversations(true); + return; + } + + // Check every conversation + if ($argv[1] == 'ostatus_conversations') { + ostatus::check_conversations(false); + return; + } + + // Call possible post update functions + // see include/post_update.php for more details + if ($argv[1] == 'post_update') { + post_update(); + return; + } + + // update nodeinfo data + if ($argv[1] == 'nodeinfo') { + nodeinfo_cron(); + return; + } + + return; +} + +if (array_search(__file__,get_included_files())===0){ + cronjobs_run($_SERVER["argv"],$_SERVER["argc"]); + killme(); +} diff --git a/include/poller.php b/include/poller.php index 811b81e174..622aa83bd7 100644 --- a/include/poller.php +++ b/include/poller.php @@ -270,6 +270,24 @@ function poller_too_much_workers() { $slope = $maxworkers / pow($maxsysload, $exponent); $queues = ceil($slope * pow(max(0, $maxsysload - $load), $exponent)); + if (Config::get("system", "worker_fastlane", false) AND ($queues > 0) AND ($active >= $queues)) { + $s = q("SELECT COUNT(*) AS `total` FROM `workerqueue` WHERE `priority` = %d AND `executed` = '0000-00-00 00:00:00'", + intval(PRIORITY_HIGH)); + $high_waiting = $s[0]["total"]; + + $s = q("SELECT COUNT(*) AS `total` FROM `workerqueue` WHERE `priority` = %d AND `executed` != '0000-00-00 00:00:00'", + intval(PRIORITY_HIGH)); + $high_running = $s[0]["total"]; + + logger("High waiting: ".$high_waiting." - high running: ".$high_running); + + /// @todo define maximum number of fastlanes + if (($high_waiting > 0) AND ($high_running == 0)) { + logger("There are ".$high_waiting." high priority jobs waiting but none is executed. Open a fastlane.", LOGGER_DEBUG); + $queue = $active + 1; + } + } + $s = q("SELECT COUNT(*) AS `total` FROM `workerqueue` WHERE `executed` = '0000-00-00 00:00:00'"); $entries = $s[0]["total"]; From ff430640c031373abb2688e31bff6bc9f8cb2bd2 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Wed, 3 Aug 2016 10:19:46 +0200 Subject: [PATCH 022/352] Small variable type fixed, removed unused includes --- include/cronjobs.php | 7 ++----- include/poller.php | 4 +--- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/include/cronjobs.php b/include/cronjobs.php index ed27e23293..3a6df698e1 100644 --- a/include/cronjobs.php +++ b/include/cronjobs.php @@ -30,12 +30,9 @@ function cronjobs_run(&$argv, &$argc){ require_once('include/session.php'); require_once('include/datetime.php'); - require_once('include/items.php'); - require_once('include/Contact.php'); - require_once('include/email.php'); - require_once('include/socgraph.php'); - require_once('mod/nodeinfo.php'); + require_once('include/ostatus.php'); require_once('include/post_update.php'); + require_once('mod/nodeinfo.php'); load_config('config'); load_config('system'); diff --git a/include/poller.php b/include/poller.php index 622aa83bd7..6dce81e717 100644 --- a/include/poller.php +++ b/include/poller.php @@ -279,12 +279,10 @@ function poller_too_much_workers() { intval(PRIORITY_HIGH)); $high_running = $s[0]["total"]; - logger("High waiting: ".$high_waiting." - high running: ".$high_running); - /// @todo define maximum number of fastlanes if (($high_waiting > 0) AND ($high_running == 0)) { logger("There are ".$high_waiting." high priority jobs waiting but none is executed. Open a fastlane.", LOGGER_DEBUG); - $queue = $active + 1; + $queues = $active + 1; } } From ce3188d5c6a8dc2e4ebf188faef235a1b3b5c5b1 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Wed, 3 Aug 2016 12:44:04 +0200 Subject: [PATCH 023/352] notifications - move intros to NotificationsManager & make json output work --- include/NotificationsManager.php | 338 ++++++++++++++++++++------- mod/notifications.php | 383 ++++++++++++++----------------- 2 files changed, 421 insertions(+), 300 deletions(-) diff --git a/include/NotificationsManager.php b/include/NotificationsManager.php index 362e3f5326..fef48d5d43 100644 --- a/include/NotificationsManager.php +++ b/include/NotificationsManager.php @@ -1,6 +1,8 @@ value: filter query by columns values * @param string $order optional Space separated list of column to sort by. prepend name with "+" to sort ASC, "-" to sort DESC. Default to "-date" @@ -89,7 +92,7 @@ class NotificationsManager { } /** - * @brief get one note for local_user() by $id value + * @brief Get one note for local_user() by $id value * * @param int $id * @return array note values or null if not found @@ -196,7 +199,7 @@ class NotificationsManager { * string 'when' => Relative date of the notification * bool 'seen' => Is the notification marked as "seen" */ - private function format($notifs, $ident = "") { + private function formatNotifs($notifs, $ident = "") { $notif = array(); $arr = array(); @@ -335,9 +338,9 @@ class NotificationsManager { /** * @brief Total number of network notifications - * @param int $seen + * @param int|string $seen * If 0 only include notifications into the query - * which arn't marked as "seen" into + * which aren't marked as "seen" * @return int Number of network notifications */ private function networkTotal($seen = 0) { @@ -361,17 +364,21 @@ class NotificationsManager { /** * @brief Get network notifications * - * @param type $seen + * @param int|string $seen * If 0 only include notifications into the query - * which arn't marked as "seen" into + * which aren't marked as "seen" * @param int $start Start the query at this point * @param int $limit Maximum number of query results * - * @return array Query output + * @return array with + * string 'ident' => Notification identifier + * int 'total' => Total number of available network notifications + * array 'notifications' => Network notifications */ - public function networkNotifs($seen = 0, $start = 0, $limit = 20) { + public function networkNotifs($seen = 0, $start = 0, $limit = 80) { $ident = 'network'; $total = $this->networkTotal($seen); + $notifs = array(); if($seen === 0) $sql_seen = " AND `item`.`unseen` = 1 "; @@ -380,33 +387,33 @@ class NotificationsManager { $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, `item`.`unseen`, `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` AS `object`, `pitem`.`author-name` AS `pname`, `pitem`.`author-link` AS `plink`, `pitem`.`guid` AS `pguid` - FROM `item` INNER JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent` - WHERE `item`.`visible` = 1 AND `pitem`.`parent` != 0 AND + FROM `item` INNER JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent` + WHERE `item`.`visible` = 1 AND `pitem`.`parent` != 0 AND `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0 $sql_seen - ORDER BY `item`.`created` DESC LIMIT %d, %d ", - intval(local_user()), - intval($start), - intval($limit) + ORDER BY `item`.`created` DESC LIMIT %d, %d ", + intval(local_user()), + intval($start), + intval($limit) ); - if(dbm::is_result($r)) { - $notifs = $this->format($r, $ident); - $arr = array ( - 'notifications' => $notifs, - 'ident' => $ident, - 'total' => $total, - ); + if(dbm::is_result($r)) + $notifs = $this->formatNotifs($r, $ident); - return $arr; - } + $arr = array ( + 'notifications' => $notifs, + 'ident' => $ident, + 'total' => $total, + ); + + return $arr; } /** * @brief Total number of system notifications - * @param int $seen + * @param int|string $seen * If 0 only include notifications into the query - * which arn't marked as "seen" into + * which aren't marked as "seen" * @return int Number of system notifications */ private function systemTotal($seen = 0) { @@ -426,17 +433,21 @@ class NotificationsManager { /** * @brief Get system notifications * - * @param type $seen + * @param int|string $seen * If 0 only include notifications into the query - * which arn't marked as "seen" into + * which aren't marked as "seen" * @param int $start Start the query at this point * @param int $limit Maximum number of query results * - * @return array Query output + * @return array with + * string 'ident' => Notification identifier + * int 'total' => Total number of available system notifications + * array 'notifications' => System notifications */ - public function systemNotifs($seen = 0, $start = 0, $limit = 20) { + public function systemNotifs($seen = 0, $start = 0, $limit = 80) { $ident = 'system'; $total = $this->systemTotal($seen); + $notifs = array(); if($seen === 0) $sql_seen = " AND `seen` = 0 "; @@ -448,16 +459,16 @@ class NotificationsManager { intval($limit) ); - if(dbm::is_result($r)) { - $notifs = $this->format($r, $ident); - $arr = array ( - 'notifications' => $notifs, - 'ident' => $ident, - 'total' => $total, - ); + if(dbm::is_result($r)) + $notifs = $this->formatNotifs($r, $ident); - return $arr; - } + $arr = array ( + 'notifications' => $notifs, + 'ident' => $ident, + 'total' => $total, + ); + + return $arr; } /** @@ -481,9 +492,9 @@ class NotificationsManager { /** * @brief Total number of personal notifications - * @param int $seen + * @param int|string $seen * If 0 only include notifications into the query - * which arn't marked as "seen" into + * which aren't marked as "seen" * @return int Number of personal notifications */ private function personalTotal($seen = 0) { @@ -510,18 +521,22 @@ class NotificationsManager { /** * @brief Get personal notifications * - * @param type $seen + * @param int|string $seen * If 0 only include notifications into the query - * which arn't marked as "seen" into + * which aren't marked as "seen" * @param int $start Start the query at this point * @param int $limit Maximum number of query results * - * @return array Query output + * @return array with + * string 'ident' => Notification identifier + * int 'total' => Total number of available personal notifications + * array 'notifications' => Personal notifications */ - public function personalNotifs($seen = 0, $start = 0, $limit = 20) { + public function personalNotifs($seen = 0, $start = 0, $limit = 80) { $ident = 'personal'; - $total = 0; + $total = $this->personalTotal($seen); $sql_extra .= $this->_personal_sql_extra(); + $notifs = array(); if($seen === 0) $sql_seen = " AND `item`.`unseen` = 1 "; @@ -529,34 +544,34 @@ class NotificationsManager { $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, `item`.`unseen`, `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` AS `object`, `pitem`.`author-name` AS `pname`, `pitem`.`author-link` AS `plink`, `pitem`.`guid` AS `pguid`, - FROM `item` INNER JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent` - WHERE `item`.`visible` = 1 + FROM `item` INNER JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent` + WHERE `item`.`visible` = 1 $sql_extra $sql_seen AND `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0 - ORDER BY `item`.`created` DESC LIMIT %d, %d " , - intval(local_user()), - intval($start), - intval($limit) + ORDER BY `item`.`created` DESC LIMIT %d, %d " , + intval(local_user()), + intval($start), + intval($limit) ); - if(dbm::is_result($r)) { - $notifs = $this->format($r, $ident); - $arr = array ( - 'notifications' => $notifs, - 'ident' => $ident, - 'total' => $total, - ); + if(dbm::is_result($r)) + $notifs = $this->formatNotifs($r, $ident); + + $arr = array ( + 'notifications' => $notifs, + 'ident' => $ident, + 'total' => $total, + ); - return $arr; - } + return $arr; } /** * @brief Total number of home notifications - * @param int $seen + * @param int|string $seen * If 0 only include notifications into the query - * which arn't marked as "seen" into + * which aren't marked as "seen" * @return int Number of home notifications */ private function homeTotal($seen = 0) { @@ -579,45 +594,200 @@ class NotificationsManager { /** * @brief Get home notifications * - * @param type $seen + * @param int|string $seen * If 0 only include notifications into the query - * which arn't marked as "seen" into + * which aren't marked as "seen" * @param int $start Start the query at this point * @param int $limit Maximum number of query results * - * @return array Query output + * @return array with + * string 'ident' => Notification identifier + * int 'total' => Total number of available home notifications + * array 'notifications' => Home notifications */ - public function homeNotifs($seen = 0, $start = 0, $limit = 20) { + public function homeNotifs($seen = 0, $start = 0, $limit = 80) { $ident = 'home'; $total = $this->homeTotal($seen); + $notifs = array(); if($seen === 0) $sql_seen = " AND `item`.`unseen` = 1 "; - $total = $this->homeTotal($seen); - $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, `item`.`unseen`, `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` as `object`, `pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink`, `pitem`.`guid` as `pguid` - FROM `item` INNER JOIN `item` as `pitem` ON `pitem`.`id`=`item`.`parent` - WHERE `item`.`visible` = 1 AND + FROM `item` INNER JOIN `item` as `pitem` ON `pitem`.`id`=`item`.`parent` + WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 1 $sql_seen - ORDER BY `item`.`created` DESC LIMIT %d, %d ", - intval(local_user()), - intval($start), - intval($limit) + ORDER BY `item`.`created` DESC LIMIT %d, %d ", + intval(local_user()), + intval($start), + intval($limit) ); - if(dbm::is_result($r)) { - $notifs = $this->format($r, $ident); - $arr = array ( - 'notifications' => $notifs, - 'ident' => $ident, - 'total' => $total, - ); + if(dbm::is_result($r)) + $notifs = $this->formatNotifs($r, $ident); - return $arr; + $arr = array ( + 'notifications' => $notifs, + 'ident' => $ident, + 'total' => $total, + ); + + return $arr; + } + + /** + * @brief Total number of introductions + * @param int $all + * If 0 only include introductions into the query + * which aren't marked as ignored + * @return int Number of introductions + */ + private function introTotal($all) { + if($all === 0) + $sql_extra = " AND `ignore` = 0 "; + + $r = q("SELECT COUNT(*) AS `total` FROM `intro` + WHERE `intro`.`uid` = %d $sql_extra AND `intro`.`blocked` = 0 ", + intval($_SESSION['uid']) + ); + + if(dbm::is_result($r)) + return $r[0]['total']; + + return 0; + } + + /** + * @brief Get introductions + * + * @param int $all + * If 0 only include introductions into the query + * which aren't marked as ignored + * @param int $start Start the query at this point + * @param int $limit Maximum number of query results + * + * @return array with + * string 'ident' => Notification identifier + * int 'total' => Total number of available introductions + * array 'notifications' => Introductions + */ + public function introNotifs($all = 0, $start = 0, $limit = 80) { + $ident = 'introductions'; + $total = $this->introTotal($seen); + $notifs = array(); + + if($all === 0) + $sql_extra = " AND `ignore` = 0 "; + + /// @todo Fetch contact details by "get_contact_details_by_url" instead of queries to contact, fcontact and gcontact + $r = q("SELECT `intro`.`id` AS `intro_id`, `intro`.*, `contact`.*, `fcontact`.`name` AS `fname`,`fcontact`.`url` AS `furl`,`fcontact`.`photo` AS `fphoto`,`fcontact`.`request` AS `frequest`, + `gcontact`.`location` AS `glocation`, `gcontact`.`about` AS `gabout`, + `gcontact`.`keywords` AS `gkeywords`, `gcontact`.`gender` AS `ggender`, + `gcontact`.`network` AS `gnetwork` + FROM `intro` + LEFT JOIN `contact` ON `contact`.`id` = `intro`.`contact-id` + LEFT JOIN `gcontact` ON `gcontact`.`nurl` = `contact`.`nurl` + LEFT JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id` + WHERE `intro`.`uid` = %d $sql_extra AND `intro`.`blocked` = 0 + LIMIT %d, %d", + intval($_SESSION['uid']), + intval($start), + intval($limit) + ); + + if(dbm::is_result($r)) + $notifs = $this->formatIntros($r); + + $arr = array ( + 'ident' => $ident, + 'total' => $total, + 'notifications' => $notifs, + ); + + return $arr; + } + + /** + * @brief Format the notification query in an usable array + * + * @param array $intros The array from the db query + * @return array with the introductions + */ + private function formatIntros($intros) { + $knowyou = ''; + + foreach($intros as $it) { + // There are two kind of introduction. Contacts suggested by other contacts and normal connection requests. + // We have to distinguish between these two because they use different data. + + // Contact suggestions + if($it['fid']) { + + $return_addr = bin2hex($this->a->user['nickname'] . '@' . $this->a->get_hostname() . (($this->a->path) ? '/' . $this->a->path : '')); + + $intro = array( + 'label' => 'friend_suggestion', + 'notify_type' => t('Friend Suggestion'), + 'intro_id' => $it['intro_id'], + 'madeby' => $it['name'], + 'contact_id' => $it['contact-id'], + 'photo' => ((x($it,'fphoto')) ? proxy_url($it['fphoto'], false, PROXY_SIZE_SMALL) : "images/person-175.jpg"), + 'name' => $it['fname'], + 'url' => zrl($it['furl']), + 'hidden' => $it['hidden'] == 1, + 'post_newfriend' => (intval(get_pconfig(local_user(),'system','post_newfriend')) ? '1' : 0), + + 'knowyou' => $knowyou, + 'note' => $it['note'], + 'request' => $it['frequest'] . '?addr=' . $return_addr, + + ); + + // Normal connection requests + } else { + + // Probe the contact url to get missing data + $ret = probe_url($it["url"]); + + if ($it['gnetwork'] == "") + $it['gnetwork'] = $ret["network"]; + + // Don't show these data until you are connected. Diaspora is doing the same. + if($it['gnetwork'] === NETWORK_DIASPORA) { + $it['glocation'] = ""; + $it['gabout'] = ""; + $it['ggender'] = ""; + } + $intro = array( + 'label' => (($it['network'] !== NETWORK_OSTATUS) ? 'friend_request' : 'follower'), + 'notify_type' => (($it['network'] !== NETWORK_OSTATUS) ? t('Friend/Connect Request') : t('New Follower')), + 'dfrn_id' => $it['issued-id'], + 'uid' => $_SESSION['uid'], + 'intro_id' => $it['intro_id'], + 'contact_id' => $it['contact-id'], + 'photo' => ((x($it,'photo')) ? proxy_url($it['photo'], false, PROXY_SIZE_SMALL) : "images/person-175.jpg"), + 'name' => $it['name'], + 'location' => bbcode($it['glocation'], false, false), + 'about' => bbcode($it['gabout'], false, false), + 'keywords' => $it['gkeywords'], + 'gender' => $it['ggender'], + 'hidden' => $it['hidden'] == 1, + 'post_newfriend' => (intval(get_pconfig(local_user(),'system','post_newfriend')) ? '1' : 0), + 'url' => $it['url'], + 'zrl' => zrl($it['url']), + 'addr' => $ret['addr'], + 'network' => $it['gnetwork'], + 'knowyou' => $it['knowyou'], + 'note' => $it['note'], + ); + } + + $arr[] = $intro; } + + return $arr; } } diff --git a/mod/notifications.php b/mod/notifications.php index a22703ba95..fd7f0c33de 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -1,8 +1,13 @@ getTabs(); $notif_content = array(); + + // Notification results per page $perpage = 20; $startrec = ($page * $perpage) - $perpage; + // Get introductions if( (($a->argc > 1) && ($a->argv[1] == 'intros')) || (($a->argc == 1))) { nav_set_selected('introductions'); + $notif_header = t('Notifications'); if(($a->argc > 2) && ($a->argv[2] == 'all')) - $sql_extra = ''; + $all = 1; else - $sql_extra = " AND `ignore` = 0 "; + $all = 0; - $notif_header = t('Notifications'); - $notif_tpl = get_markup_template('notifications.tpl'); + $notifs = $nm->introNotifs($all, $startrec, $perpage); + + // Get the network notifications + } else if (($a->argc > 1) && ($a->argv[1] == 'network')) { + + $notif_header = t('Network Notifications'); + $notifs = $nm->networkNotifs($show, $startrec, $perpage); + + // Get the system notifications + } else if (($a->argc > 1) && ($a->argv[1] == 'system')) { + + $notif_header = t('System Notifications'); + $notifs = $nm->systemNotifs($show, $startrec, $perpage); + + // Get the personal notifications + } else if (($a->argc > 1) && ($a->argv[1] == 'personal')) { + + $notif_header = t('Personal Notifications'); + $notifs = $nm->personalNotifs($show, $startrec, $perpage); + + // Get the home notifications + } else if (($a->argc > 1) && ($a->argv[1] == 'home')) { + + $notif_header = t('Home Notifications'); + $notifs = $nm->homeNotifs($show, $startrec, $perpage); + + } + // Set the pager + $a->set_pager_total($notifs['total']); + $a->set_pager_itemspage($perpage); + + // Add additional informations (needed for json output) + $notifs['items_page'] = $a->pager['itemspage']; + $notifs['page'] = $a->pager['page']; + + // Json output + if(intval($json) === 1) + json_return_and_die($notifs); + + $notif_tpl = get_markup_template('notifications.tpl'); + + // Process the data for template creation + if($notifs['ident'] === 'introductions') { + + $sugg = get_markup_template('suggestions.tpl'); + $tpl = get_markup_template("intros.tpl"); + + // The link to switch between ignored and normal connection requests $notif_show_lnk = array( - 'href' => ((strlen($sql_extra)) ? 'notifications/intros/all' : 'notifications/intros' ), - 'text' => ((strlen($sql_extra)) ? t('Show Ignored Requests') : t('Hide Ignored Requests')), - 'id' => "notifications-show-hide-link", + 'href' => ($all === 0 ? 'notifications/intros/all' : 'notifications/intros' ), + 'text' => ($all === 0 ? t('Show Ignored Requests') : t('Hide Ignored Requests')) ); - $r = q("SELECT COUNT(*) AS `total` FROM `intro` - WHERE `intro`.`uid` = %d $sql_extra AND `intro`.`blocked` = 0 ", - intval($_SESSION['uid']) - ); - if(dbm::is_result($r)) { - $a->set_pager_total($r[0]['total']); - $a->set_pager_itemspage($perpage); - } - - /// @todo Fetch contact details by "get_contact_details_by_url" instead of queries to contact, fcontact and gcontact - - $r = q("SELECT `intro`.`id` AS `intro_id`, `intro`.*, `contact`.*, `fcontact`.`name` AS `fname`,`fcontact`.`url` AS `furl`,`fcontact`.`photo` AS `fphoto`,`fcontact`.`request` AS `frequest`, - `gcontact`.`location` AS `glocation`, `gcontact`.`about` AS `gabout`, - `gcontact`.`keywords` AS `gkeywords`, `gcontact`.`gender` AS `ggender`, - `gcontact`.`network` AS `gnetwork` - FROM `intro` - LEFT JOIN `contact` ON `contact`.`id` = `intro`.`contact-id` - LEFT JOIN `gcontact` ON `gcontact`.`nurl` = `contact`.`nurl` - LEFT JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id` - WHERE `intro`.`uid` = %d $sql_extra AND `intro`.`blocked` = 0 ", - intval($_SESSION['uid'])); - - if(dbm::is_result($r)) { - - $sugg = get_markup_template('suggestions.tpl'); - $tpl = get_markup_template("intros.tpl"); - - foreach($r as $rr) { - - if($rr['fid']) { - - $return_addr = bin2hex($a->user['nickname'] . '@' . $a->get_hostname() . (($a->path) ? '/' . $a->path : '')); + // Loop through all introduction notifications.This creates an array with the output html for each + // introduction + foreach ($notifs['notifications'] as $it) { + // There are two kind of introduction. Contacts suggested by other contacts and normal connection requests. + // We have to distinguish between these two because they use different data. + switch ($it['label']) { + case 'friend_suggestion': $notif_content[] = replace_macros($sugg, array( '$str_notifytype' => t('Notification type: '), - '$notify_type' => t('Friend Suggestion'), - '$intro_id' => $rr['intro_id'], - '$madeby' => sprintf( t('suggested by %s'),$rr['name']), - '$contact_id' => $rr['contact-id'], - '$photo' => ((x($rr,'fphoto')) ? proxy_url($rr['fphoto'], false, PROXY_SIZE_SMALL) : "images/person-175.jpg"), - '$fullname' => $rr['fname'], - '$url' => zrl($rr['furl']), - '$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''), - '$activity' => array('activity', t('Post a new friend activity'), (intval(get_pconfig(local_user(),'system','post_newfriend')) ? '1' : 0), t('if applicable')), + '$notify_type' => $it['notify_type'], + '$intro_id' => $it['intro_id'], + '$madeby' => sprintf( t('suggested by %s'),$it['madeby']), + '$contact_id' => $it['contact-id'], + '$photo' => $it['photo'], + '$fullname' => $it['name'], + '$url' => $it['url'], + '$hidden' => array('hidden', t('Hide this contact from others'), ($it['hidden'] == 1), ''), + '$activity' => array('activity', t('Post a new friend activity'), $it['post_newfriend'], t('if applicable')), - '$knowyou' => $knowyou, + '$knowyou' => $it['knowyou'], '$approve' => t('Approve'), - '$note' => $rr['note'], - '$request' => $rr['frequest'] . '?addr=' . $return_addr, + '$note' => $it['note'], + '$request' => $it['request'], '$ignore' => t('Ignore'), '$discard' => t('Discard'), - )); + break; - continue; + // Normal connection requests + default: + $friend_selected = (($it['network'] !== NETWORK_OSTATUS) ? ' checked="checked" ' : ' disabled '); + $fan_selected = (($it['network'] === NETWORK_OSTATUS) ? ' checked="checked" disabled ' : ''); + $dfrn_tpl = get_markup_template('netfriend.tpl'); - } - $friend_selected = (($rr['network'] !== NETWORK_OSTATUS) ? ' checked="checked" ' : ' disabled '); - $fan_selected = (($rr['network'] === NETWORK_OSTATUS) ? ' checked="checked" disabled ' : ''); - $dfrn_tpl = get_markup_template('netfriend.tpl'); + $knowyou = ''; + $dfrn_text = ''; - $knowyou = ''; - $dfrn_text = ''; - - if($rr['network'] === NETWORK_DFRN || $rr['network'] === NETWORK_DIASPORA) { - if($rr['network'] === NETWORK_DFRN) { - $lbl_knowyou = t('Claims to be known to you: '); - $knowyou = (($rr['knowyou']) ? t('yes') : t('no')); - $helptext = t('Shall your connection be bidirectional or not? "Friend" implies that you allow to read and you subscribe to their posts. "Fan/Admirer" means that you allow to read but you do not want to read theirs. Approve as: '); - } else { - $knowyou = ''; - $helptext = t('Shall your connection be bidirectional or not? "Friend" implies that you allow to read and you subscribe to their posts. "Sharer" means that you allow to read but you do not want to read theirs. Approve as: '); + if($it['network'] === NETWORK_DFRN || $it['network'] === NETWORK_DIASPORA) { + if($it['network'] === NETWORK_DFRN) { + $lbl_knowyou = t('Claims to be known to you: '); + $knowyou = (($it['knowyou']) ? t('yes') : t('no')); + $helptext = t('Shall your connection be bidirectional or not? "Friend" implies that you allow to read and you subscribe to their posts. "Fan/Admirer" means that you allow to read but you do not want to read theirs. Approve as: '); + } else { + $knowyou = ''; + $helptext = t('Shall your connection be bidirectional or not? "Friend" implies that you allow to read and you subscribe to their posts. "Sharer" means that you allow to read but you do not want to read theirs. Approve as: '); + } } $dfrn_text = replace_macros($dfrn_tpl,array( - '$intro_id' => $rr['intro_id'], + '$intro_id' => $it['intro_id'], '$friend_selected' => $friend_selected, '$fan_selected' => $fan_selected, '$approve_as' => $helptext, '$as_friend' => t('Friend'), - '$as_fan' => (($rr['network'] == NETWORK_DIASPORA) ? t('Sharer') : t('Fan/Admirer')) + '$as_fan' => (($it['network'] == NETWORK_DIASPORA) ? t('Sharer') : t('Fan/Admirer')) )); - } - $header = $rr["name"]; + $header = $it["name"]; - $ret = probe_url($rr["url"]); + if ($it["addr"] != "") + $header .= " <".$it["addr"].">"; - if ($rr['gnetwork'] == "") - $rr['gnetwork'] = $ret["network"]; + $header .= " (".network_to_name($it['network'], $it['url']).")"; - if ($ret["addr"] != "") - $header .= " <".$ret["addr"].">"; + $notif_content[] = replace_macros($tpl, array( + '$header' => htmlentities($header), + '$str_notifytype' => t('Notification type: '), + '$notify_type' => $it['notify_type'], + '$dfrn_text' => $dfrn_text, + '$dfrn_id' => $it['dfrn_id'], + '$uid' => $it['uid'], + '$intro_id' => $it['intro_id'], + '$contact_id' => $it['contact_id'], + '$photo' => $it['photo'], + '$fullname' => $it['name'], + '$location' => $it['location'], + '$lbl_location' => t('Location:'), + '$about' => $it['about'], + '$lbl_about' => t('About:'), + '$keywords' => $it['keywords'], + '$lbl_keywords' => t('Tags:'), + '$gender' => $it['gender'], + '$lbl_gender' => t('Gender:'), + '$hidden' => array('hidden', t('Hide this contact from others'), ($it['hidden'] == 1), ''), + '$activity' => array('activity', t('Post a new friend activity'), $it['post_newfriend'], t('if applicable')), + '$url' => $it['url'], + '$zrl' => $it['zrl'], + '$lbl_url' => t('Profile URL'), + '$addr' => $it['addr'], + '$lbl_knowyou' => $lbl_knowyou, + '$lbl_network' => t('Network:'), + '$network' => network_to_name($it['network'], $it['url']), + '$knowyou' => $knowyou, + '$approve' => t('Approve'), + '$note' => $it['note'], + '$ignore' => t('Ignore'), + '$discard' => t('Discard'), - $header .= " (".network_to_name($rr['gnetwork'], $rr['url']).")"; - - // Don't show these data until you are connected. Diaspora is doing the same. - if($rr['gnetwork'] === NETWORK_DIASPORA) { - $rr['glocation'] = ""; - $rr['gabout'] = ""; - $rr['ggender'] = ""; - } - - $notif_content[] = replace_macros($tpl, array( - '$header' => htmlentities($header), - '$str_notifytype' => t('Notification type: '), - '$notify_type' => (($rr['network'] !== NETWORK_OSTATUS) ? t('Friend/Connect Request') : t('New Follower')), - '$dfrn_text' => $dfrn_text, - '$dfrn_id' => $rr['issued-id'], - '$uid' => $_SESSION['uid'], - '$intro_id' => $rr['intro_id'], - '$contact_id' => $rr['contact-id'], - '$photo' => ((x($rr,'photo')) ? proxy_url($rr['photo'], false, PROXY_SIZE_SMALL) : "images/person-175.jpg"), - '$fullname' => $rr['name'], - '$location' => bbcode($rr['glocation'], false, false), - '$location_label' => t('Location:'), - '$about' => bbcode($rr['gabout'], false, false), - '$about_label' => t('About:'), - '$keywords' => $rr['gkeywords'], - '$keywords_label' => t('Tags:'), - '$gender' => $rr['ggender'], - '$gender_label' => t('Gender:'), - '$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''), - '$activity' => array('activity', t('Post a new friend activity'), (intval(get_pconfig(local_user(),'system','post_newfriend')) ? '1' : 0), t('if applicable')), - '$url' => $rr['url'], - '$zrl' => zrl($rr['url']), - '$url_label' => t('Profile URL'), - '$addr' => $rr['addr'], - '$lbl_knowyou' => $lbl_knowyou, - '$lbl_network' => t('Network:'), - '$network' => network_to_name($rr['gnetwork'], $rr['url']), - '$knowyou' => $knowyou, - '$approve' => t('Approve'), - '$note' => $rr['note'], - '$ignore' => t('Ignore'), - '$discard' => t('Discard'), - - )); + )); + break; } } - else + + if($notifs['total'] == 0) info( t('No introductions.') . EOL); - } else if (($a->argc > 1) && ($a->argv[1] == 'network')) { - - $notif_header = t('Network Notifications'); - $notif_tpl = get_markup_template('notifications.tpl'); - - $notifs = $nm->networkNotifs($show, $startrec, $perpage); - - $notif_show_lnk = array( - 'href' => ($show ? 'notifications/network' : 'notifications/network?show=all' ), - 'text' => ($show ? t('Show unread') : t('Show all')), - ); - - if(!dbm::is_result($notifs)) { - if($show) - $notif_show_lnk = array(); - - $notif_nocontent = t('No more network notifications.'); - } - - } else if (($a->argc > 1) && ($a->argv[1] == 'system')) { - - $notif_header = t('System Notifications'); - $notif_tpl = get_markup_template('notifications.tpl'); - - $notifs = $nm->systemNotifs($show, $startrec, $perpage); - - $notif_show_lnk = array( - 'href' => ($show ? 'notifications/system' : 'notifications/system?show=all' ), - 'text' => ($show ? t('Show unread') : t('Show all')), - ); - - if(!dbm::is_result($notifs)) { - if($show) - $notif_show_lnk = array(); - - $notif_nocontent = t('No more system notifications.'); - } - - } else if (($a->argc > 1) && ($a->argv[1] == 'personal')) { - - $notif_header = t('Personal Notifications'); - $notif_tpl = get_markup_template('notifications.tpl'); - - $notifs = $nm->personalNotifs($show, $startrec, $perpage); - - $notif_show_lnk = array( - 'href' => ($show ? 'notifications/personal' : 'notifications/personal?show=all' ), - 'text' => ($show ? t('Show unread') : t('Show all')), - ); - - if(!dbm::is_result($notifs)) { - if($show) - $notif_show_lnk = array(); - - $notif_nocontent = t('No more personal notifications.'); - } - - } else if (($a->argc > 1) && ($a->argv[1] == 'home')) { - - $notif_header = t('Home Notifications'); - $notif_tpl = get_markup_template('notifications.tpl'); - - $notifs = $nm->homeNotifs($show, $startrec, $perpage); - - $notif_show_lnk = array( - 'href' => ($show ? 'notifications/home' : 'notifications/home?show=all' ), - 'text' => ($show ? t('Show unread') : t('Show all')), - ); - - if(!dbm::is_result($notifs)) { - if($show) - $notif_show_lnk = array(); - - $notif_nocontent = t('No more home notifications.'); - } - - } - - if(count($notifs['notifications']) > 0 ) { - // set the pager - $a->set_pager_total($notifs['total']); - $a->set_pager_itemspage($perpage); - - // add additional informations (needed for json output) - $notifs['items_page'] = $a->pager['itemspage']; - $notifs['page'] = $a->pager['page']; + // Normal notifications (no introductions) + } else { // The template files we need in different cases for formatting the content $tpl_item_like = 'notifications_likes_item.tpl'; @@ -342,11 +276,15 @@ function notifications_content(&$a) { $tpl_item_post = 'notifications_posts_item.tpl'; $tpl_item_notify = 'notify.tpl'; + // Loop trough ever notification This creates an array with the output html for each + // notification and apply the correct template according to the notificationtype (label). foreach ($notifs['notifications'] as $it) { - $tplname = 'tpl_item_'.$it['label']; - $templ = get_markup_template($$tplname); - $notif_content[] = replace_macros($templ,array( + // We use the notification label to get the correct template file + $tpl_var_name = 'tpl_item_'.$it['label']; + $tpl_notif = get_markup_template($$tpl_var_name); + + $notif_content[] = replace_macros($tpl_notif,array( '$item_label' => $it['label'], '$item_link' => $it['link'], '$item_image' => $it['image'], @@ -356,8 +294,21 @@ function notifications_content(&$a) { )); } + // It doesn't make sense to show the Show unread / Show all link visible if the user is on the + // "Show all" page and there are no notifications. So we will hide it. + if($show == 0 || intval($show) && $notifs['total'] > 0) { + $notif_show_lnk = array( + 'href' => ($show ? 'notifications/'.$notifs['ident'] : 'notifications/'.$notifs['ident'].'?show=all' ), + 'text' => ($show ? t('Show unread') : t('Show all')), + ); + } + + // Output if there aren't any notifications available + if($notifs['total'] == 0) + $notif_nocontent = sprintf( t('No more %s notifications.'), $notifs['ident']); } + $o .= replace_macros($notif_tpl, array( '$notif_header' => $notif_header, '$tabs' => $tabs, From 178b89711a8c3bad5fe0f88be77137cf417024e1 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Wed, 3 Aug 2016 12:55:37 +0200 Subject: [PATCH 024/352] restore gitignore --- .gitignore | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/.gitignore b/.gitignore index 77151060d2..b300f579e2 100644 --- a/.gitignore +++ b/.gitignore @@ -42,16 +42,3 @@ nbproject #ignore local folder /local/ - -#other stuff -.directory -.gitignore - -/view/theme/Friendiboot -/view/theme/Viereinhalb -/view/theme/blog -/view/theme/boheme -/view/theme/clean -/view/theme/suckerberg - -/addon/frio_hovercard From 7157ca3809b816d29492de1bb75f9d1972db3320 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Wed, 3 Aug 2016 15:59:25 +0200 Subject: [PATCH 025/352] Fastlane is now working with any priority level --- boot.php | 2 +- include/items.php | 2 +- include/poller.php | 21 ++++++++++----------- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/boot.php b/boot.php index 7aa33e5662..1beba74a07 100644 --- a/boot.php +++ b/boot.php @@ -2278,7 +2278,7 @@ function current_load() { if (!is_array($load_arr)) return false; - return max($load_arr); + return max($load_arr[0], $load_arr[1]); } /** diff --git a/include/items.php b/include/items.php index 754d5b0882..6d2c830f96 100644 --- a/include/items.php +++ b/include/items.php @@ -1712,7 +1712,7 @@ function item_expire($uid, $days, $network = "", $force = false) { } else $range = "AND `created` < UTC_TIMESTAMP() - INTERVAL %d DAY "; - $r = q("SELECT * FROM `item` + $r = q("SELECT `file`, `resource-id`, `starred`, `type`, `id` FROM `item` WHERE `uid` = %d $range AND `id` = `parent` $sql_extra diff --git a/include/poller.php b/include/poller.php index 6dce81e717..dfc3b90cf0 100644 --- a/include/poller.php +++ b/include/poller.php @@ -270,25 +270,24 @@ function poller_too_much_workers() { $slope = $maxworkers / pow($maxsysload, $exponent); $queues = ceil($slope * pow(max(0, $maxsysload - $load), $exponent)); - if (Config::get("system", "worker_fastlane", false) AND ($queues > 0) AND ($active >= $queues)) { - $s = q("SELECT COUNT(*) AS `total` FROM `workerqueue` WHERE `priority` = %d AND `executed` = '0000-00-00 00:00:00'", - intval(PRIORITY_HIGH)); - $high_waiting = $s[0]["total"]; + $s = q("SELECT COUNT(*) AS `total` FROM `workerqueue` WHERE `executed` = '0000-00-00 00:00:00'"); + $entries = $s[0]["total"]; - $s = q("SELECT COUNT(*) AS `total` FROM `workerqueue` WHERE `priority` = %d AND `executed` != '0000-00-00 00:00:00'", - intval(PRIORITY_HIGH)); + if (Config::get("system", "worker_fastlane", false) AND ($queues > 0) AND ($entries > 0) AND ($active >= $queues)) { + $s = q("SELECT `priority` FROM `workerqueue` WHERE `executed` = '0000-00-00 00:00:00' ORDER BY `priority` LIMIT 1"); + $top_priority = $s[0]["priority"]; + + $s = q("SELECT COUNT(*) AS `total` FROM `workerqueue` WHERE `priority` <= %d AND `executed` != '0000-00-00 00:00:00'", + intval($top_priority)); $high_running = $s[0]["total"]; /// @todo define maximum number of fastlanes - if (($high_waiting > 0) AND ($high_running == 0)) { - logger("There are ".$high_waiting." high priority jobs waiting but none is executed. Open a fastlane.", LOGGER_DEBUG); + if (($high_running == 0) AND ($top_priority >= PRIORITY_HIGH) AND ($top_priority < PRIORITY_LOW)) { + logger("There are jobs with priority ".$top_priority." waiting but none is executed. Open a fastlane.", LOGGER_DEBUG); $queues = $active + 1; } } - $s = q("SELECT COUNT(*) AS `total` FROM `workerqueue` WHERE `executed` = '0000-00-00 00:00:00'"); - $entries = $s[0]["total"]; - logger("Current load: ".$load." - maximum: ".$maxsysload." - current queues: ".$active."/".$entries." - maximum: ".$queues."/".$maxqueues, LOGGER_DEBUG); // Are there fewer workers running as possible? Then fork a new one. From 0cba02a805bab5dec5cc338ad201654edd8262b5 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Wed, 3 Aug 2016 18:24:22 +0200 Subject: [PATCH 026/352] Added priority to some forgotten proc_run calls --- include/dfrn.php | 6 +++--- include/diaspora.php | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/dfrn.php b/include/dfrn.php index 9d91cbce7b..27fc644c6b 100644 --- a/include/dfrn.php +++ b/include/dfrn.php @@ -1692,7 +1692,7 @@ class dfrn { $changed = true; if ($entrytype == DFRN_REPLY_RC) - proc_run("php", "include/notifier.php","comment-import", $current["id"]); + proc_run(PRIORITY_HIGH, "include/notifier.php","comment-import", $current["id"]); } // update last-child if it changes @@ -2252,7 +2252,7 @@ class dfrn { if($posted_id AND $parent AND ($entrytype == DFRN_REPLY_RC)) { logger("Notifying followers about comment ".$posted_id, LOGGER_DEBUG); - proc_run("php", "include/notifier.php", "comment-import", $posted_id); + proc_run(PRIORITY_HIGH, "include/notifier.php", "comment-import", $posted_id); } return true; @@ -2423,7 +2423,7 @@ class dfrn { if($entrytype == DFRN_REPLY_RC) { logger("Notifying followers about deletion of post ".$item["id"], LOGGER_DEBUG); - proc_run("php", "include/notifier.php","drop", $item["id"]); + proc_run(PRIORITY_HIGH, "include/notifier.php","drop", $item["id"]); } } } diff --git a/include/diaspora.php b/include/diaspora.php index bd4f867637..a1adb9b828 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -1184,7 +1184,7 @@ class diaspora { ); // notify others - proc_run("php", "include/notifier.php", "comment-import", $message_id); + proc_run(PRIORITY_HIGH, "include/notifier.php", "comment-import", $message_id); } return $message_id; @@ -1519,7 +1519,7 @@ class diaspora { ); // notify others - proc_run("php", "include/notifier.php", "comment-import", $message_id); + proc_run(PRIORITY_HIGH, "include/notifier.php", "comment-import", $message_id); } return $message_id; @@ -1799,7 +1799,7 @@ class diaspora { $i = item_store($arr); if($i) - proc_run("php", "include/notifier.php", "activity", $i); + proc_run(PRIORITY_HIGH, "include/notifier.php", "activity", $i); } } } @@ -2192,7 +2192,7 @@ class diaspora { // Now check if the retraction needs to be relayed by us if($p[0]["origin"]) { // notify others - proc_run("php", "include/notifier.php", "drop", $r[0]["id"]); + proc_run(PRIORITY_HIGH, "include/notifier.php", "drop", $r[0]["id"]); } return true; From 2d63f9deb646d30c60927026b83e08d0f47c381a Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Thu, 4 Aug 2016 08:51:34 +0200 Subject: [PATCH 027/352] Worker fastlane can now be activated from the admin interface --- mod/admin.php | 3 +++ view/templates/admin_site.tpl | 1 + 2 files changed, 4 insertions(+) diff --git a/mod/admin.php b/mod/admin.php index d49673fc0f..4ae921b048 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -641,6 +641,7 @@ function admin_page_site_post(&$a) { $worker = ((x($_POST,'worker')) ? True : False); $worker_queues = ((x($_POST,'worker_queues')) ? intval($_POST['worker_queues']) : 4); $worker_dont_fork = ((x($_POST,'worker_dont_fork')) ? True : False); + $worker_fastlane = ((x($_POST,'worker_fastlane')) ? True : False); if($a->get_path() != "") $diaspora_enabled = false; @@ -790,6 +791,7 @@ function admin_page_site_post(&$a) { set_config('system','worker', $worker); set_config('system','worker_queues', $worker_queues); set_config('system','worker_dont_fork', $worker_dont_fork); + set_config('system','worker_fastlane', $worker_fastlane); if($rino==2 and !function_exists('mcrypt_create_iv')) { notice(t("RINO2 needs mcrypt php extension to work.")); @@ -1020,6 +1022,7 @@ function admin_page_site(&$a) { '$worker' => array('worker', t("Enable 'worker' background processing"), get_config('system','worker'), t("The worker background processing limits the number of parallel background jobs to a maximum number and respects the system load.")), '$worker_queues' => array('worker_queues', t("Maximum number of parallel workers"), get_config('system','worker_queues'), t("On shared hosters set this to 2. On larger systems, values of 10 are great. Default value is 4.")), '$worker_dont_fork' => array('worker_dont_fork', t("Don't use 'proc_open' with the worker"), get_config('system','worker_dont_fork'), t("Enable this if your system doesn't allow the use of 'proc_open'. This can happen on shared hosters. If this is enabled you should increase the frequency of poller calls in your crontab.")), + '$worker_fastlane' => array('worker_fastlane', t("Enable fastlane"), get_config('system','worker_fastlane'), t("When enabed, the fastlane mechanism starts an additional worker if processes with higher priority are blocked by processes of lower priority.")), '$form_security_token' => get_form_security_token("admin_site") diff --git a/view/templates/admin_site.tpl b/view/templates/admin_site.tpl index 7a6e4fd356..fc84f68605 100644 --- a/view/templates/admin_site.tpl +++ b/view/templates/admin_site.tpl @@ -160,6 +160,7 @@ {{include file="field_checkbox.tpl" field=$worker}} {{include file="field_input.tpl" field=$worker_queues}} {{include file="field_checkbox.tpl" field=$worker_dont_fork}} + {{include file="field_checkbox.tpl" field=$worker_fastlane}}
From 497fd34026fbaa83b11a64d3a0a6e20f1360e5d6 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Thu, 4 Aug 2016 09:09:43 +0200 Subject: [PATCH 028/352] regenerated master messages.po for new strings in the admin panel --- util/messages.po | 8226 +++++++++++++++++++++++----------------------- 1 file changed, 4119 insertions(+), 4107 deletions(-) diff --git a/util/messages.po b/util/messages.po index ac303b20e4..01b65d0ade 100644 --- a/util/messages.po +++ b/util/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-01 07:44+0200\n" +"POT-Creation-Date: 2016-08-04 09:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" -#: include/datetime.php:57 include/datetime.php:59 mod/profiles.php:699 +#: include/datetime.php:57 include/datetime.php:59 mod/profiles.php:698 msgid "Miscellaneous" msgstr "" @@ -26,7 +26,7 @@ msgstr "" msgid "Birthday:" msgstr "" -#: include/datetime.php:185 mod/profiles.php:722 +#: include/datetime.php:185 mod/profiles.php:721 msgid "Age: " msgstr "" @@ -50,8 +50,8 @@ msgstr "" msgid "years" msgstr "" -#: include/datetime.php:358 include/event.php:480 mod/events.php:389 -#: mod/cal.php:287 +#: include/datetime.php:358 include/event.php:480 mod/cal.php:287 +#: mod/events.php:389 msgid "month" msgstr "" @@ -59,8 +59,8 @@ msgstr "" msgid "months" msgstr "" -#: include/datetime.php:359 include/event.php:481 mod/events.php:390 -#: mod/cal.php:288 +#: include/datetime.php:359 include/event.php:481 mod/cal.php:288 +#: mod/events.php:390 msgid "week" msgstr "" @@ -68,8 +68,8 @@ msgstr "" msgid "weeks" msgstr "" -#: include/datetime.php:360 include/event.php:482 mod/events.php:391 -#: mod/cal.php:289 +#: include/datetime.php:360 include/event.php:482 mod/cal.php:289 +#: mod/events.php:391 msgid "day" msgstr "" @@ -128,8 +128,8 @@ msgstr "" msgid "Example: bob@example.com, http://example.com/barbara" msgstr "" -#: include/contact_widgets.php:10 include/identity.php:212 mod/dirfind.php:201 -#: mod/match.php:87 mod/allfriends.php:82 mod/suggest.php:101 +#: include/contact_widgets.php:10 include/identity.php:212 mod/match.php:87 +#: mod/allfriends.php:82 mod/suggest.php:101 mod/dirfind.php:201 msgid "Connect" msgstr "" @@ -149,9 +149,9 @@ msgid "Enter name or interest" msgstr "" #: include/contact_widgets.php:32 include/conversation.php:978 -#: include/Contact.php:324 mod/dirfind.php:204 mod/match.php:72 -#: mod/allfriends.php:66 mod/follow.php:103 mod/suggest.php:83 -#: mod/contacts.php:602 +#: include/Contact.php:324 mod/match.php:72 mod/allfriends.php:66 +#: mod/follow.php:103 mod/suggest.php:83 mod/contacts.php:602 +#: mod/dirfind.php:204 msgid "Connect/Follow" msgstr "" @@ -211,7 +211,7 @@ msgstr[1] "" #: include/contact_widgets.php:242 include/ForumManager.php:119 #: include/items.php:2122 mod/content.php:624 object/Item.php:432 -#: view/theme/vier/theme.php:260 boot.php:889 +#: view/theme/vier/theme.php:260 boot.php:900 msgid "show more" msgstr "" @@ -511,7 +511,7 @@ msgstr "" msgid "Please visit %s to approve or reject the request." msgstr "" -#: include/ForumManager.php:114 include/text.php:998 include/nav.php:130 +#: include/ForumManager.php:114 include/nav.php:130 include/text.php:1007 #: view/theme/vier/theme.php:255 msgid "Forums" msgstr "" @@ -520,47 +520,6 @@ msgstr "" msgid "External link to forum" msgstr "" -#: include/dfrn.php:1110 -#, php-format -msgid "%s\\'s birthday" -msgstr "" - -#: include/uimport.php:94 -msgid "Error decoding account file" -msgstr "" - -#: include/uimport.php:100 -msgid "Error! No version data in file! This is not a Friendica account file?" -msgstr "" - -#: include/uimport.php:116 include/uimport.php:127 -msgid "Error! Cannot check nickname" -msgstr "" - -#: include/uimport.php:120 include/uimport.php:131 -#, php-format -msgid "User '%s' already exists on this server!" -msgstr "" - -#: include/uimport.php:153 -msgid "User creation error" -msgstr "" - -#: include/uimport.php:173 -msgid "User profile creation error" -msgstr "" - -#: include/uimport.php:222 -#, php-format -msgid "%d contact not imported" -msgid_plural "%d contacts not imported" -msgstr[0] "" -msgstr[1] "" - -#: include/uimport.php:292 -msgid "Done. You can now login with your username and password" -msgstr "" - #: include/dba.php:56 include/dba_pdo.php:72 #, php-format msgid "Cannot locate DNS info for database server '%s'" @@ -578,9 +537,9 @@ msgstr "" msgid "Finishes:" msgstr "" -#: include/event.php:39 include/event.php:63 include/identity.php:329 -#: include/bb2diaspora.php:170 mod/events.php:495 mod/directory.php:145 -#: mod/contacts.php:628 mod/notifications.php:208 +#: include/event.php:39 include/event.php:63 include/bb2diaspora.php:170 +#: include/identity.php:329 mod/directory.php:145 mod/notifications.php:208 +#: mod/contacts.php:628 mod/events.php:495 msgid "Location:" msgstr "" @@ -612,31 +571,31 @@ msgstr "" msgid "Sat" msgstr "" -#: include/event.php:448 include/text.php:1103 mod/settings.php:955 +#: include/event.php:448 include/text.php:1112 mod/settings.php:955 msgid "Sunday" msgstr "" -#: include/event.php:449 include/text.php:1103 mod/settings.php:955 +#: include/event.php:449 include/text.php:1112 mod/settings.php:955 msgid "Monday" msgstr "" -#: include/event.php:450 include/text.php:1103 +#: include/event.php:450 include/text.php:1112 msgid "Tuesday" msgstr "" -#: include/event.php:451 include/text.php:1103 +#: include/event.php:451 include/text.php:1112 msgid "Wednesday" msgstr "" -#: include/event.php:452 include/text.php:1103 +#: include/event.php:452 include/text.php:1112 msgid "Thursday" msgstr "" -#: include/event.php:453 include/text.php:1103 +#: include/event.php:453 include/text.php:1112 msgid "Friday" msgstr "" -#: include/event.php:454 include/text.php:1103 +#: include/event.php:454 include/text.php:1112 msgid "Saturday" msgstr "" @@ -656,7 +615,7 @@ msgstr "" msgid "Apr" msgstr "" -#: include/event.php:459 include/event.php:471 include/text.php:1107 +#: include/event.php:459 include/event.php:471 include/text.php:1116 msgid "May" msgstr "" @@ -688,51 +647,51 @@ msgstr "" msgid "Dec" msgstr "" -#: include/event.php:467 include/text.php:1107 +#: include/event.php:467 include/text.php:1116 msgid "January" msgstr "" -#: include/event.php:468 include/text.php:1107 +#: include/event.php:468 include/text.php:1116 msgid "February" msgstr "" -#: include/event.php:469 include/text.php:1107 +#: include/event.php:469 include/text.php:1116 msgid "March" msgstr "" -#: include/event.php:470 include/text.php:1107 +#: include/event.php:470 include/text.php:1116 msgid "April" msgstr "" -#: include/event.php:472 include/text.php:1107 +#: include/event.php:472 include/text.php:1116 msgid "June" msgstr "" -#: include/event.php:473 include/text.php:1107 +#: include/event.php:473 include/text.php:1116 msgid "July" msgstr "" -#: include/event.php:474 include/text.php:1107 +#: include/event.php:474 include/text.php:1116 msgid "August" msgstr "" -#: include/event.php:475 include/text.php:1107 +#: include/event.php:475 include/text.php:1116 msgid "September" msgstr "" -#: include/event.php:476 include/text.php:1107 +#: include/event.php:476 include/text.php:1116 msgid "October" msgstr "" -#: include/event.php:477 include/text.php:1107 +#: include/event.php:477 include/text.php:1116 msgid "November" msgstr "" -#: include/event.php:478 include/text.php:1107 +#: include/event.php:478 include/text.php:1116 msgid "December" msgstr "" -#: include/event.php:479 mod/events.php:388 mod/cal.php:286 +#: include/event.php:479 mod/cal.php:286 mod/events.php:388 msgid "today" msgstr "" @@ -744,7 +703,7 @@ msgstr "" msgid "Edit event" msgstr "" -#: include/event.php:608 include/text.php:1509 include/text.php:1516 +#: include/event.php:608 include/text.php:1518 include/text.php:1525 msgid "link to source" msgstr "" @@ -1012,640 +971,6 @@ msgstr "" msgid "Ask me" msgstr "" -#: include/items.php:1447 mod/dfrn_confirm.php:726 mod/dfrn_request.php:745 -msgid "[Name Withheld]" -msgstr "" - -#: include/items.php:1805 mod/viewsrc.php:15 mod/admin.php:234 -#: mod/admin.php:1445 mod/admin.php:1679 mod/display.php:104 -#: mod/display.php:279 mod/display.php:478 mod/notice.php:15 -msgid "Item not found." -msgstr "" - -#: include/items.php:1844 -msgid "Do you really want to delete this item?" -msgstr "" - -#: include/items.php:1846 mod/follow.php:110 mod/suggest.php:29 -#: mod/register.php:238 mod/settings.php:1113 mod/settings.php:1119 -#: mod/settings.php:1127 mod/settings.php:1131 mod/settings.php:1136 -#: mod/settings.php:1142 mod/settings.php:1148 mod/settings.php:1154 -#: mod/settings.php:1180 mod/settings.php:1181 mod/settings.php:1182 -#: mod/settings.php:1183 mod/settings.php:1184 mod/api.php:105 -#: mod/message.php:217 mod/contacts.php:442 mod/dfrn_request.php:861 -#: mod/profiles.php:642 mod/profiles.php:645 mod/profiles.php:671 -msgid "Yes" -msgstr "" - -#: include/items.php:1849 include/conversation.php:1274 mod/fbrowser.php:101 -#: mod/fbrowser.php:136 mod/tagrm.php:11 mod/tagrm.php:94 mod/videos.php:131 -#: mod/follow.php:121 mod/suggest.php:32 mod/editpost.php:148 -#: mod/settings.php:664 mod/settings.php:690 mod/message.php:220 -#: mod/contacts.php:445 mod/dfrn_request.php:875 mod/photos.php:248 -#: mod/photos.php:337 -msgid "Cancel" -msgstr "" - -#: include/items.php:2011 mod/regmod.php:110 mod/dirfind.php:11 -#: mod/wall_upload.php:77 mod/wall_upload.php:80 mod/fsuggest.php:78 -#: mod/notes.php:22 mod/events.php:190 mod/uimport.php:23 mod/nogroup.php:25 -#: mod/invite.php:15 mod/invite.php:101 mod/viewcontacts.php:45 -#: mod/wall_attach.php:67 mod/wall_attach.php:70 mod/allfriends.php:12 -#: mod/cal.php:308 mod/repair_ostatus.php:9 mod/delegate.php:12 -#: mod/poke.php:150 mod/attach.php:33 mod/follow.php:11 mod/follow.php:73 -#: mod/follow.php:155 mod/suggest.php:58 mod/display.php:474 mod/common.php:18 -#: mod/mood.php:114 mod/editpost.php:10 mod/network.php:4 mod/group.php:19 -#: mod/profile_photo.php:19 mod/profile_photo.php:175 -#: mod/profile_photo.php:186 mod/profile_photo.php:199 mod/register.php:42 -#: mod/settings.php:22 mod/settings.php:128 mod/settings.php:650 -#: mod/wallmessage.php:9 mod/wallmessage.php:33 mod/wallmessage.php:79 -#: mod/wallmessage.php:103 mod/api.php:26 mod/api.php:31 mod/item.php:185 -#: mod/item.php:197 mod/ostatus_subscribe.php:9 mod/message.php:46 -#: mod/message.php:182 mod/manage.php:96 mod/contacts.php:350 -#: mod/crepair.php:100 mod/dfrn_confirm.php:57 mod/photos.php:172 -#: mod/photos.php:1093 mod/profiles.php:166 mod/profiles.php:599 -#: mod/notifications.php:65 index.php:397 -msgid "Permission denied." -msgstr "" - -#: include/items.php:2116 -msgid "Archives" -msgstr "" - -#: include/text.php:304 -msgid "newer" -msgstr "" - -#: include/text.php:306 -msgid "older" -msgstr "" - -#: include/text.php:311 -msgid "prev" -msgstr "" - -#: include/text.php:313 -msgid "first" -msgstr "" - -#: include/text.php:345 -msgid "last" -msgstr "" - -#: include/text.php:348 -msgid "next" -msgstr "" - -#: include/text.php:403 -msgid "Loading more entries..." -msgstr "" - -#: include/text.php:404 -msgid "The end" -msgstr "" - -#: include/text.php:871 -msgid "No contacts" -msgstr "" - -#: include/text.php:886 -#, php-format -msgid "%d Contact" -msgid_plural "%d Contacts" -msgstr[0] "" -msgstr[1] "" - -#: include/text.php:898 -msgid "View Contacts" -msgstr "" - -#: include/text.php:985 include/nav.php:122 mod/search.php:149 -msgid "Search" -msgstr "" - -#: include/text.php:986 mod/notes.php:61 mod/filer.php:31 mod/editpost.php:109 -msgid "Save" -msgstr "" - -#: include/text.php:988 include/nav.php:40 -msgid "@name, !forum, #tags, content" -msgstr "" - -#: include/text.php:993 include/nav.php:125 -msgid "Full Text" -msgstr "" - -#: include/text.php:994 include/nav.php:126 -msgid "Tags" -msgstr "" - -#: include/text.php:995 include/identity.php:781 include/identity.php:784 -#: include/nav.php:127 include/nav.php:193 mod/viewcontacts.php:116 -#: mod/contacts.php:790 mod/contacts.php:851 view/theme/frio/theme.php:257 -#: view/theme/diabook/theme.php:125 -msgid "Contacts" -msgstr "" - -#: include/text.php:1049 -msgid "poke" -msgstr "" - -#: include/text.php:1049 -msgid "poked" -msgstr "" - -#: include/text.php:1050 -msgid "ping" -msgstr "" - -#: include/text.php:1050 -msgid "pinged" -msgstr "" - -#: include/text.php:1051 -msgid "prod" -msgstr "" - -#: include/text.php:1051 -msgid "prodded" -msgstr "" - -#: include/text.php:1052 -msgid "slap" -msgstr "" - -#: include/text.php:1052 -msgid "slapped" -msgstr "" - -#: include/text.php:1053 -msgid "finger" -msgstr "" - -#: include/text.php:1053 -msgid "fingered" -msgstr "" - -#: include/text.php:1054 -msgid "rebuff" -msgstr "" - -#: include/text.php:1054 -msgid "rebuffed" -msgstr "" - -#: include/text.php:1068 -msgid "happy" -msgstr "" - -#: include/text.php:1069 -msgid "sad" -msgstr "" - -#: include/text.php:1070 -msgid "mellow" -msgstr "" - -#: include/text.php:1071 -msgid "tired" -msgstr "" - -#: include/text.php:1072 -msgid "perky" -msgstr "" - -#: include/text.php:1073 -msgid "angry" -msgstr "" - -#: include/text.php:1074 -msgid "stupified" -msgstr "" - -#: include/text.php:1075 -msgid "puzzled" -msgstr "" - -#: include/text.php:1076 -msgid "interested" -msgstr "" - -#: include/text.php:1077 -msgid "bitter" -msgstr "" - -#: include/text.php:1078 -msgid "cheerful" -msgstr "" - -#: include/text.php:1079 -msgid "alive" -msgstr "" - -#: include/text.php:1080 -msgid "annoyed" -msgstr "" - -#: include/text.php:1081 -msgid "anxious" -msgstr "" - -#: include/text.php:1082 -msgid "cranky" -msgstr "" - -#: include/text.php:1083 -msgid "disturbed" -msgstr "" - -#: include/text.php:1084 -msgid "frustrated" -msgstr "" - -#: include/text.php:1085 -msgid "motivated" -msgstr "" - -#: include/text.php:1086 -msgid "relaxed" -msgstr "" - -#: include/text.php:1087 -msgid "surprised" -msgstr "" - -#: include/text.php:1301 mod/videos.php:383 -msgid "View Video" -msgstr "" - -#: include/text.php:1333 -msgid "bytes" -msgstr "" - -#: include/text.php:1365 include/text.php:1377 -msgid "Click to open/close" -msgstr "" - -#: include/text.php:1503 -msgid "View on separate page" -msgstr "" - -#: include/text.php:1504 -msgid "view on separate page" -msgstr "" - -#: include/text.php:1779 include/like.php:165 include/conversation.php:122 -#: include/conversation.php:258 view/theme/diabook/theme.php:463 -msgid "event" -msgstr "" - -#: include/text.php:1781 include/like.php:163 include/conversation.php:130 -#: include/conversation.php:266 mod/tagger.php:62 mod/subthread.php:87 -#: view/theme/diabook/theme.php:471 -msgid "photo" -msgstr "" - -#: include/text.php:1783 -msgid "activity" -msgstr "" - -#: include/text.php:1785 mod/content.php:623 object/Item.php:431 -#: object/Item.php:444 -msgid "comment" -msgid_plural "comments" -msgstr[0] "" -msgstr[1] "" - -#: include/text.php:1786 -msgid "post" -msgstr "" - -#: include/text.php:1954 -msgid "Item filed" -msgstr "" - -#: include/identity.php:42 -msgid "Requested account is not available." -msgstr "" - -#: include/identity.php:51 mod/profile.php:21 -msgid "Requested profile is not available." -msgstr "" - -#: include/identity.php:95 include/identity.php:305 include/identity.php:686 -msgid "Edit profile" -msgstr "" - -#: include/identity.php:245 -msgid "Atom feed" -msgstr "" - -#: include/identity.php:250 include/conversation.php:1287 mod/editpost.php:152 -msgid "Message" -msgstr "" - -#: include/identity.php:276 include/nav.php:191 -msgid "Profiles" -msgstr "" - -#: include/identity.php:276 -msgid "Manage/edit profiles" -msgstr "" - -#: include/identity.php:281 include/identity.php:307 mod/profiles.php:788 -msgid "Change profile photo" -msgstr "" - -#: include/identity.php:282 mod/profiles.php:789 -msgid "Create New Profile" -msgstr "" - -#: include/identity.php:292 mod/profiles.php:778 -msgid "Profile Image" -msgstr "" - -#: include/identity.php:295 mod/profiles.php:780 -msgid "visible to everybody" -msgstr "" - -#: include/identity.php:296 mod/profiles.php:685 mod/profiles.php:781 -msgid "Edit visibility" -msgstr "" - -#: include/identity.php:319 mod/dirfind.php:223 mod/directory.php:174 -#: mod/match.php:84 mod/viewcontacts.php:105 mod/allfriends.php:79 -#: mod/cal.php:44 mod/videos.php:37 mod/suggest.php:98 mod/hovercard.php:80 -#: mod/common.php:123 mod/network.php:517 mod/contacts.php:51 -#: mod/contacts.php:626 mod/contacts.php:953 mod/photos.php:42 -msgid "Forum" -msgstr "" - -#: include/identity.php:331 include/identity.php:614 mod/directory.php:147 -#: mod/notifications.php:214 -msgid "Gender:" -msgstr "" - -#: include/identity.php:334 include/identity.php:634 mod/directory.php:149 -msgid "Status:" -msgstr "" - -#: include/identity.php:336 include/identity.php:645 mod/directory.php:151 -msgid "Homepage:" -msgstr "" - -#: include/identity.php:338 include/identity.php:655 mod/directory.php:153 -#: mod/contacts.php:630 mod/notifications.php:210 -msgid "About:" -msgstr "" - -#: include/identity.php:420 mod/contacts.php:50 mod/notifications.php:222 -msgid "Network:" -msgstr "" - -#: include/identity.php:449 include/identity.php:533 -msgid "g A l F d" -msgstr "" - -#: include/identity.php:450 include/identity.php:534 -msgid "F d" -msgstr "" - -#: include/identity.php:495 include/identity.php:580 -msgid "[today]" -msgstr "" - -#: include/identity.php:507 -msgid "Birthday Reminders" -msgstr "" - -#: include/identity.php:508 -msgid "Birthdays this week:" -msgstr "" - -#: include/identity.php:567 -msgid "[No description]" -msgstr "" - -#: include/identity.php:591 -msgid "Event Reminders" -msgstr "" - -#: include/identity.php:592 -msgid "Events this week:" -msgstr "" - -#: include/identity.php:603 include/identity.php:689 include/identity.php:720 -#: include/nav.php:79 mod/profperm.php:104 mod/newmember.php:32 -#: mod/contacts.php:637 mod/contacts.php:839 view/theme/frio/theme.php:247 -#: view/theme/diabook/theme.php:124 -msgid "Profile" -msgstr "" - -#: include/identity.php:612 mod/settings.php:1229 -msgid "Full Name:" -msgstr "" - -#: include/identity.php:619 -msgid "j F, Y" -msgstr "" - -#: include/identity.php:620 -msgid "j F" -msgstr "" - -#: include/identity.php:631 -msgid "Age:" -msgstr "" - -#: include/identity.php:640 -#, php-format -msgid "for %1$d %2$s" -msgstr "" - -#: include/identity.php:643 mod/profiles.php:704 -msgid "Sexual Preference:" -msgstr "" - -#: include/identity.php:647 mod/profiles.php:730 -msgid "Hometown:" -msgstr "" - -#: include/identity.php:649 mod/follow.php:134 mod/contacts.php:632 -#: mod/notifications.php:212 -msgid "Tags:" -msgstr "" - -#: include/identity.php:651 mod/profiles.php:731 -msgid "Political Views:" -msgstr "" - -#: include/identity.php:653 -msgid "Religion:" -msgstr "" - -#: include/identity.php:657 -msgid "Hobbies/Interests:" -msgstr "" - -#: include/identity.php:659 mod/profiles.php:735 -msgid "Likes:" -msgstr "" - -#: include/identity.php:661 mod/profiles.php:736 -msgid "Dislikes:" -msgstr "" - -#: include/identity.php:664 -msgid "Contact information and Social Networks:" -msgstr "" - -#: include/identity.php:666 -msgid "Musical interests:" -msgstr "" - -#: include/identity.php:668 -msgid "Books, literature:" -msgstr "" - -#: include/identity.php:670 -msgid "Television:" -msgstr "" - -#: include/identity.php:672 -msgid "Film/dance/culture/entertainment:" -msgstr "" - -#: include/identity.php:674 -msgid "Love/Romance:" -msgstr "" - -#: include/identity.php:676 -msgid "Work/employment:" -msgstr "" - -#: include/identity.php:678 -msgid "School/education:" -msgstr "" - -#: include/identity.php:682 -msgid "Forums:" -msgstr "" - -#: include/identity.php:690 mod/events.php:508 -msgid "Basic" -msgstr "" - -#: include/identity.php:691 mod/events.php:509 mod/admin.php:928 -#: mod/contacts.php:868 -msgid "Advanced" -msgstr "" - -#: include/identity.php:712 include/nav.php:78 mod/contacts.php:635 -#: mod/contacts.php:831 view/theme/frio/theme.php:246 -msgid "Status" -msgstr "" - -#: include/identity.php:715 mod/follow.php:143 mod/contacts.php:834 -msgid "Status Messages and Posts" -msgstr "" - -#: include/identity.php:723 mod/contacts.php:842 -msgid "Profile Details" -msgstr "" - -#: include/identity.php:728 include/nav.php:80 mod/fbrowser.php:32 -#: view/theme/frio/theme.php:248 view/theme/diabook/theme.php:126 -msgid "Photos" -msgstr "" - -#: include/identity.php:731 mod/photos.php:100 -msgid "Photo Albums" -msgstr "" - -#: include/identity.php:736 include/identity.php:739 include/nav.php:81 -#: view/theme/frio/theme.php:249 -msgid "Videos" -msgstr "" - -#: include/identity.php:748 include/identity.php:759 include/nav.php:82 -#: include/nav.php:146 mod/events.php:379 mod/cal.php:278 -#: view/theme/frio/theme.php:250 view/theme/frio/theme.php:254 -#: view/theme/diabook/theme.php:127 -msgid "Events" -msgstr "" - -#: include/identity.php:751 include/identity.php:762 include/nav.php:146 -#: view/theme/frio/theme.php:254 -msgid "Events and Calendar" -msgstr "" - -#: include/identity.php:770 mod/notes.php:46 -msgid "Personal Notes" -msgstr "" - -#: include/identity.php:773 -msgid "Only You Can See This" -msgstr "" - -#: include/follow.php:77 mod/dfrn_request.php:507 -msgid "Disallowed profile URL." -msgstr "" - -#: include/follow.php:82 -msgid "Connect URL missing." -msgstr "" - -#: include/follow.php:109 -msgid "" -"This site is not configured to allow communications with other networks." -msgstr "" - -#: include/follow.php:110 include/follow.php:130 -msgid "No compatible communication protocols or feeds were discovered." -msgstr "" - -#: include/follow.php:128 -msgid "The profile address specified does not provide adequate information." -msgstr "" - -#: include/follow.php:132 -msgid "An author or name was not found." -msgstr "" - -#: include/follow.php:134 -msgid "No browser URL could be matched to this address." -msgstr "" - -#: include/follow.php:136 -msgid "" -"Unable to match @-style Identity Address with a known protocol or email " -"contact." -msgstr "" - -#: include/follow.php:137 -msgid "Use mailto: in front of address to force email check." -msgstr "" - -#: include/follow.php:143 -msgid "" -"The profile address specified belongs to a network which has been disabled " -"on this site." -msgstr "" - -#: include/follow.php:153 -msgid "" -"Limited profile. This person will be unable to receive direct/personal " -"notifications from you." -msgstr "" - -#: include/follow.php:254 -msgid "Unable to retrieve contact information." -msgstr "" - -#: include/follow.php:287 -msgid "following" -msgstr "" - #: include/oembed.php:229 msgid "Embedded content" msgstr "" @@ -1821,11 +1146,11 @@ msgid "An error occurred creating your default profile. Please try again." msgstr "" #: include/user.php:345 include/user.php:352 include/user.php:359 -#: mod/profile_photo.php:74 mod/profile_photo.php:81 mod/profile_photo.php:88 -#: mod/profile_photo.php:210 mod/profile_photo.php:302 -#: mod/profile_photo.php:311 mod/photos.php:79 mod/photos.php:193 -#: mod/photos.php:770 mod/photos.php:1233 mod/photos.php:1256 -#: mod/photos.php:1850 view/theme/diabook/theme.php:500 +#: mod/photos.php:79 mod/photos.php:193 mod/photos.php:770 mod/photos.php:1233 +#: mod/photos.php:1256 mod/photos.php:1850 mod/profile_photo.php:74 +#: mod/profile_photo.php:81 mod/profile_photo.php:88 mod/profile_photo.php:210 +#: mod/profile_photo.php:302 mod/profile_photo.php:311 +#: view/theme/diabook/theme.php:500 msgid "Profile Photos" msgstr "" @@ -1873,7 +1198,7 @@ msgid "" "\t\tThank you and welcome to %2$s." msgstr "" -#: include/user.php:423 mod/admin.php:1178 +#: include/user.php:423 mod/admin.php:1181 #, php-format msgid "Registration details for %s" msgstr "" @@ -2089,7 +1414,11 @@ msgstr "" msgid "Clear notifications" msgstr "" -#: include/nav.php:75 view/theme/frio/theme.php:243 boot.php:1620 +#: include/nav.php:40 include/text.php:997 +msgid "@name, !forum, #tags, content" +msgstr "" + +#: include/nav.php:75 view/theme/frio/theme.php:243 boot.php:1652 msgid "Logout" msgstr "" @@ -2097,25 +1426,54 @@ msgstr "" msgid "End this session" msgstr "" +#: include/nav.php:78 include/identity.php:712 mod/contacts.php:635 +#: mod/contacts.php:831 view/theme/frio/theme.php:246 +msgid "Status" +msgstr "" + #: include/nav.php:78 include/nav.php:163 view/theme/frio/theme.php:246 #: view/theme/diabook/theme.php:123 msgid "Your posts and conversations" msgstr "" +#: include/nav.php:79 include/identity.php:603 include/identity.php:689 +#: include/identity.php:720 mod/profperm.php:104 mod/newmember.php:32 +#: mod/contacts.php:637 mod/contacts.php:839 view/theme/frio/theme.php:247 +#: view/theme/diabook/theme.php:124 +msgid "Profile" +msgstr "" + #: include/nav.php:79 view/theme/frio/theme.php:247 #: view/theme/diabook/theme.php:124 msgid "Your profile page" msgstr "" +#: include/nav.php:80 include/identity.php:728 mod/fbrowser.php:32 +#: view/theme/frio/theme.php:248 view/theme/diabook/theme.php:126 +msgid "Photos" +msgstr "" + #: include/nav.php:80 view/theme/frio/theme.php:248 #: view/theme/diabook/theme.php:126 msgid "Your photos" msgstr "" +#: include/nav.php:81 include/identity.php:736 include/identity.php:739 +#: view/theme/frio/theme.php:249 +msgid "Videos" +msgstr "" + #: include/nav.php:81 view/theme/frio/theme.php:249 msgid "Your videos" msgstr "" +#: include/nav.php:82 include/nav.php:146 include/identity.php:748 +#: include/identity.php:759 mod/cal.php:278 mod/events.php:379 +#: view/theme/frio/theme.php:250 view/theme/frio/theme.php:254 +#: view/theme/diabook/theme.php:127 +msgid "Events" +msgstr "" + #: include/nav.php:82 view/theme/frio/theme.php:250 #: view/theme/diabook/theme.php:127 msgid "Your events" @@ -2129,7 +1487,7 @@ msgstr "" msgid "Your personal notes" msgstr "" -#: include/nav.php:94 mod/bookmarklet.php:12 boot.php:1621 +#: include/nav.php:94 mod/bookmarklet.php:12 boot.php:1653 msgid "Login" msgstr "" @@ -2146,7 +1504,7 @@ msgstr "" msgid "Home Page" msgstr "" -#: include/nav.php:111 mod/register.php:280 boot.php:1596 +#: include/nav.php:111 mod/register.php:280 boot.php:1628 msgid "Register" msgstr "" @@ -2170,10 +1528,29 @@ msgstr "" msgid "Addon applications, utilities, games" msgstr "" +#: include/nav.php:122 include/text.php:994 mod/search.php:149 +msgid "Search" +msgstr "" + #: include/nav.php:122 msgid "Search site content" msgstr "" +#: include/nav.php:125 include/text.php:1002 +msgid "Full Text" +msgstr "" + +#: include/nav.php:126 include/text.php:1003 +msgid "Tags" +msgstr "" + +#: include/nav.php:127 include/nav.php:193 include/identity.php:781 +#: include/identity.php:784 include/text.php:1004 mod/viewcontacts.php:116 +#: mod/contacts.php:790 mod/contacts.php:851 view/theme/frio/theme.php:257 +#: view/theme/diabook/theme.php:125 +msgid "Contacts" +msgstr "" + #: include/nav.php:141 include/nav.php:143 mod/community.php:36 #: view/theme/diabook/theme.php:129 msgid "Community" @@ -2187,6 +1564,11 @@ msgstr "" msgid "Conversations on the network" msgstr "" +#: include/nav.php:146 include/identity.php:751 include/identity.php:762 +#: view/theme/frio/theme.php:254 +msgid "Events and Calendar" +msgstr "" + #: include/nav.php:148 msgid "Directory" msgstr "" @@ -2203,7 +1585,7 @@ msgstr "" msgid "Information about this friendica instance" msgstr "" -#: include/nav.php:160 mod/admin.php:402 mod/notifications.php:533 +#: include/nav.php:160 mod/notifications.php:533 mod/admin.php:402 #: view/theme/frio/theme.php:253 msgid "Network" msgstr "" @@ -2280,8 +1662,8 @@ msgstr "" msgid "Delegate Page Management" msgstr "" -#: include/nav.php:188 mod/admin.php:1498 mod/admin.php:1756 -#: mod/newmember.php:22 mod/settings.php:111 view/theme/frio/theme.php:256 +#: include/nav.php:188 mod/newmember.php:22 mod/admin.php:1501 +#: mod/admin.php:1759 mod/settings.php:111 view/theme/frio/theme.php:256 #: view/theme/diabook/theme.php:544 view/theme/diabook/theme.php:648 msgid "Settings" msgstr "" @@ -2290,6 +1672,10 @@ msgstr "" msgid "Account settings" msgstr "" +#: include/nav.php:191 include/identity.php:276 +msgid "Profiles" +msgstr "" + #: include/nav.php:191 msgid "Manage/Edit Profiles" msgstr "" @@ -2314,87 +1700,6 @@ msgstr "" msgid "Site map" msgstr "" -#: include/like.php:163 include/conversation.php:125 -#: include/conversation.php:134 include/conversation.php:261 -#: include/conversation.php:270 include/diaspora.php:1402 mod/tagger.php:62 -#: mod/subthread.php:87 view/theme/diabook/theme.php:466 -#: view/theme/diabook/theme.php:475 -msgid "status" -msgstr "" - -#: include/like.php:182 include/conversation.php:141 include/diaspora.php:1398 -#: view/theme/diabook/theme.php:480 -#, php-format -msgid "%1$s likes %2$s's %3$s" -msgstr "" - -#: include/like.php:184 include/conversation.php:144 -#, php-format -msgid "%1$s doesn't like %2$s's %3$s" -msgstr "" - -#: include/like.php:186 -#, php-format -msgid "%1$s is attending %2$s's %3$s" -msgstr "" - -#: include/like.php:188 -#, php-format -msgid "%1$s is not attending %2$s's %3$s" -msgstr "" - -#: include/like.php:190 -#, php-format -msgid "%1$s may attend %2$s's %3$s" -msgstr "" - -#: include/message.php:15 include/message.php:173 -msgid "[no subject]" -msgstr "" - -#: include/acl_selectors.php:327 -msgid "Post to Email" -msgstr "" - -#: include/acl_selectors.php:332 -#, php-format -msgid "Connectors disabled, since \"%s\" is enabled." -msgstr "" - -#: include/acl_selectors.php:333 mod/settings.php:1131 -msgid "Hide your profile details from unknown viewers?" -msgstr "" - -#: include/acl_selectors.php:338 -msgid "Visible to everybody" -msgstr "" - -#: include/acl_selectors.php:339 view/theme/vier/config.php:103 -#: view/theme/diabook/theme.php:621 view/theme/diabook/config.php:142 -msgid "show" -msgstr "" - -#: include/acl_selectors.php:340 view/theme/vier/config.php:103 -#: view/theme/diabook/theme.php:621 view/theme/diabook/config.php:142 -msgid "don't show" -msgstr "" - -#: include/acl_selectors.php:346 mod/editpost.php:133 -msgid "CC: email addresses" -msgstr "" - -#: include/acl_selectors.php:347 mod/editpost.php:140 -msgid "Example: bob@example.com, mary@example.com" -msgstr "" - -#: include/acl_selectors.php:349 mod/photos.php:1178 mod/photos.php:1563 -msgid "Permissions" -msgstr "" - -#: include/acl_selectors.php:350 -msgid "Close" -msgstr "" - #: include/contact_selectors.php:32 msgid "Unknown | Not categorised" msgstr "" @@ -2419,19 +1724,19 @@ msgstr "" msgid "Reputable, has my trust" msgstr "" -#: include/contact_selectors.php:56 mod/admin.php:859 +#: include/contact_selectors.php:56 mod/admin.php:861 msgid "Frequently" msgstr "" -#: include/contact_selectors.php:57 mod/admin.php:860 +#: include/contact_selectors.php:57 mod/admin.php:862 msgid "Hourly" msgstr "" -#: include/contact_selectors.php:58 mod/admin.php:861 +#: include/contact_selectors.php:58 mod/admin.php:863 msgid "Twice daily" msgstr "" -#: include/contact_selectors.php:59 mod/admin.php:862 +#: include/contact_selectors.php:59 mod/admin.php:864 msgid "Daily" msgstr "" @@ -2456,12 +1761,12 @@ msgid "RSS/Atom" msgstr "" #: include/contact_selectors.php:79 include/contact_selectors.php:86 -#: mod/admin.php:1371 mod/admin.php:1384 mod/admin.php:1396 mod/admin.php:1414 +#: mod/admin.php:1374 mod/admin.php:1387 mod/admin.php:1399 mod/admin.php:1417 msgid "Email" msgstr "" -#: include/contact_selectors.php:80 mod/settings.php:827 -#: mod/dfrn_request.php:869 +#: include/contact_selectors.php:80 mod/dfrn_request.php:869 +#: mod/settings.php:827 msgid "Diaspora" msgstr "" @@ -2513,6 +1818,36 @@ msgstr "" msgid "Hubzilla/Redmatrix" msgstr "" +#: include/conversation.php:122 include/conversation.php:258 +#: include/like.php:165 include/text.php:1788 view/theme/diabook/theme.php:463 +msgid "event" +msgstr "" + +#: include/conversation.php:125 include/conversation.php:134 +#: include/conversation.php:261 include/conversation.php:270 +#: include/diaspora.php:1402 include/like.php:163 mod/subthread.php:87 +#: mod/tagger.php:62 view/theme/diabook/theme.php:466 +#: view/theme/diabook/theme.php:475 +msgid "status" +msgstr "" + +#: include/conversation.php:130 include/conversation.php:266 +#: include/like.php:163 include/text.php:1790 mod/subthread.php:87 +#: mod/tagger.php:62 view/theme/diabook/theme.php:471 +msgid "photo" +msgstr "" + +#: include/conversation.php:141 include/diaspora.php:1398 include/like.php:182 +#: view/theme/diabook/theme.php:480 +#, php-format +msgid "%1$s likes %2$s's %3$s" +msgstr "" + +#: include/conversation.php:144 include/like.php:184 +#, php-format +msgid "%1$s doesn't like %2$s's %3$s" +msgstr "" + #: include/conversation.php:147 #, php-format msgid "%1$s attends %2$s's %3$s" @@ -2557,39 +1892,39 @@ msgstr "" msgid "%1$s marked %2$s's %3$s as favorite" msgstr "" -#: include/conversation.php:587 mod/photos.php:1635 mod/profiles.php:345 -#: mod/content.php:372 +#: include/conversation.php:587 mod/content.php:372 mod/photos.php:1635 +#: mod/profiles.php:345 msgid "Likes" msgstr "" -#: include/conversation.php:587 mod/photos.php:1635 mod/profiles.php:349 -#: mod/content.php:372 +#: include/conversation.php:587 mod/content.php:372 mod/photos.php:1635 +#: mod/profiles.php:349 msgid "Dislikes" msgstr "" #: include/conversation.php:588 include/conversation.php:1471 -#: mod/photos.php:1636 mod/content.php:373 +#: mod/content.php:373 mod/photos.php:1636 msgid "Attending" msgid_plural "Attending" msgstr[0] "" msgstr[1] "" -#: include/conversation.php:588 mod/photos.php:1636 mod/content.php:373 +#: include/conversation.php:588 mod/content.php:373 mod/photos.php:1636 msgid "Not attending" msgstr "" -#: include/conversation.php:588 mod/photos.php:1636 mod/content.php:373 +#: include/conversation.php:588 mod/content.php:373 mod/photos.php:1636 msgid "Might attend" msgstr "" -#: include/conversation.php:710 mod/photos.php:1710 mod/content.php:453 -#: mod/content.php:758 object/Item.php:133 +#: include/conversation.php:710 mod/content.php:453 mod/content.php:758 +#: mod/photos.php:1710 object/Item.php:133 msgid "Select" msgstr "" -#: include/conversation.php:711 mod/admin.php:1388 mod/group.php:171 -#: mod/settings.php:726 mod/contacts.php:806 mod/contacts.php:1021 -#: mod/photos.php:1711 mod/content.php:454 mod/content.php:759 +#: include/conversation.php:711 mod/group.php:171 mod/content.php:454 +#: mod/content.php:759 mod/admin.php:1391 mod/contacts.php:806 +#: mod/contacts.php:1021 mod/photos.php:1711 mod/settings.php:726 #: object/Item.php:134 msgid "Delete" msgstr "" @@ -2620,8 +1955,8 @@ msgstr "" #: include/conversation.php:793 include/conversation.php:1255 #: mod/editpost.php:124 mod/wallmessage.php:156 mod/message.php:356 -#: mod/message.php:548 mod/photos.php:1598 mod/content.php:515 -#: mod/content.php:948 object/Item.php:406 +#: mod/message.php:548 mod/content.php:515 mod/content.php:948 +#: mod/photos.php:1598 object/Item.php:406 msgid "Please wait" msgstr "" @@ -2643,8 +1978,8 @@ msgstr "" #: include/conversation.php:966 include/conversation.php:980 #: include/Contact.php:310 include/Contact.php:323 include/Contact.php:365 -#: mod/dirfind.php:203 mod/directory.php:163 mod/match.php:71 -#: mod/allfriends.php:65 mod/suggest.php:82 +#: mod/directory.php:163 mod/match.php:71 mod/allfriends.php:65 +#: mod/suggest.php:82 mod/dirfind.php:203 msgid "View Profile" msgstr "" @@ -2869,12 +2204,21 @@ msgstr "" msgid "Public post" msgstr "" -#: include/conversation.php:1270 mod/events.php:505 mod/editpost.php:145 -#: mod/photos.php:1619 mod/photos.php:1667 mod/photos.php:1755 -#: mod/content.php:737 object/Item.php:729 +#: include/conversation.php:1270 mod/editpost.php:145 mod/content.php:737 +#: mod/events.php:505 mod/photos.php:1619 mod/photos.php:1667 +#: mod/photos.php:1755 object/Item.php:729 msgid "Preview" msgstr "" +#: include/conversation.php:1274 include/items.php:1849 mod/fbrowser.php:101 +#: mod/fbrowser.php:136 mod/tagrm.php:11 mod/tagrm.php:94 mod/follow.php:121 +#: mod/suggest.php:32 mod/editpost.php:148 mod/message.php:220 +#: mod/dfrn_request.php:875 mod/contacts.php:445 mod/photos.php:248 +#: mod/photos.php:337 mod/settings.php:664 mod/settings.php:690 +#: mod/videos.php:131 +msgid "Cancel" +msgstr "" + #: include/conversation.php:1280 msgid "Post to Groups" msgstr "" @@ -2887,6 +2231,10 @@ msgstr "" msgid "Private post" msgstr "" +#: include/conversation.php:1287 include/identity.php:250 mod/editpost.php:152 +msgid "Message" +msgstr "" + #: include/conversation.php:1288 mod/editpost.php:153 msgid "Browser" msgstr "" @@ -2913,53 +2261,10 @@ msgid_plural "Not Attending" msgstr[0] "" msgstr[1] "" -#: include/diaspora.php:1954 -msgid "Sharing notification from Diaspora network" -msgstr "" - -#: include/diaspora.php:2854 -msgid "Attachments:" -msgstr "" - #: include/network.php:595 msgid "view full size" msgstr "" -#: include/plugin.php:522 include/plugin.php:524 -msgid "Click here to upgrade." -msgstr "" - -#: include/plugin.php:530 -msgid "This action exceeds the limits set by your subscription plan." -msgstr "" - -#: include/plugin.php:535 -msgid "This action is not available under your subscription plan." -msgstr "" - -#: include/Contact.php:119 -msgid "stopped following" -msgstr "" - -#: include/Contact.php:369 -msgid "Drop Contact" -msgstr "" - -#: include/api.php:974 -#, php-format -msgid "Daily posting limit of %d posts reached. The post was rejected." -msgstr "" - -#: include/api.php:994 -#, php-format -msgid "Weekly posting limit of %d posts reached. The post was rejected." -msgstr "" - -#: include/api.php:1015 -#, php-format -msgid "Monthly posting limit of %d posts reached. The post was rejected." -msgstr "" - #: include/dbstructure.php:26 #, php-format msgid "" @@ -2986,17 +2291,699 @@ msgstr "" msgid "Errors encountered performing database changes." msgstr "" -#: mod/regmod.php:55 -msgid "Account approved." +#: include/Contact.php:119 +msgid "stopped following" msgstr "" -#: mod/regmod.php:92 +#: include/Contact.php:369 +msgid "Drop Contact" +msgstr "" + +#: include/acl_selectors.php:327 +msgid "Post to Email" +msgstr "" + +#: include/acl_selectors.php:332 #, php-format -msgid "Registration revoked for %s" +msgid "Connectors disabled, since \"%s\" is enabled." msgstr "" -#: mod/regmod.php:104 -msgid "Please login." +#: include/acl_selectors.php:333 mod/settings.php:1131 +msgid "Hide your profile details from unknown viewers?" +msgstr "" + +#: include/acl_selectors.php:338 +msgid "Visible to everybody" +msgstr "" + +#: include/acl_selectors.php:339 view/theme/vier/config.php:103 +#: view/theme/diabook/theme.php:621 view/theme/diabook/config.php:142 +msgid "show" +msgstr "" + +#: include/acl_selectors.php:340 view/theme/vier/config.php:103 +#: view/theme/diabook/theme.php:621 view/theme/diabook/config.php:142 +msgid "don't show" +msgstr "" + +#: include/acl_selectors.php:346 mod/editpost.php:133 +msgid "CC: email addresses" +msgstr "" + +#: include/acl_selectors.php:347 mod/editpost.php:140 +msgid "Example: bob@example.com, mary@example.com" +msgstr "" + +#: include/acl_selectors.php:349 mod/photos.php:1178 mod/photos.php:1563 +msgid "Permissions" +msgstr "" + +#: include/acl_selectors.php:350 +msgid "Close" +msgstr "" + +#: include/api.php:975 +#, php-format +msgid "Daily posting limit of %d posts reached. The post was rejected." +msgstr "" + +#: include/api.php:995 +#, php-format +msgid "Weekly posting limit of %d posts reached. The post was rejected." +msgstr "" + +#: include/api.php:1016 +#, php-format +msgid "Monthly posting limit of %d posts reached. The post was rejected." +msgstr "" + +#: include/dfrn.php:1110 +#, php-format +msgid "%s\\'s birthday" +msgstr "" + +#: include/diaspora.php:1954 +msgid "Sharing notification from Diaspora network" +msgstr "" + +#: include/diaspora.php:2854 +msgid "Attachments:" +msgstr "" + +#: include/follow.php:77 mod/dfrn_request.php:507 +msgid "Disallowed profile URL." +msgstr "" + +#: include/follow.php:82 +msgid "Connect URL missing." +msgstr "" + +#: include/follow.php:109 +msgid "" +"This site is not configured to allow communications with other networks." +msgstr "" + +#: include/follow.php:110 include/follow.php:130 +msgid "No compatible communication protocols or feeds were discovered." +msgstr "" + +#: include/follow.php:128 +msgid "The profile address specified does not provide adequate information." +msgstr "" + +#: include/follow.php:132 +msgid "An author or name was not found." +msgstr "" + +#: include/follow.php:134 +msgid "No browser URL could be matched to this address." +msgstr "" + +#: include/follow.php:136 +msgid "" +"Unable to match @-style Identity Address with a known protocol or email " +"contact." +msgstr "" + +#: include/follow.php:137 +msgid "Use mailto: in front of address to force email check." +msgstr "" + +#: include/follow.php:143 +msgid "" +"The profile address specified belongs to a network which has been disabled " +"on this site." +msgstr "" + +#: include/follow.php:153 +msgid "" +"Limited profile. This person will be unable to receive direct/personal " +"notifications from you." +msgstr "" + +#: include/follow.php:254 +msgid "Unable to retrieve contact information." +msgstr "" + +#: include/follow.php:287 +msgid "following" +msgstr "" + +#: include/identity.php:42 +msgid "Requested account is not available." +msgstr "" + +#: include/identity.php:51 mod/profile.php:21 +msgid "Requested profile is not available." +msgstr "" + +#: include/identity.php:95 include/identity.php:305 include/identity.php:686 +msgid "Edit profile" +msgstr "" + +#: include/identity.php:245 +msgid "Atom feed" +msgstr "" + +#: include/identity.php:276 +msgid "Manage/edit profiles" +msgstr "" + +#: include/identity.php:281 include/identity.php:307 mod/profiles.php:787 +msgid "Change profile photo" +msgstr "" + +#: include/identity.php:282 mod/profiles.php:788 +msgid "Create New Profile" +msgstr "" + +#: include/identity.php:292 mod/profiles.php:777 +msgid "Profile Image" +msgstr "" + +#: include/identity.php:295 mod/profiles.php:779 +msgid "visible to everybody" +msgstr "" + +#: include/identity.php:296 mod/profiles.php:684 mod/profiles.php:780 +msgid "Edit visibility" +msgstr "" + +#: include/identity.php:319 mod/directory.php:174 mod/match.php:84 +#: mod/viewcontacts.php:105 mod/allfriends.php:79 mod/cal.php:44 +#: mod/suggest.php:98 mod/hovercard.php:80 mod/common.php:123 +#: mod/network.php:517 mod/contacts.php:51 mod/contacts.php:626 +#: mod/contacts.php:953 mod/dirfind.php:223 mod/photos.php:42 +#: mod/videos.php:37 +msgid "Forum" +msgstr "" + +#: include/identity.php:331 include/identity.php:614 mod/directory.php:147 +#: mod/notifications.php:214 +msgid "Gender:" +msgstr "" + +#: include/identity.php:334 include/identity.php:634 mod/directory.php:149 +msgid "Status:" +msgstr "" + +#: include/identity.php:336 include/identity.php:645 mod/directory.php:151 +msgid "Homepage:" +msgstr "" + +#: include/identity.php:338 include/identity.php:655 mod/directory.php:153 +#: mod/notifications.php:210 mod/contacts.php:630 +msgid "About:" +msgstr "" + +#: include/identity.php:420 mod/notifications.php:222 mod/contacts.php:50 +msgid "Network:" +msgstr "" + +#: include/identity.php:449 include/identity.php:533 +msgid "g A l F d" +msgstr "" + +#: include/identity.php:450 include/identity.php:534 +msgid "F d" +msgstr "" + +#: include/identity.php:495 include/identity.php:580 +msgid "[today]" +msgstr "" + +#: include/identity.php:507 +msgid "Birthday Reminders" +msgstr "" + +#: include/identity.php:508 +msgid "Birthdays this week:" +msgstr "" + +#: include/identity.php:567 +msgid "[No description]" +msgstr "" + +#: include/identity.php:591 +msgid "Event Reminders" +msgstr "" + +#: include/identity.php:592 +msgid "Events this week:" +msgstr "" + +#: include/identity.php:612 mod/settings.php:1229 +msgid "Full Name:" +msgstr "" + +#: include/identity.php:619 +msgid "j F, Y" +msgstr "" + +#: include/identity.php:620 +msgid "j F" +msgstr "" + +#: include/identity.php:631 +msgid "Age:" +msgstr "" + +#: include/identity.php:640 +#, php-format +msgid "for %1$d %2$s" +msgstr "" + +#: include/identity.php:643 mod/profiles.php:703 +msgid "Sexual Preference:" +msgstr "" + +#: include/identity.php:647 mod/profiles.php:729 +msgid "Hometown:" +msgstr "" + +#: include/identity.php:649 mod/follow.php:134 mod/notifications.php:212 +#: mod/contacts.php:632 +msgid "Tags:" +msgstr "" + +#: include/identity.php:651 mod/profiles.php:730 +msgid "Political Views:" +msgstr "" + +#: include/identity.php:653 +msgid "Religion:" +msgstr "" + +#: include/identity.php:657 +msgid "Hobbies/Interests:" +msgstr "" + +#: include/identity.php:659 mod/profiles.php:734 +msgid "Likes:" +msgstr "" + +#: include/identity.php:661 mod/profiles.php:735 +msgid "Dislikes:" +msgstr "" + +#: include/identity.php:664 +msgid "Contact information and Social Networks:" +msgstr "" + +#: include/identity.php:666 +msgid "Musical interests:" +msgstr "" + +#: include/identity.php:668 +msgid "Books, literature:" +msgstr "" + +#: include/identity.php:670 +msgid "Television:" +msgstr "" + +#: include/identity.php:672 +msgid "Film/dance/culture/entertainment:" +msgstr "" + +#: include/identity.php:674 +msgid "Love/Romance:" +msgstr "" + +#: include/identity.php:676 +msgid "Work/employment:" +msgstr "" + +#: include/identity.php:678 +msgid "School/education:" +msgstr "" + +#: include/identity.php:682 +msgid "Forums:" +msgstr "" + +#: include/identity.php:690 mod/events.php:508 +msgid "Basic" +msgstr "" + +#: include/identity.php:691 mod/admin.php:930 mod/contacts.php:868 +#: mod/events.php:509 +msgid "Advanced" +msgstr "" + +#: include/identity.php:715 mod/follow.php:143 mod/contacts.php:834 +msgid "Status Messages and Posts" +msgstr "" + +#: include/identity.php:723 mod/contacts.php:842 +msgid "Profile Details" +msgstr "" + +#: include/identity.php:731 mod/photos.php:100 +msgid "Photo Albums" +msgstr "" + +#: include/identity.php:770 mod/notes.php:46 +msgid "Personal Notes" +msgstr "" + +#: include/identity.php:773 +msgid "Only You Can See This" +msgstr "" + +#: include/items.php:1447 mod/dfrn_request.php:745 mod/dfrn_confirm.php:726 +msgid "[Name Withheld]" +msgstr "" + +#: include/items.php:1805 mod/viewsrc.php:15 mod/display.php:104 +#: mod/display.php:279 mod/display.php:478 mod/notice.php:15 mod/admin.php:234 +#: mod/admin.php:1448 mod/admin.php:1682 +msgid "Item not found." +msgstr "" + +#: include/items.php:1844 +msgid "Do you really want to delete this item?" +msgstr "" + +#: include/items.php:1846 mod/follow.php:110 mod/suggest.php:29 +#: mod/api.php:105 mod/message.php:217 mod/dfrn_request.php:861 +#: mod/contacts.php:442 mod/profiles.php:641 mod/profiles.php:644 +#: mod/profiles.php:670 mod/register.php:238 mod/settings.php:1113 +#: mod/settings.php:1119 mod/settings.php:1127 mod/settings.php:1131 +#: mod/settings.php:1136 mod/settings.php:1142 mod/settings.php:1148 +#: mod/settings.php:1154 mod/settings.php:1180 mod/settings.php:1181 +#: mod/settings.php:1182 mod/settings.php:1183 mod/settings.php:1184 +msgid "Yes" +msgstr "" + +#: include/items.php:2011 mod/wall_upload.php:77 mod/wall_upload.php:80 +#: mod/notes.php:22 mod/uimport.php:23 mod/nogroup.php:25 mod/invite.php:15 +#: mod/invite.php:101 mod/viewcontacts.php:45 mod/wall_attach.php:67 +#: mod/wall_attach.php:70 mod/allfriends.php:12 mod/cal.php:308 +#: mod/repair_ostatus.php:9 mod/delegate.php:12 mod/attach.php:33 +#: mod/follow.php:11 mod/follow.php:73 mod/follow.php:155 mod/suggest.php:58 +#: mod/display.php:474 mod/common.php:18 mod/editpost.php:10 mod/network.php:4 +#: mod/group.php:19 mod/wallmessage.php:9 mod/wallmessage.php:33 +#: mod/wallmessage.php:79 mod/wallmessage.php:103 mod/api.php:26 +#: mod/api.php:31 mod/ostatus_subscribe.php:9 mod/message.php:46 +#: mod/message.php:182 mod/manage.php:96 mod/crepair.php:100 +#: mod/notifications.php:65 mod/contacts.php:350 mod/dfrn_confirm.php:57 +#: mod/dirfind.php:11 mod/events.php:190 mod/fsuggest.php:78 mod/item.php:185 +#: mod/item.php:197 mod/mood.php:114 mod/photos.php:172 mod/photos.php:1093 +#: mod/poke.php:150 mod/profile_photo.php:19 mod/profile_photo.php:175 +#: mod/profile_photo.php:186 mod/profile_photo.php:199 mod/profiles.php:166 +#: mod/profiles.php:598 mod/register.php:42 mod/regmod.php:110 +#: mod/settings.php:22 mod/settings.php:128 mod/settings.php:650 index.php:397 +msgid "Permission denied." +msgstr "" + +#: include/items.php:2116 +msgid "Archives" +msgstr "" + +#: include/like.php:186 +#, php-format +msgid "%1$s is attending %2$s's %3$s" +msgstr "" + +#: include/like.php:188 +#, php-format +msgid "%1$s is not attending %2$s's %3$s" +msgstr "" + +#: include/like.php:190 +#, php-format +msgid "%1$s may attend %2$s's %3$s" +msgstr "" + +#: include/message.php:15 include/message.php:173 +msgid "[no subject]" +msgstr "" + +#: include/plugin.php:526 include/plugin.php:528 +msgid "Click here to upgrade." +msgstr "" + +#: include/plugin.php:534 +msgid "This action exceeds the limits set by your subscription plan." +msgstr "" + +#: include/plugin.php:539 +msgid "This action is not available under your subscription plan." +msgstr "" + +#: include/text.php:304 +msgid "newer" +msgstr "" + +#: include/text.php:306 +msgid "older" +msgstr "" + +#: include/text.php:311 +msgid "prev" +msgstr "" + +#: include/text.php:313 +msgid "first" +msgstr "" + +#: include/text.php:345 +msgid "last" +msgstr "" + +#: include/text.php:348 +msgid "next" +msgstr "" + +#: include/text.php:403 +msgid "Loading more entries..." +msgstr "" + +#: include/text.php:404 +msgid "The end" +msgstr "" + +#: include/text.php:871 +msgid "No contacts" +msgstr "" + +#: include/text.php:894 +#, php-format +msgid "%d Contact" +msgid_plural "%d Contacts" +msgstr[0] "" +msgstr[1] "" + +#: include/text.php:907 +msgid "View Contacts" +msgstr "" + +#: include/text.php:995 mod/notes.php:61 mod/filer.php:31 mod/editpost.php:109 +msgid "Save" +msgstr "" + +#: include/text.php:1058 +msgid "poke" +msgstr "" + +#: include/text.php:1058 +msgid "poked" +msgstr "" + +#: include/text.php:1059 +msgid "ping" +msgstr "" + +#: include/text.php:1059 +msgid "pinged" +msgstr "" + +#: include/text.php:1060 +msgid "prod" +msgstr "" + +#: include/text.php:1060 +msgid "prodded" +msgstr "" + +#: include/text.php:1061 +msgid "slap" +msgstr "" + +#: include/text.php:1061 +msgid "slapped" +msgstr "" + +#: include/text.php:1062 +msgid "finger" +msgstr "" + +#: include/text.php:1062 +msgid "fingered" +msgstr "" + +#: include/text.php:1063 +msgid "rebuff" +msgstr "" + +#: include/text.php:1063 +msgid "rebuffed" +msgstr "" + +#: include/text.php:1077 +msgid "happy" +msgstr "" + +#: include/text.php:1078 +msgid "sad" +msgstr "" + +#: include/text.php:1079 +msgid "mellow" +msgstr "" + +#: include/text.php:1080 +msgid "tired" +msgstr "" + +#: include/text.php:1081 +msgid "perky" +msgstr "" + +#: include/text.php:1082 +msgid "angry" +msgstr "" + +#: include/text.php:1083 +msgid "stupified" +msgstr "" + +#: include/text.php:1084 +msgid "puzzled" +msgstr "" + +#: include/text.php:1085 +msgid "interested" +msgstr "" + +#: include/text.php:1086 +msgid "bitter" +msgstr "" + +#: include/text.php:1087 +msgid "cheerful" +msgstr "" + +#: include/text.php:1088 +msgid "alive" +msgstr "" + +#: include/text.php:1089 +msgid "annoyed" +msgstr "" + +#: include/text.php:1090 +msgid "anxious" +msgstr "" + +#: include/text.php:1091 +msgid "cranky" +msgstr "" + +#: include/text.php:1092 +msgid "disturbed" +msgstr "" + +#: include/text.php:1093 +msgid "frustrated" +msgstr "" + +#: include/text.php:1094 +msgid "motivated" +msgstr "" + +#: include/text.php:1095 +msgid "relaxed" +msgstr "" + +#: include/text.php:1096 +msgid "surprised" +msgstr "" + +#: include/text.php:1310 mod/videos.php:383 +msgid "View Video" +msgstr "" + +#: include/text.php:1342 +msgid "bytes" +msgstr "" + +#: include/text.php:1374 include/text.php:1386 +msgid "Click to open/close" +msgstr "" + +#: include/text.php:1512 +msgid "View on separate page" +msgstr "" + +#: include/text.php:1513 +msgid "view on separate page" +msgstr "" + +#: include/text.php:1792 +msgid "activity" +msgstr "" + +#: include/text.php:1794 mod/content.php:623 object/Item.php:431 +#: object/Item.php:444 +msgid "comment" +msgid_plural "comments" +msgstr[0] "" +msgstr[1] "" + +#: include/text.php:1795 +msgid "post" +msgstr "" + +#: include/text.php:1963 +msgid "Item filed" +msgstr "" + +#: include/uimport.php:94 +msgid "Error decoding account file" +msgstr "" + +#: include/uimport.php:100 +msgid "Error! No version data in file! This is not a Friendica account file?" +msgstr "" + +#: include/uimport.php:116 include/uimport.php:127 +msgid "Error! Cannot check nickname" +msgstr "" + +#: include/uimport.php:120 include/uimport.php:131 +#, php-format +msgid "User '%s' already exists on this server!" +msgstr "" + +#: include/uimport.php:153 +msgid "User creation error" +msgstr "" + +#: include/uimport.php:173 +msgid "User profile creation error" +msgstr "" + +#: include/uimport.php:222 +#, php-format +msgid "%d contact not imported" +msgid_plural "%d contacts not imported" +msgstr[0] "" +msgstr[1] "" + +#: include/uimport.php:292 +msgid "Done. You can now login with your username and password" msgstr "" #: mod/oexchange.php:25 @@ -3009,20 +2996,6 @@ msgstr "" msgid "[Embedded content - reload page to view]" msgstr "" -#: mod/dirfind.php:36 -#, php-format -msgid "People Search - %s" -msgstr "" - -#: mod/dirfind.php:47 -#, php-format -msgid "Forum Search - %s" -msgstr "" - -#: mod/dirfind.php:240 mod/match.php:107 -msgid "No matches" -msgstr "" - #: mod/viewsrc.php:7 msgid "Access denied." msgstr "" @@ -3045,8 +3018,8 @@ msgid "Remove term" msgstr "" #: mod/search.php:93 mod/search.php:99 mod/directory.php:37 -#: mod/viewcontacts.php:35 mod/videos.php:197 mod/display.php:199 -#: mod/community.php:22 mod/dfrn_request.php:790 mod/photos.php:964 +#: mod/viewcontacts.php:35 mod/display.php:199 mod/community.php:22 +#: mod/dfrn_request.php:790 mod/photos.php:964 mod/videos.php:197 msgid "Public access denied." msgstr "" @@ -3166,7 +3139,7 @@ msgid "" "Password reset failed." msgstr "" -#: mod/lostpass.php:109 boot.php:1635 +#: mod/lostpass.php:109 boot.php:1667 msgid "Password Reset" msgstr "" @@ -3234,7 +3207,7 @@ msgid "" "your email for further instructions." msgstr "" -#: mod/lostpass.php:161 boot.php:1623 +#: mod/lostpass.php:161 boot.php:1655 msgid "Nickname or Email: " msgstr "" @@ -3265,51 +3238,19 @@ msgstr "" msgid "Invalid request." msgstr "" -#: mod/wall_upload.php:151 mod/profile_photo.php:150 mod/photos.php:806 +#: mod/wall_upload.php:151 mod/photos.php:806 mod/profile_photo.php:150 #, php-format msgid "Image exceeds size limit of %s" msgstr "" -#: mod/wall_upload.php:188 mod/profile_photo.php:159 mod/photos.php:846 +#: mod/wall_upload.php:188 mod/photos.php:846 mod/profile_photo.php:159 msgid "Unable to process image." msgstr "" -#: mod/wall_upload.php:221 mod/profile_photo.php:307 mod/photos.php:873 +#: mod/wall_upload.php:221 mod/photos.php:873 mod/profile_photo.php:307 msgid "Image upload failed." msgstr "" -#: mod/fsuggest.php:20 mod/fsuggest.php:92 mod/crepair.php:114 -#: mod/dfrn_confirm.php:122 -msgid "Contact not found." -msgstr "" - -#: mod/fsuggest.php:63 -msgid "Friend suggestion sent." -msgstr "" - -#: mod/fsuggest.php:97 -msgid "Suggest Friends" -msgstr "" - -#: mod/fsuggest.php:99 -#, php-format -msgid "Suggest a friend for %s" -msgstr "" - -#: mod/fsuggest.php:107 mod/events.php:507 mod/invite.php:140 mod/poke.php:199 -#: mod/install.php:272 mod/install.php:312 mod/mood.php:137 -#: mod/localtime.php:45 mod/message.php:357 mod/message.php:547 -#: mod/manage.php:143 mod/contacts.php:577 mod/crepair.php:154 -#: mod/photos.php:1125 mod/photos.php:1249 mod/photos.php:1567 -#: mod/photos.php:1618 mod/photos.php:1666 mod/photos.php:1754 -#: mod/profiles.php:682 mod/content.php:728 object/Item.php:720 -#: view/theme/frio/config.php:59 view/theme/cleanzero/config.php:80 -#: view/theme/quattro/config.php:64 view/theme/dispy/config.php:70 -#: view/theme/vier/config.php:107 view/theme/diabook/theme.php:633 -#: view/theme/diabook/config.php:148 view/theme/duepuntozero/config.php:59 -msgid "Submit" -msgstr "" - #: mod/lockview.php:31 mod/lockview.php:39 msgid "Remote privacy information not available." msgstr "" @@ -3318,70 +3259,6 @@ msgstr "" msgid "Visible to:" msgstr "" -#: mod/events.php:95 mod/events.php:97 -msgid "Event can not end before it has started." -msgstr "" - -#: mod/events.php:104 mod/events.php:106 -msgid "Event title and start time are required." -msgstr "" - -#: mod/events.php:380 mod/cal.php:279 -msgid "View" -msgstr "" - -#: mod/events.php:381 -msgid "Create New Event" -msgstr "" - -#: mod/events.php:382 mod/cal.php:280 -msgid "Previous" -msgstr "" - -#: mod/events.php:383 mod/cal.php:281 mod/install.php:231 -msgid "Next" -msgstr "" - -#: mod/events.php:483 -msgid "Event details" -msgstr "" - -#: mod/events.php:484 -msgid "Starting date and Title are required." -msgstr "" - -#: mod/events.php:485 mod/events.php:486 -msgid "Event Starts:" -msgstr "" - -#: mod/events.php:485 mod/events.php:497 mod/profiles.php:710 -msgid "Required" -msgstr "" - -#: mod/events.php:487 mod/events.php:503 -msgid "Finish date/time is not known or not relevant" -msgstr "" - -#: mod/events.php:489 mod/events.php:490 -msgid "Event Finishes:" -msgstr "" - -#: mod/events.php:491 mod/events.php:504 -msgid "Adjust for viewer timezone" -msgstr "" - -#: mod/events.php:493 -msgid "Description:" -msgstr "" - -#: mod/events.php:497 mod/events.php:499 -msgid "Title:" -msgstr "" - -#: mod/events.php:500 mod/events.php:501 -msgid "Share this event" -msgstr "" - #: mod/directory.php:205 view/theme/vier/theme.php:201 #: view/theme/diabook/theme.php:525 msgid "Global Directory" @@ -3479,6 +3356,10 @@ msgstr "" msgid "Profile Match" msgstr "" +#: mod/match.php:107 mod/dirfind.php:240 +msgid "No matches" +msgstr "" + #: mod/uexport.php:29 msgid "Export account" msgstr "" @@ -3601,6 +3482,21 @@ msgid "" "important, please visit http://friendica.com" msgstr "" +#: mod/invite.php:140 mod/install.php:272 mod/install.php:312 +#: mod/localtime.php:45 mod/message.php:357 mod/message.php:547 +#: mod/manage.php:143 mod/crepair.php:154 mod/content.php:728 +#: mod/contacts.php:577 mod/events.php:507 mod/fsuggest.php:107 +#: mod/mood.php:137 mod/photos.php:1125 mod/photos.php:1249 +#: mod/photos.php:1567 mod/photos.php:1618 mod/photos.php:1666 +#: mod/photos.php:1754 mod/poke.php:199 mod/profiles.php:681 +#: object/Item.php:720 view/theme/frio/config.php:59 +#: view/theme/cleanzero/config.php:80 view/theme/quattro/config.php:64 +#: view/theme/dispy/config.php:70 view/theme/vier/config.php:107 +#: view/theme/diabook/theme.php:633 view/theme/diabook/config.php:148 +#: view/theme/duepuntozero/config.php:59 +msgid "Submit" +msgstr "" + #: mod/fbrowser.php:41 mod/fbrowser.php:62 mod/photos.php:63 #: mod/photos.php:193 mod/photos.php:1107 mod/photos.php:1233 #: mod/photos.php:1256 mod/photos.php:1826 mod/photos.php:1838 @@ -3672,1379 +3568,6 @@ msgstr "" msgid "{0} requested registration" msgstr "" -#: mod/admin.php:92 -msgid "Theme settings updated." -msgstr "" - -#: mod/admin.php:156 mod/admin.php:923 -msgid "Site" -msgstr "" - -#: mod/admin.php:157 mod/admin.php:867 mod/admin.php:1379 mod/admin.php:1394 -msgid "Users" -msgstr "" - -#: mod/admin.php:158 mod/admin.php:1496 mod/admin.php:1556 mod/settings.php:74 -msgid "Plugins" -msgstr "" - -#: mod/admin.php:159 mod/admin.php:1754 mod/admin.php:1804 -msgid "Themes" -msgstr "" - -#: mod/admin.php:160 mod/settings.php:52 -msgid "Additional features" -msgstr "" - -#: mod/admin.php:161 -msgid "DB updates" -msgstr "" - -#: mod/admin.php:162 mod/admin.php:397 -msgid "Inspect Queue" -msgstr "" - -#: mod/admin.php:163 mod/admin.php:363 -msgid "Federation Statistics" -msgstr "" - -#: mod/admin.php:177 mod/admin.php:188 mod/admin.php:1872 -msgid "Logs" -msgstr "" - -#: mod/admin.php:178 mod/admin.php:1939 -msgid "View Logs" -msgstr "" - -#: mod/admin.php:179 -msgid "probe address" -msgstr "" - -#: mod/admin.php:180 -msgid "check webfinger" -msgstr "" - -#: mod/admin.php:187 -msgid "Plugin Features" -msgstr "" - -#: mod/admin.php:189 -msgid "diagnostics" -msgstr "" - -#: mod/admin.php:190 -msgid "User registrations waiting for confirmation" -msgstr "" - -#: mod/admin.php:356 -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 "" - -#: mod/admin.php:357 -msgid "" -"The Auto Discovered Contact Directory feature is not enabled, it " -"will improve the data displayed here." -msgstr "" - -#: mod/admin.php:362 mod/admin.php:396 mod/admin.php:460 mod/admin.php:922 -#: mod/admin.php:1378 mod/admin.php:1495 mod/admin.php:1555 mod/admin.php:1753 -#: mod/admin.php:1803 mod/admin.php:1871 mod/admin.php:1938 -msgid "Administration" -msgstr "" - -#: mod/admin.php:369 -#, php-format -msgid "Currently this node is aware of %d nodes from the following platforms:" -msgstr "" - -#: mod/admin.php:399 -msgid "ID" -msgstr "" - -#: mod/admin.php:400 -msgid "Recipient Name" -msgstr "" - -#: mod/admin.php:401 -msgid "Recipient Profile" -msgstr "" - -#: mod/admin.php:403 -msgid "Created" -msgstr "" - -#: mod/admin.php:404 -msgid "Last Tried" -msgstr "" - -#: mod/admin.php:405 -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 "" - -#: mod/admin.php:424 mod/admin.php:1327 -msgid "Normal Account" -msgstr "" - -#: mod/admin.php:425 mod/admin.php:1328 -msgid "Soapbox Account" -msgstr "" - -#: mod/admin.php:426 mod/admin.php:1329 -msgid "Community/Celebrity Account" -msgstr "" - -#: mod/admin.php:427 mod/admin.php:1330 -msgid "Automatic Friend Account" -msgstr "" - -#: mod/admin.php:428 -msgid "Blog Account" -msgstr "" - -#: mod/admin.php:429 -msgid "Private Forum" -msgstr "" - -#: mod/admin.php:455 -msgid "Message queues" -msgstr "" - -#: mod/admin.php:461 -msgid "Summary" -msgstr "" - -#: mod/admin.php:463 -msgid "Registered users" -msgstr "" - -#: mod/admin.php:465 -msgid "Pending registrations" -msgstr "" - -#: mod/admin.php:466 -msgid "Version" -msgstr "" - -#: mod/admin.php:471 -msgid "Active plugins" -msgstr "" - -#: mod/admin.php:494 -msgid "Can not parse base url. Must have at least ://" -msgstr "" - -#: mod/admin.php:795 -msgid "RINO2 needs mcrypt php extension to work." -msgstr "" - -#: mod/admin.php:803 -msgid "Site settings updated." -msgstr "" - -#: mod/admin.php:831 mod/settings.php:919 -msgid "No special theme for mobile devices" -msgstr "" - -#: mod/admin.php:850 -msgid "No community page" -msgstr "" - -#: mod/admin.php:851 -msgid "Public postings from users of this site" -msgstr "" - -#: mod/admin.php:852 -msgid "Global community page" -msgstr "" - -#: mod/admin.php:857 mod/contacts.php:530 -msgid "Never" -msgstr "" - -#: mod/admin.php:858 -msgid "At post arrival" -msgstr "" - -#: mod/admin.php:866 mod/contacts.php:557 -msgid "Disabled" -msgstr "" - -#: mod/admin.php:868 -msgid "Users, Global Contacts" -msgstr "" - -#: mod/admin.php:869 -msgid "Users, Global Contacts/fallback" -msgstr "" - -#: mod/admin.php:873 -msgid "One month" -msgstr "" - -#: mod/admin.php:874 -msgid "Three months" -msgstr "" - -#: mod/admin.php:875 -msgid "Half a year" -msgstr "" - -#: mod/admin.php:876 -msgid "One year" -msgstr "" - -#: mod/admin.php:881 -msgid "Multi user instance" -msgstr "" - -#: mod/admin.php:904 -msgid "Closed" -msgstr "" - -#: mod/admin.php:905 -msgid "Requires approval" -msgstr "" - -#: mod/admin.php:906 -msgid "Open" -msgstr "" - -#: mod/admin.php:910 -msgid "No SSL policy, links will track page SSL state" -msgstr "" - -#: mod/admin.php:911 -msgid "Force all links to use SSL" -msgstr "" - -#: mod/admin.php:912 -msgid "Self-signed certificate, use SSL for local links only (discouraged)" -msgstr "" - -#: mod/admin.php:924 mod/admin.php:1557 mod/admin.php:1805 mod/admin.php:1873 -#: mod/admin.php:2022 mod/settings.php:663 mod/settings.php:773 -#: mod/settings.php:820 mod/settings.php:889 mod/settings.php:976 -#: mod/settings.php:1214 -msgid "Save Settings" -msgstr "" - -#: mod/admin.php:925 mod/register.php:263 -msgid "Registration" -msgstr "" - -#: mod/admin.php:926 -msgid "File upload" -msgstr "" - -#: mod/admin.php:927 -msgid "Policies" -msgstr "" - -#: mod/admin.php:929 -msgid "Auto Discovered Contact Directory" -msgstr "" - -#: mod/admin.php:930 -msgid "Performance" -msgstr "" - -#: mod/admin.php:931 -msgid "Worker" -msgstr "" - -#: mod/admin.php:932 -msgid "" -"Relocate - WARNING: advanced function. Could make this server unreachable." -msgstr "" - -#: mod/admin.php:935 -msgid "Site name" -msgstr "" - -#: mod/admin.php:936 -msgid "Host name" -msgstr "" - -#: mod/admin.php:937 -msgid "Sender Email" -msgstr "" - -#: mod/admin.php:937 -msgid "" -"The email address your server shall use to send notification emails from." -msgstr "" - -#: mod/admin.php:938 -msgid "Banner/Logo" -msgstr "" - -#: mod/admin.php:939 -msgid "Shortcut icon" -msgstr "" - -#: mod/admin.php:939 -msgid "Link to an icon that will be used for browsers." -msgstr "" - -#: mod/admin.php:940 -msgid "Touch icon" -msgstr "" - -#: mod/admin.php:940 -msgid "Link to an icon that will be used for tablets and mobiles." -msgstr "" - -#: mod/admin.php:941 -msgid "Additional Info" -msgstr "" - -#: mod/admin.php:941 -#, php-format -msgid "" -"For public servers: you can add additional information here that will be " -"listed at %s/siteinfo." -msgstr "" - -#: mod/admin.php:942 -msgid "System language" -msgstr "" - -#: mod/admin.php:943 -msgid "System theme" -msgstr "" - -#: mod/admin.php:943 -msgid "" -"Default system theme - may be over-ridden by user profiles - change theme settings" -msgstr "" - -#: mod/admin.php:944 -msgid "Mobile system theme" -msgstr "" - -#: mod/admin.php:944 -msgid "Theme for mobile devices" -msgstr "" - -#: mod/admin.php:945 -msgid "SSL link policy" -msgstr "" - -#: mod/admin.php:945 -msgid "Determines whether generated links should be forced to use SSL" -msgstr "" - -#: mod/admin.php:946 -msgid "Force SSL" -msgstr "" - -#: mod/admin.php:946 -msgid "" -"Force all Non-SSL requests to SSL - Attention: on some systems it could lead " -"to endless loops." -msgstr "" - -#: mod/admin.php:947 -msgid "Old style 'Share'" -msgstr "" - -#: mod/admin.php:947 -msgid "Deactivates the bbcode element 'share' for repeating items." -msgstr "" - -#: mod/admin.php:948 -msgid "Hide help entry from navigation menu" -msgstr "" - -#: mod/admin.php:948 -msgid "" -"Hides the menu entry for the Help pages from the navigation menu. You can " -"still access it calling /help directly." -msgstr "" - -#: mod/admin.php:949 -msgid "Single user instance" -msgstr "" - -#: mod/admin.php:949 -msgid "Make this instance multi-user or single-user for the named user" -msgstr "" - -#: mod/admin.php:950 -msgid "Maximum image size" -msgstr "" - -#: mod/admin.php:950 -msgid "" -"Maximum size in bytes of uploaded images. Default is 0, which means no " -"limits." -msgstr "" - -#: mod/admin.php:951 -msgid "Maximum image length" -msgstr "" - -#: mod/admin.php:951 -msgid "" -"Maximum length in pixels of the longest side of uploaded images. Default is " -"-1, which means no limits." -msgstr "" - -#: mod/admin.php:952 -msgid "JPEG image quality" -msgstr "" - -#: mod/admin.php:952 -msgid "" -"Uploaded JPEGS will be saved at this quality setting [0-100]. Default is " -"100, which is full quality." -msgstr "" - -#: mod/admin.php:954 -msgid "Register policy" -msgstr "" - -#: mod/admin.php:955 -msgid "Maximum Daily Registrations" -msgstr "" - -#: mod/admin.php:955 -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 "" - -#: mod/admin.php:956 -msgid "Register text" -msgstr "" - -#: mod/admin.php:956 -msgid "Will be displayed prominently on the registration page." -msgstr "" - -#: mod/admin.php:957 -msgid "Accounts abandoned after x days" -msgstr "" - -#: mod/admin.php:957 -msgid "" -"Will not waste system resources polling external sites for abandonded " -"accounts. Enter 0 for no time limit." -msgstr "" - -#: mod/admin.php:958 -msgid "Allowed friend domains" -msgstr "" - -#: mod/admin.php:958 -msgid "" -"Comma separated list of domains which are allowed to establish friendships " -"with this site. Wildcards are accepted. Empty to allow any domains" -msgstr "" - -#: mod/admin.php:959 -msgid "Allowed email domains" -msgstr "" - -#: mod/admin.php:959 -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 "" - -#: mod/admin.php:960 -msgid "Block public" -msgstr "" - -#: mod/admin.php:960 -msgid "" -"Check to block public access to all otherwise public personal pages on this " -"site unless you are currently logged in." -msgstr "" - -#: mod/admin.php:961 -msgid "Force publish" -msgstr "" - -#: mod/admin.php:961 -msgid "" -"Check to force all profiles on this site to be listed in the site directory." -msgstr "" - -#: mod/admin.php:962 -msgid "Global directory URL" -msgstr "" - -#: mod/admin.php:962 -msgid "" -"URL to the global directory. If this is not set, the global directory is " -"completely unavailable to the application." -msgstr "" - -#: mod/admin.php:963 -msgid "Allow threaded items" -msgstr "" - -#: mod/admin.php:963 -msgid "Allow infinite level threading for items on this site." -msgstr "" - -#: mod/admin.php:964 -msgid "Private posts by default for new users" -msgstr "" - -#: mod/admin.php:964 -msgid "" -"Set default post permissions for all new members to the default privacy " -"group rather than public." -msgstr "" - -#: mod/admin.php:965 -msgid "Don't include post content in email notifications" -msgstr "" - -#: mod/admin.php:965 -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 "" - -#: mod/admin.php:966 -msgid "Disallow public access to addons listed in the apps menu." -msgstr "" - -#: mod/admin.php:966 -msgid "" -"Checking this box will restrict addons listed in the apps menu to members " -"only." -msgstr "" - -#: mod/admin.php:967 -msgid "Don't embed private images in posts" -msgstr "" - -#: mod/admin.php:967 -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 " -"photos will have to authenticate and load each image, which may take a while." -msgstr "" - -#: mod/admin.php:968 -msgid "Allow Users to set remote_self" -msgstr "" - -#: mod/admin.php:968 -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 "" - -#: mod/admin.php:969 -msgid "Block multiple registrations" -msgstr "" - -#: mod/admin.php:969 -msgid "Disallow users to register additional accounts for use as pages." -msgstr "" - -#: mod/admin.php:970 -msgid "OpenID support" -msgstr "" - -#: mod/admin.php:970 -msgid "OpenID support for registration and logins." -msgstr "" - -#: mod/admin.php:971 -msgid "Fullname check" -msgstr "" - -#: mod/admin.php:971 -msgid "" -"Force users to register with a space between firstname and lastname in Full " -"name, as an antispam measure" -msgstr "" - -#: mod/admin.php:972 -msgid "UTF-8 Regular expressions" -msgstr "" - -#: mod/admin.php:972 -msgid "Use PHP UTF8 regular expressions" -msgstr "" - -#: mod/admin.php:973 -msgid "Community Page Style" -msgstr "" - -#: mod/admin.php:973 -msgid "" -"Type of community page to show. 'Global community' shows every public " -"posting from an open distributed network that arrived on this server." -msgstr "" - -#: mod/admin.php:974 -msgid "Posts per user on community page" -msgstr "" - -#: mod/admin.php:974 -msgid "" -"The maximum number of posts per user on the community page. (Not valid for " -"'Global Community')" -msgstr "" - -#: mod/admin.php:975 -msgid "Enable OStatus support" -msgstr "" - -#: mod/admin.php:975 -msgid "" -"Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All " -"communications in OStatus are public, so privacy warnings will be " -"occasionally displayed." -msgstr "" - -#: mod/admin.php:976 -msgid "OStatus conversation completion interval" -msgstr "" - -#: mod/admin.php:976 -msgid "" -"How often shall the poller check for new entries in OStatus conversations? " -"This can be a very ressource task." -msgstr "" - -#: mod/admin.php:977 -msgid "Only import OStatus threads from our contacts" -msgstr "" - -#: mod/admin.php:977 -msgid "" -"Normally we import every content from our OStatus contacts. With this option " -"we only store threads that are started by a contact that is known on our " -"system." -msgstr "" - -#: mod/admin.php:978 -msgid "OStatus support can only be enabled if threading is enabled." -msgstr "" - -#: mod/admin.php:980 -msgid "" -"Diaspora support can't be enabled because Friendica was installed into a sub " -"directory." -msgstr "" - -#: mod/admin.php:981 -msgid "Enable Diaspora support" -msgstr "" - -#: mod/admin.php:981 -msgid "Provide built-in Diaspora network compatibility." -msgstr "" - -#: mod/admin.php:982 -msgid "Only allow Friendica contacts" -msgstr "" - -#: mod/admin.php:982 -msgid "" -"All contacts must use Friendica protocols. All other built-in communication " -"protocols disabled." -msgstr "" - -#: mod/admin.php:983 -msgid "Verify SSL" -msgstr "" - -#: mod/admin.php:983 -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 "" - -#: mod/admin.php:984 -msgid "Proxy user" -msgstr "" - -#: mod/admin.php:985 -msgid "Proxy URL" -msgstr "" - -#: mod/admin.php:986 -msgid "Network timeout" -msgstr "" - -#: mod/admin.php:986 -msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." -msgstr "" - -#: mod/admin.php:987 -msgid "Delivery interval" -msgstr "" - -#: mod/admin.php:987 -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 "" - -#: mod/admin.php:988 -msgid "Poll interval" -msgstr "" - -#: mod/admin.php:988 -msgid "" -"Delay background polling processes by this many seconds to reduce system " -"load. If 0, use delivery interval." -msgstr "" - -#: mod/admin.php:989 -msgid "Maximum Load Average" -msgstr "" - -#: mod/admin.php:989 -msgid "" -"Maximum system load before delivery and poll processes are deferred - " -"default 50." -msgstr "" - -#: mod/admin.php:990 -msgid "Maximum Load Average (Frontend)" -msgstr "" - -#: mod/admin.php:990 -msgid "Maximum system load before the frontend quits service - default 50." -msgstr "" - -#: mod/admin.php:991 -msgid "Maximum table size for optimization" -msgstr "" - -#: mod/admin.php:991 -msgid "" -"Maximum table size (in MB) for the automatic optimization - default 100 MB. " -"Enter -1 to disable it." -msgstr "" - -#: mod/admin.php:992 -msgid "Minimum level of fragmentation" -msgstr "" - -#: mod/admin.php:992 -msgid "" -"Minimum fragmenation level to start the automatic optimization - default " -"value is 30%." -msgstr "" - -#: mod/admin.php:994 -msgid "Periodical check of global contacts" -msgstr "" - -#: mod/admin.php:994 -msgid "" -"If enabled, the global contacts are checked periodically for missing or " -"outdated data and the vitality of the contacts and servers." -msgstr "" - -#: mod/admin.php:995 -msgid "Days between requery" -msgstr "" - -#: mod/admin.php:995 -msgid "Number of days after which a server is requeried for his contacts." -msgstr "" - -#: mod/admin.php:996 -msgid "Discover contacts from other servers" -msgstr "" - -#: mod/admin.php:996 -msgid "" -"Periodically query other servers for contacts. You can choose between " -"'users': the users on the remote system, 'Global Contacts': active contacts " -"that are known on the system. The fallback is meant for Redmatrix servers " -"and older friendica servers, where global contacts weren't available. The " -"fallback increases the server load, so the recommened setting is 'Users, " -"Global Contacts'." -msgstr "" - -#: mod/admin.php:997 -msgid "Timeframe for fetching global contacts" -msgstr "" - -#: mod/admin.php:997 -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 "" - -#: mod/admin.php:998 -msgid "Search the local directory" -msgstr "" - -#: mod/admin.php:998 -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 "" - -#: mod/admin.php:1000 -msgid "Publish server information" -msgstr "" - -#: mod/admin.php:1000 -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 " -"profiles, number of posts and the activated protocols and connectors. See the-federation.info for details." -msgstr "" - -#: mod/admin.php:1002 -msgid "Use MySQL full text engine" -msgstr "" - -#: mod/admin.php:1002 -msgid "" -"Activates the full text engine. Speeds up search - but can only search for " -"four and more characters." -msgstr "" - -#: mod/admin.php:1003 -msgid "Suppress Language" -msgstr "" - -#: mod/admin.php:1003 -msgid "Suppress language information in meta information about a posting." -msgstr "" - -#: mod/admin.php:1004 -msgid "Suppress Tags" -msgstr "" - -#: mod/admin.php:1004 -msgid "Suppress showing a list of hashtags at the end of the posting." -msgstr "" - -#: mod/admin.php:1005 -msgid "Path to item cache" -msgstr "" - -#: mod/admin.php:1005 -msgid "The item caches buffers generated bbcode and external images." -msgstr "" - -#: mod/admin.php:1006 -msgid "Cache duration in seconds" -msgstr "" - -#: mod/admin.php:1006 -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 "" - -#: mod/admin.php:1007 -msgid "Maximum numbers of comments per post" -msgstr "" - -#: mod/admin.php:1007 -msgid "How much comments should be shown for each post? Default value is 100." -msgstr "" - -#: mod/admin.php:1008 -msgid "Path for lock file" -msgstr "" - -#: mod/admin.php:1008 -msgid "" -"The lock file is used to avoid multiple pollers at one time. Only define a " -"folder here." -msgstr "" - -#: mod/admin.php:1009 -msgid "Temp path" -msgstr "" - -#: mod/admin.php:1009 -msgid "" -"If you have a restricted system where the webserver can't access the system " -"temp path, enter another path here." -msgstr "" - -#: mod/admin.php:1010 -msgid "Base path to installation" -msgstr "" - -#: mod/admin.php:1010 -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 "" - -#: mod/admin.php:1011 -msgid "Disable picture proxy" -msgstr "" - -#: mod/admin.php:1011 -msgid "" -"The picture proxy increases performance and privacy. It shouldn't be used on " -"systems with very low bandwith." -msgstr "" - -#: mod/admin.php:1012 -msgid "Enable old style pager" -msgstr "" - -#: mod/admin.php:1012 -msgid "" -"The old style pager has page numbers but slows down massively the page speed." -msgstr "" - -#: mod/admin.php:1013 -msgid "Only search in tags" -msgstr "" - -#: mod/admin.php:1013 -msgid "On large systems the text search can slow down the system extremely." -msgstr "" - -#: mod/admin.php:1015 -msgid "New base url" -msgstr "" - -#: mod/admin.php:1015 -msgid "" -"Change base url for this server. Sends relocate message to all DFRN contacts " -"of all users." -msgstr "" - -#: mod/admin.php:1017 -msgid "RINO Encryption" -msgstr "" - -#: mod/admin.php:1017 -msgid "Encryption layer between nodes." -msgstr "" - -#: mod/admin.php:1018 -msgid "Embedly API key" -msgstr "" - -#: mod/admin.php:1018 -msgid "" -"Embedly is used to fetch additional data for " -"web pages. This is an optional parameter." -msgstr "" - -#: mod/admin.php:1020 -msgid "Enable 'worker' background processing" -msgstr "" - -#: mod/admin.php:1020 -msgid "" -"The worker background processing limits the number of parallel background " -"jobs to a maximum number and respects the system load." -msgstr "" - -#: mod/admin.php:1021 -msgid "Maximum number of parallel workers" -msgstr "" - -#: mod/admin.php:1021 -msgid "" -"On shared hosters set this to 2. On larger systems, values of 10 are great. " -"Default value is 4." -msgstr "" - -#: mod/admin.php:1022 -msgid "Don't use 'proc_open' with the worker" -msgstr "" - -#: mod/admin.php:1022 -msgid "" -"Enable this if your system doesn't allow the use of 'proc_open'. This can " -"happen on shared hosters. If this is enabled you should increase the " -"frequency of poller calls in your crontab." -msgstr "" - -#: mod/admin.php:1051 -msgid "Update has been marked successful" -msgstr "" - -#: mod/admin.php:1059 -#, php-format -msgid "Database structure update %s was successfully applied." -msgstr "" - -#: mod/admin.php:1062 -#, php-format -msgid "Executing of database structure update %s failed with error: %s" -msgstr "" - -#: mod/admin.php:1074 -#, php-format -msgid "Executing %s failed with error: %s" -msgstr "" - -#: mod/admin.php:1077 -#, php-format -msgid "Update %s was successfully applied." -msgstr "" - -#: mod/admin.php:1081 -#, php-format -msgid "Update %s did not return a status. Unknown if it succeeded." -msgstr "" - -#: mod/admin.php:1083 -#, php-format -msgid "There was no additional update function %s that needed to be called." -msgstr "" - -#: mod/admin.php:1102 -msgid "No failed updates." -msgstr "" - -#: mod/admin.php:1103 -msgid "Check database structure" -msgstr "" - -#: mod/admin.php:1108 -msgid "Failed Updates" -msgstr "" - -#: mod/admin.php:1109 -msgid "" -"This does not include updates prior to 1139, which did not return a status." -msgstr "" - -#: mod/admin.php:1110 -msgid "Mark success (if update was manually applied)" -msgstr "" - -#: mod/admin.php:1111 -msgid "Attempt to execute this update step automatically" -msgstr "" - -#: mod/admin.php:1143 -#, php-format -msgid "" -"\n" -"\t\t\tDear %1$s,\n" -"\t\t\t\tthe administrator of %2$s has set up an account for you." -msgstr "" - -#: mod/admin.php:1146 -#, php-format -msgid "" -"\n" -"\t\t\tThe login details are as follows:\n" -"\n" -"\t\t\tSite Location:\t%1$s\n" -"\t\t\tLogin Name:\t\t%2$s\n" -"\t\t\tPassword:\t\t%3$s\n" -"\n" -"\t\t\tYou may change your password from your account \"Settings\" page after " -"logging\n" -"\t\t\tin.\n" -"\n" -"\t\t\tPlease take a few moments to review the other account settings on that " -"page.\n" -"\n" -"\t\t\tYou may also wish to add some basic information to your default " -"profile\n" -"\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n" -"\n" -"\t\t\tWe recommend setting your full name, adding a profile photo,\n" -"\t\t\tadding some profile \"keywords\" (very useful in making new friends) - " -"and\n" -"\t\t\tperhaps what country you live in; if you do not wish to be more " -"specific\n" -"\t\t\tthan that.\n" -"\n" -"\t\t\tWe fully respect your right to privacy, and none of these items are " -"necessary.\n" -"\t\t\tIf you are new and do not know anybody here, they may help\n" -"\t\t\tyou to make some new and interesting friends.\n" -"\n" -"\t\t\tThank you and welcome to %4$s." -msgstr "" - -#: mod/admin.php:1190 -#, php-format -msgid "%s user blocked/unblocked" -msgid_plural "%s users blocked/unblocked" -msgstr[0] "" -msgstr[1] "" - -#: mod/admin.php:1197 -#, php-format -msgid "%s user deleted" -msgid_plural "%s users deleted" -msgstr[0] "" -msgstr[1] "" - -#: mod/admin.php:1244 -#, php-format -msgid "User '%s' deleted" -msgstr "" - -#: mod/admin.php:1252 -#, php-format -msgid "User '%s' unblocked" -msgstr "" - -#: mod/admin.php:1252 -#, php-format -msgid "User '%s' blocked" -msgstr "" - -#: mod/admin.php:1371 mod/admin.php:1384 mod/admin.php:1396 mod/admin.php:1412 -#: mod/settings.php:665 mod/settings.php:691 mod/crepair.php:165 -msgid "Name" -msgstr "" - -#: mod/admin.php:1371 mod/admin.php:1396 -msgid "Register date" -msgstr "" - -#: mod/admin.php:1371 mod/admin.php:1396 -msgid "Last login" -msgstr "" - -#: mod/admin.php:1371 mod/admin.php:1396 -msgid "Last item" -msgstr "" - -#: mod/admin.php:1371 mod/settings.php:43 -msgid "Account" -msgstr "" - -#: mod/admin.php:1380 -msgid "Add User" -msgstr "" - -#: mod/admin.php:1381 -msgid "select all" -msgstr "" - -#: mod/admin.php:1382 -msgid "User registrations waiting for confirm" -msgstr "" - -#: mod/admin.php:1383 -msgid "User waiting for permanent deletion" -msgstr "" - -#: mod/admin.php:1384 -msgid "Request date" -msgstr "" - -#: mod/admin.php:1385 -msgid "No registrations." -msgstr "" - -#: mod/admin.php:1386 mod/notifications.php:139 mod/notifications.php:225 -msgid "Approve" -msgstr "" - -#: mod/admin.php:1387 -msgid "Deny" -msgstr "" - -#: mod/admin.php:1389 mod/contacts.php:605 mod/contacts.php:803 -#: mod/contacts.php:997 -msgid "Block" -msgstr "" - -#: mod/admin.php:1390 mod/contacts.php:605 mod/contacts.php:803 -#: mod/contacts.php:997 -msgid "Unblock" -msgstr "" - -#: mod/admin.php:1391 -msgid "Site admin" -msgstr "" - -#: mod/admin.php:1392 -msgid "Account expired" -msgstr "" - -#: mod/admin.php:1395 -msgid "New User" -msgstr "" - -#: mod/admin.php:1396 -msgid "Deleted since" -msgstr "" - -#: mod/admin.php:1401 -msgid "" -"Selected users will be deleted!\\n\\nEverything these users had posted on " -"this site will be permanently deleted!\\n\\nAre you sure?" -msgstr "" - -#: mod/admin.php:1402 -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 "" - -#: mod/admin.php:1412 -msgid "Name of the new user." -msgstr "" - -#: mod/admin.php:1413 -msgid "Nickname" -msgstr "" - -#: mod/admin.php:1413 -msgid "Nickname of the new user." -msgstr "" - -#: mod/admin.php:1414 -msgid "Email address of the new user." -msgstr "" - -#: mod/admin.php:1457 -#, php-format -msgid "Plugin %s disabled." -msgstr "" - -#: mod/admin.php:1461 -#, php-format -msgid "Plugin %s enabled." -msgstr "" - -#: mod/admin.php:1472 mod/admin.php:1708 -msgid "Disable" -msgstr "" - -#: mod/admin.php:1474 mod/admin.php:1710 -msgid "Enable" -msgstr "" - -#: mod/admin.php:1497 mod/admin.php:1755 -msgid "Toggle" -msgstr "" - -#: mod/admin.php:1505 mod/admin.php:1764 -msgid "Author: " -msgstr "" - -#: mod/admin.php:1506 mod/admin.php:1765 -msgid "Maintainer: " -msgstr "" - -#: mod/admin.php:1558 -msgid "Reload active plugins" -msgstr "" - -#: mod/admin.php:1563 -#, 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 "" - -#: mod/admin.php:1668 -msgid "No themes found." -msgstr "" - -#: mod/admin.php:1746 -msgid "Screenshot" -msgstr "" - -#: mod/admin.php:1806 -msgid "Reload active themes" -msgstr "" - -#: mod/admin.php:1811 -#, php-format -msgid "No themes found on the system. They should be paced in %1$s" -msgstr "" - -#: mod/admin.php:1812 -msgid "[Experimental]" -msgstr "" - -#: mod/admin.php:1813 -msgid "[Unsupported]" -msgstr "" - -#: mod/admin.php:1837 -msgid "Log settings updated." -msgstr "" - -#: mod/admin.php:1874 -msgid "Clear" -msgstr "" - -#: mod/admin.php:1879 -msgid "Enable Debugging" -msgstr "" - -#: mod/admin.php:1880 -msgid "Log file" -msgstr "" - -#: mod/admin.php:1880 -msgid "" -"Must be writable by web server. Relative to your Friendica top-level " -"directory." -msgstr "" - -#: mod/admin.php:1881 -msgid "Log level" -msgstr "" - -#: mod/admin.php:1884 -msgid "PHP logging" -msgstr "" - -#: mod/admin.php:1885 -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 "" - -#: mod/admin.php:2011 mod/admin.php:2012 mod/settings.php:763 -msgid "Off" -msgstr "" - -#: mod/admin.php:2011 mod/admin.php:2012 mod/settings.php:763 -msgid "On" -msgstr "" - -#: mod/admin.php:2012 -#, php-format -msgid "Lock feature %s" -msgstr "" - -#: mod/admin.php:2020 -msgid "Manage Additional Features" -msgstr "" - #: mod/wall_attach.php:94 msgid "Sorry, maybe your upload is bigger than the PHP configuration allows" msgstr "" @@ -5070,6 +3593,18 @@ msgstr "" msgid "Access to this profile has been restricted." msgstr "" +#: mod/cal.php:279 mod/events.php:380 +msgid "View" +msgstr "" + +#: mod/cal.php:280 mod/events.php:382 +msgid "Previous" +msgstr "" + +#: mod/cal.php:281 mod/install.php:231 mod/events.php:383 +msgid "Next" +msgstr "" + #: mod/cal.php:301 msgid "User not found" msgstr "" @@ -5133,34 +3668,6 @@ msgstr "" msgid "No entries." msgstr "" -#: mod/videos.php:123 -msgid "Do you really want to delete this video?" -msgstr "" - -#: mod/videos.php:128 -msgid "Delete Video" -msgstr "" - -#: mod/videos.php:207 -msgid "No videos selected" -msgstr "" - -#: mod/videos.php:308 mod/photos.php:1075 -msgid "Access to this item is restricted." -msgstr "" - -#: mod/videos.php:390 mod/photos.php:1878 -msgid "View Album" -msgstr "" - -#: mod/videos.php:399 -msgid "Recent Videos" -msgstr "" - -#: mod/videos.php:401 -msgid "Upload New Videos" -msgstr "" - #: mod/credits.php:16 msgid "Credits" msgstr "" @@ -5176,26 +3683,6 @@ msgstr "" msgid "- select -" msgstr "" -#: mod/poke.php:192 -msgid "Poke/Prod" -msgstr "" - -#: mod/poke.php:193 -msgid "poke, prod or do other things to somebody" -msgstr "" - -#: mod/poke.php:194 -msgid "Recipient" -msgstr "" - -#: mod/poke.php:195 -msgid "Choose what you wish to do to recipient" -msgstr "" - -#: mod/poke.php:198 -msgid "Make this post private" -msgstr "" - #: mod/install.php:139 msgid "Friendica Communications Server - Setup" msgstr "" @@ -5582,13 +4069,13 @@ msgstr "" msgid "Does %s know you?" msgstr "" -#: mod/follow.php:110 mod/register.php:239 mod/settings.php:1113 -#: mod/settings.php:1119 mod/settings.php:1127 mod/settings.php:1131 -#: mod/settings.php:1136 mod/settings.php:1142 mod/settings.php:1148 -#: mod/settings.php:1154 mod/settings.php:1180 mod/settings.php:1181 -#: mod/settings.php:1182 mod/settings.php:1183 mod/settings.php:1184 -#: mod/api.php:106 mod/dfrn_request.php:861 mod/profiles.php:642 -#: mod/profiles.php:646 mod/profiles.php:671 +#: mod/follow.php:110 mod/api.php:106 mod/dfrn_request.php:861 +#: mod/profiles.php:641 mod/profiles.php:645 mod/profiles.php:670 +#: mod/register.php:239 mod/settings.php:1113 mod/settings.php:1119 +#: mod/settings.php:1127 mod/settings.php:1131 mod/settings.php:1136 +#: mod/settings.php:1142 mod/settings.php:1148 mod/settings.php:1154 +#: mod/settings.php:1180 mod/settings.php:1181 mod/settings.php:1182 +#: mod/settings.php:1183 mod/settings.php:1184 msgid "No" msgstr "" @@ -5600,7 +4087,7 @@ msgstr "" msgid "Your Identity Address:" msgstr "" -#: mod/follow.php:126 mod/contacts.php:624 mod/notifications.php:219 +#: mod/follow.php:126 mod/notifications.php:219 mod/contacts.php:624 msgid "Profile URL" msgstr "" @@ -5700,7 +4187,7 @@ msgid "" "potential friends know exactly how to find you." msgstr "" -#: mod/newmember.php:36 mod/profile_photo.php:250 mod/profiles.php:701 +#: mod/newmember.php:36 mod/profile_photo.php:250 mod/profiles.php:700 msgid "Upload Profile Photo" msgstr "" @@ -5833,14 +4320,6 @@ msgstr "" msgid "Please enter your password for verification:" msgstr "" -#: mod/mood.php:133 -msgid "Mood" -msgstr "" - -#: mod/mood.php:134 -msgid "Set your current mood and tell your friends" -msgstr "" - #: mod/editpost.php:17 mod/editpost.php:27 msgid "Item not found" msgstr "" @@ -5898,7 +4377,7 @@ msgstr "" msgid "Sort by Post Date" msgstr "" -#: mod/network.php:844 mod/profiles.php:697 mod/notifications.php:539 +#: mod/network.php:844 mod/notifications.php:539 mod/profiles.php:696 msgid "Personal" msgstr "" @@ -6011,6 +4490,2889 @@ msgstr "" msgid "All Contacts" msgstr "" +#: mod/wallmessage.php:42 mod/wallmessage.php:112 +#, php-format +msgid "Number of daily wall messages for %s exceeded. Message failed." +msgstr "" + +#: mod/wallmessage.php:56 mod/message.php:71 +msgid "No recipient selected." +msgstr "" + +#: mod/wallmessage.php:59 +msgid "Unable to check your home location." +msgstr "" + +#: mod/wallmessage.php:62 mod/message.php:78 +msgid "Message could not be sent." +msgstr "" + +#: mod/wallmessage.php:65 mod/message.php:81 +msgid "Message collection failure." +msgstr "" + +#: mod/wallmessage.php:68 mod/message.php:84 +msgid "Message sent." +msgstr "" + +#: mod/wallmessage.php:86 mod/wallmessage.php:95 +msgid "No recipient." +msgstr "" + +#: mod/wallmessage.php:142 mod/message.php:341 +msgid "Send Private Message" +msgstr "" + +#: mod/wallmessage.php:143 +#, php-format +msgid "" +"If you wish for %s to respond, please check that the privacy settings on " +"your site allow private mail from unknown senders." +msgstr "" + +#: mod/wallmessage.php:144 mod/message.php:342 mod/message.php:536 +msgid "To:" +msgstr "" + +#: mod/wallmessage.php:145 mod/message.php:347 mod/message.php:538 +msgid "Subject:" +msgstr "" + +#: mod/share.php:38 +msgid "link" +msgstr "" + +#: mod/api.php:76 mod/api.php:102 +msgid "Authorize application connection" +msgstr "" + +#: mod/api.php:77 +msgid "Return to your app and insert this Securty Code:" +msgstr "" + +#: mod/api.php:89 +msgid "Please login to continue." +msgstr "" + +#: mod/api.php:104 +msgid "" +"Do you want to authorize this application to access your posts and contacts, " +"and/or create new posts for you?" +msgstr "" + +#: mod/babel.php:17 +msgid "Source (bbcode) text:" +msgstr "" + +#: mod/babel.php:23 +msgid "Source (Diaspora) text to convert to BBcode:" +msgstr "" + +#: mod/babel.php:31 +msgid "Source input: " +msgstr "" + +#: mod/babel.php:35 +msgid "bb2html (raw HTML): " +msgstr "" + +#: mod/babel.php:39 +msgid "bb2html: " +msgstr "" + +#: mod/babel.php:43 +msgid "bb2html2bb: " +msgstr "" + +#: mod/babel.php:47 +msgid "bb2md: " +msgstr "" + +#: mod/babel.php:51 +msgid "bb2md2html: " +msgstr "" + +#: mod/babel.php:55 +msgid "bb2dia2bb: " +msgstr "" + +#: mod/babel.php:59 +msgid "bb2md2html2bb: " +msgstr "" + +#: mod/babel.php:69 +msgid "Source input (Diaspora format): " +msgstr "" + +#: mod/babel.php:74 +msgid "diaspora2bb: " +msgstr "" + +#: mod/ostatus_subscribe.php:14 +msgid "Subscribing to OStatus contacts" +msgstr "" + +#: mod/ostatus_subscribe.php:25 +msgid "No contact provided." +msgstr "" + +#: mod/ostatus_subscribe.php:30 +msgid "Couldn't fetch information for contact." +msgstr "" + +#: mod/ostatus_subscribe.php:38 +msgid "Couldn't fetch friends for contact." +msgstr "" + +#: mod/ostatus_subscribe.php:65 +msgid "success" +msgstr "" + +#: mod/ostatus_subscribe.php:67 +msgid "failed" +msgstr "" + +#: mod/ostatus_subscribe.php:69 mod/content.php:792 object/Item.php:245 +msgid "ignored" +msgstr "" + +#: mod/dfrn_poll.php:104 mod/dfrn_poll.php:537 +#, php-format +msgid "%1$s welcomes %2$s" +msgstr "" + +#: mod/profile.php:179 +msgid "Tips for New Members" +msgstr "" + +#: mod/message.php:75 +msgid "Unable to locate contact information." +msgstr "" + +#: mod/message.php:215 +msgid "Do you really want to delete this message?" +msgstr "" + +#: mod/message.php:235 +msgid "Message deleted." +msgstr "" + +#: mod/message.php:266 +msgid "Conversation removed." +msgstr "" + +#: mod/message.php:383 +msgid "No messages." +msgstr "" + +#: mod/message.php:426 +msgid "Message not available." +msgstr "" + +#: mod/message.php:503 +msgid "Delete message" +msgstr "" + +#: mod/message.php:529 mod/message.php:609 +msgid "Delete conversation" +msgstr "" + +#: mod/message.php:531 +msgid "" +"No secure communications available. You may be able to " +"respond from the sender's profile page." +msgstr "" + +#: mod/message.php:535 +msgid "Send Reply" +msgstr "" + +#: mod/message.php:579 +#, php-format +msgid "Unknown sender - %s" +msgstr "" + +#: mod/message.php:581 +#, php-format +msgid "You and %s" +msgstr "" + +#: mod/message.php:583 +#, php-format +msgid "%s and You" +msgstr "" + +#: mod/message.php:612 +msgid "D, d M Y - g:i A" +msgstr "" + +#: mod/message.php:615 +#, php-format +msgid "%d message" +msgid_plural "%d messages" +msgstr[0] "" +msgstr[1] "" + +#: mod/manage.php:139 +msgid "Manage Identities and/or Pages" +msgstr "" + +#: mod/manage.php:140 +msgid "" +"Toggle between different identities or community/group pages which share " +"your account details or which you have been granted \"manage\" permissions" +msgstr "" + +#: mod/manage.php:141 +msgid "Select an identity to manage: " +msgstr "" + +#: mod/crepair.php:87 +msgid "Contact settings applied." +msgstr "" + +#: mod/crepair.php:89 +msgid "Contact update failed." +msgstr "" + +#: mod/crepair.php:114 mod/dfrn_confirm.php:122 mod/fsuggest.php:20 +#: mod/fsuggest.php:92 +msgid "Contact not found." +msgstr "" + +#: mod/crepair.php:120 +msgid "" +"WARNING: This is highly advanced and if you enter incorrect " +"information your communications with this contact may stop working." +msgstr "" + +#: mod/crepair.php:121 +msgid "" +"Please use your browser 'Back' button now if you are " +"uncertain what to do on this page." +msgstr "" + +#: mod/crepair.php:134 mod/crepair.php:136 +msgid "No mirroring" +msgstr "" + +#: mod/crepair.php:134 +msgid "Mirror as forwarded posting" +msgstr "" + +#: mod/crepair.php:134 mod/crepair.php:136 +msgid "Mirror as my own posting" +msgstr "" + +#: mod/crepair.php:150 +msgid "Return to contact editor" +msgstr "" + +#: mod/crepair.php:152 +msgid "Refetch contact data" +msgstr "" + +#: mod/crepair.php:156 +msgid "Remote Self" +msgstr "" + +#: mod/crepair.php:159 +msgid "Mirror postings from this contact" +msgstr "" + +#: mod/crepair.php:161 +msgid "" +"Mark this contact as remote_self, this will cause friendica to repost new " +"entries from this contact." +msgstr "" + +#: mod/crepair.php:165 mod/admin.php:1374 mod/admin.php:1387 +#: mod/admin.php:1399 mod/admin.php:1415 mod/settings.php:665 +#: mod/settings.php:691 +msgid "Name" +msgstr "" + +#: mod/crepair.php:166 +msgid "Account Nickname" +msgstr "" + +#: mod/crepair.php:167 +msgid "@Tagname - overrides Name/Nickname" +msgstr "" + +#: mod/crepair.php:168 +msgid "Account URL" +msgstr "" + +#: mod/crepair.php:169 +msgid "Friend Request URL" +msgstr "" + +#: mod/crepair.php:170 +msgid "Friend Confirm URL" +msgstr "" + +#: mod/crepair.php:171 +msgid "Notification Endpoint URL" +msgstr "" + +#: mod/crepair.php:172 +msgid "Poll/Feed URL" +msgstr "" + +#: mod/crepair.php:173 +msgid "New photo from this URL" +msgstr "" + +#: mod/dfrn_request.php:100 +msgid "This introduction has already been accepted." +msgstr "" + +#: mod/dfrn_request.php:123 mod/dfrn_request.php:518 +msgid "Profile location is not valid or does not contain profile information." +msgstr "" + +#: mod/dfrn_request.php:128 mod/dfrn_request.php:523 +msgid "Warning: profile location has no identifiable owner name." +msgstr "" + +#: mod/dfrn_request.php:130 mod/dfrn_request.php:525 +msgid "Warning: profile location has no profile photo." +msgstr "" + +#: mod/dfrn_request.php:133 mod/dfrn_request.php:528 +#, 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] "" +msgstr[1] "" + +#: mod/dfrn_request.php:178 +msgid "Introduction complete." +msgstr "" + +#: mod/dfrn_request.php:220 +msgid "Unrecoverable protocol error." +msgstr "" + +#: mod/dfrn_request.php:248 +msgid "Profile unavailable." +msgstr "" + +#: mod/dfrn_request.php:273 +#, php-format +msgid "%s has received too many connection requests today." +msgstr "" + +#: mod/dfrn_request.php:274 +msgid "Spam protection measures have been invoked." +msgstr "" + +#: mod/dfrn_request.php:275 +msgid "Friends are advised to please try again in 24 hours." +msgstr "" + +#: mod/dfrn_request.php:337 +msgid "Invalid locator" +msgstr "" + +#: mod/dfrn_request.php:346 +msgid "Invalid email address." +msgstr "" + +#: mod/dfrn_request.php:373 +msgid "This account has not been configured for email. Request failed." +msgstr "" + +#: mod/dfrn_request.php:476 +msgid "You have already introduced yourself here." +msgstr "" + +#: mod/dfrn_request.php:480 +#, php-format +msgid "Apparently you are already friends with %s." +msgstr "" + +#: mod/dfrn_request.php:501 +msgid "Invalid profile URL." +msgstr "" + +#: mod/dfrn_request.php:579 mod/contacts.php:208 +msgid "Failed to update contact record." +msgstr "" + +#: mod/dfrn_request.php:600 +msgid "Your introduction has been sent." +msgstr "" + +#: mod/dfrn_request.php:640 +msgid "" +"Remote subscription can't be done for your network. Please subscribe " +"directly on your system." +msgstr "" + +#: mod/dfrn_request.php:663 +msgid "Please login to confirm introduction." +msgstr "" + +#: mod/dfrn_request.php:673 +msgid "" +"Incorrect identity currently logged in. Please login to this profile." +msgstr "" + +#: mod/dfrn_request.php:687 mod/dfrn_request.php:704 +msgid "Confirm" +msgstr "" + +#: mod/dfrn_request.php:699 +msgid "Hide this contact" +msgstr "" + +#: mod/dfrn_request.php:702 +#, php-format +msgid "Welcome home %s." +msgstr "" + +#: mod/dfrn_request.php:703 +#, php-format +msgid "Please confirm your introduction/connection request to %s." +msgstr "" + +#: mod/dfrn_request.php:832 +msgid "" +"Please enter your 'Identity Address' from one of the following supported " +"communications networks:" +msgstr "" + +#: mod/dfrn_request.php:853 +#, php-format +msgid "" +"If you are not yet a member of the free social web, follow this link to find a public Friendica site and join us today." +msgstr "" + +#: mod/dfrn_request.php:858 +msgid "Friend/Connection Request" +msgstr "" + +#: mod/dfrn_request.php:859 +msgid "" +"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, " +"testuser@identi.ca" +msgstr "" + +#: mod/dfrn_request.php:868 +msgid "StatusNet/Federated Social Web" +msgstr "" + +#: mod/dfrn_request.php:870 +#, php-format +msgid "" +" - please do not use this form. Instead, enter %s into your Diaspora search " +"bar." +msgstr "" + +#: mod/content.php:325 object/Item.php:95 +msgid "This entry was edited" +msgstr "" + +#: mod/content.php:621 object/Item.php:429 +#, php-format +msgid "%d comment" +msgid_plural "%d comments" +msgstr[0] "" +msgstr[1] "" + +#: mod/content.php:638 mod/photos.php:1406 object/Item.php:117 +msgid "Private Message" +msgstr "" + +#: mod/content.php:702 mod/photos.php:1595 object/Item.php:263 +msgid "I like this (toggle)" +msgstr "" + +#: mod/content.php:702 object/Item.php:263 +msgid "like" +msgstr "" + +#: mod/content.php:703 mod/photos.php:1596 object/Item.php:264 +msgid "I don't like this (toggle)" +msgstr "" + +#: mod/content.php:703 object/Item.php:264 +msgid "dislike" +msgstr "" + +#: mod/content.php:705 object/Item.php:266 +msgid "Share this" +msgstr "" + +#: mod/content.php:705 object/Item.php:266 +msgid "share" +msgstr "" + +#: mod/content.php:725 mod/photos.php:1615 mod/photos.php:1663 +#: mod/photos.php:1751 object/Item.php:717 +msgid "This is you" +msgstr "" + +#: mod/content.php:727 mod/content.php:945 mod/photos.php:1617 +#: mod/photos.php:1665 mod/photos.php:1753 object/Item.php:403 +#: object/Item.php:719 boot.php:899 +msgid "Comment" +msgstr "" + +#: mod/content.php:729 object/Item.php:721 +msgid "Bold" +msgstr "" + +#: mod/content.php:730 object/Item.php:722 +msgid "Italic" +msgstr "" + +#: mod/content.php:731 object/Item.php:723 +msgid "Underline" +msgstr "" + +#: mod/content.php:732 object/Item.php:724 +msgid "Quote" +msgstr "" + +#: mod/content.php:733 object/Item.php:725 +msgid "Code" +msgstr "" + +#: mod/content.php:734 object/Item.php:726 +msgid "Image" +msgstr "" + +#: mod/content.php:735 object/Item.php:727 +msgid "Link" +msgstr "" + +#: mod/content.php:736 object/Item.php:728 +msgid "Video" +msgstr "" + +#: mod/content.php:746 mod/settings.php:725 object/Item.php:122 +#: object/Item.php:124 +msgid "Edit" +msgstr "" + +#: mod/content.php:771 object/Item.php:227 +msgid "add star" +msgstr "" + +#: mod/content.php:772 object/Item.php:228 +msgid "remove star" +msgstr "" + +#: mod/content.php:773 object/Item.php:229 +msgid "toggle star status" +msgstr "" + +#: mod/content.php:776 object/Item.php:232 +msgid "starred" +msgstr "" + +#: mod/content.php:777 mod/content.php:798 object/Item.php:252 +msgid "add tag" +msgstr "" + +#: mod/content.php:787 object/Item.php:240 +msgid "ignore thread" +msgstr "" + +#: mod/content.php:788 object/Item.php:241 +msgid "unignore thread" +msgstr "" + +#: mod/content.php:789 object/Item.php:242 +msgid "toggle ignore status" +msgstr "" + +#: mod/content.php:803 object/Item.php:137 +msgid "save to folder" +msgstr "" + +#: mod/content.php:848 object/Item.php:201 +msgid "I will attend" +msgstr "" + +#: mod/content.php:848 object/Item.php:201 +msgid "I will not attend" +msgstr "" + +#: mod/content.php:848 object/Item.php:201 +msgid "I might attend" +msgstr "" + +#: mod/content.php:912 object/Item.php:369 +msgid "to" +msgstr "" + +#: mod/content.php:913 object/Item.php:371 +msgid "Wall-to-Wall" +msgstr "" + +#: mod/content.php:914 object/Item.php:372 +msgid "via Wall-To-Wall:" +msgstr "" + +#: mod/notifications.php:29 +msgid "Invalid request identifier." +msgstr "" + +#: mod/notifications.php:38 mod/notifications.php:143 +#: mod/notifications.php:228 +msgid "Discard" +msgstr "" + +#: mod/notifications.php:54 mod/notifications.php:142 +#: mod/notifications.php:227 mod/contacts.php:606 mod/contacts.php:804 +#: mod/contacts.php:1005 +msgid "Ignore" +msgstr "" + +#: mod/notifications.php:91 +msgid "Show Ignored Requests" +msgstr "" + +#: mod/notifications.php:91 +msgid "Hide Ignored Requests" +msgstr "" + +#: mod/notifications.php:127 mod/notifications.php:198 +msgid "Notification type: " +msgstr "" + +#: mod/notifications.php:128 +msgid "Friend Suggestion" +msgstr "" + +#: mod/notifications.php:130 +#, php-format +msgid "suggested by %s" +msgstr "" + +#: mod/notifications.php:135 mod/notifications.php:215 mod/contacts.php:613 +msgid "Hide this contact from others" +msgstr "" + +#: mod/notifications.php:136 mod/notifications.php:216 +msgid "Post a new friend activity" +msgstr "" + +#: mod/notifications.php:136 mod/notifications.php:216 +msgid "if applicable" +msgstr "" + +#: mod/notifications.php:139 mod/notifications.php:225 mod/admin.php:1389 +msgid "Approve" +msgstr "" + +#: mod/notifications.php:159 +msgid "Claims to be known to you: " +msgstr "" + +#: mod/notifications.php:160 +msgid "yes" +msgstr "" + +#: mod/notifications.php:160 +msgid "no" +msgstr "" + +#: mod/notifications.php:161 +msgid "" +"Shall your connection be bidirectional or not? \"Friend\" implies that you " +"allow to read and you subscribe to their posts. \"Fan/Admirer\" means that " +"you allow to read but you do not want to read theirs. Approve as: " +msgstr "" + +#: mod/notifications.php:164 +msgid "" +"Shall your connection be bidirectional or not? \"Friend\" implies that you " +"allow to read and you subscribe to their posts. \"Sharer\" means that you " +"allow to read but you do not want to read theirs. Approve as: " +msgstr "" + +#: mod/notifications.php:172 +msgid "Friend" +msgstr "" + +#: mod/notifications.php:173 +msgid "Sharer" +msgstr "" + +#: mod/notifications.php:173 +msgid "Fan/Admirer" +msgstr "" + +#: mod/notifications.php:199 +msgid "Friend/Connect Request" +msgstr "" + +#: mod/notifications.php:199 +msgid "New Follower" +msgstr "" + +#: mod/notifications.php:234 +msgid "No introductions." +msgstr "" + +#: mod/notifications.php:238 +msgid "Network Notifications" +msgstr "" + +#: mod/notifications.php:265 mod/notifications.php:382 +#: mod/notifications.php:461 +#, php-format +msgid "%s liked %s's post" +msgstr "" + +#: mod/notifications.php:275 mod/notifications.php:392 +#: mod/notifications.php:471 +#, php-format +msgid "%s disliked %s's post" +msgstr "" + +#: mod/notifications.php:290 mod/notifications.php:407 +#: mod/notifications.php:486 +#, php-format +msgid "%s is now friends with %s" +msgstr "" + +#: mod/notifications.php:297 mod/notifications.php:414 +#, php-format +msgid "%s created a new post" +msgstr "" + +#: mod/notifications.php:298 mod/notifications.php:415 +#: mod/notifications.php:496 +#, php-format +msgid "%s commented on %s's post" +msgstr "" + +#: mod/notifications.php:313 +msgid "No more network notifications." +msgstr "" + +#: mod/notifications.php:343 +msgid "Personal Notifications" +msgstr "" + +#: mod/notifications.php:430 +msgid "No more personal notifications." +msgstr "" + +#: mod/notifications.php:435 +msgid "Home Notifications" +msgstr "" + +#: mod/notifications.php:503 +msgid "No more home notifications." +msgstr "" + +#: mod/notifications.php:527 +msgid "System" +msgstr "" + +#: mod/admin.php:92 +msgid "Theme settings updated." +msgstr "" + +#: mod/admin.php:156 mod/admin.php:925 +msgid "Site" +msgstr "" + +#: mod/admin.php:157 mod/admin.php:869 mod/admin.php:1382 mod/admin.php:1397 +msgid "Users" +msgstr "" + +#: mod/admin.php:158 mod/admin.php:1499 mod/admin.php:1559 mod/settings.php:74 +msgid "Plugins" +msgstr "" + +#: mod/admin.php:159 mod/admin.php:1757 mod/admin.php:1807 +msgid "Themes" +msgstr "" + +#: mod/admin.php:160 mod/settings.php:52 +msgid "Additional features" +msgstr "" + +#: mod/admin.php:161 +msgid "DB updates" +msgstr "" + +#: mod/admin.php:162 mod/admin.php:397 +msgid "Inspect Queue" +msgstr "" + +#: mod/admin.php:163 mod/admin.php:363 +msgid "Federation Statistics" +msgstr "" + +#: mod/admin.php:177 mod/admin.php:188 mod/admin.php:1875 +msgid "Logs" +msgstr "" + +#: mod/admin.php:178 mod/admin.php:1942 +msgid "View Logs" +msgstr "" + +#: mod/admin.php:179 +msgid "probe address" +msgstr "" + +#: mod/admin.php:180 +msgid "check webfinger" +msgstr "" + +#: mod/admin.php:187 +msgid "Plugin Features" +msgstr "" + +#: mod/admin.php:189 +msgid "diagnostics" +msgstr "" + +#: mod/admin.php:190 +msgid "User registrations waiting for confirmation" +msgstr "" + +#: mod/admin.php:356 +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 "" + +#: mod/admin.php:357 +msgid "" +"The Auto Discovered Contact Directory feature is not enabled, it " +"will improve the data displayed here." +msgstr "" + +#: mod/admin.php:362 mod/admin.php:396 mod/admin.php:460 mod/admin.php:924 +#: mod/admin.php:1381 mod/admin.php:1498 mod/admin.php:1558 mod/admin.php:1756 +#: mod/admin.php:1806 mod/admin.php:1874 mod/admin.php:1941 +msgid "Administration" +msgstr "" + +#: mod/admin.php:369 +#, php-format +msgid "Currently this node is aware of %d nodes from the following platforms:" +msgstr "" + +#: mod/admin.php:399 +msgid "ID" +msgstr "" + +#: mod/admin.php:400 +msgid "Recipient Name" +msgstr "" + +#: mod/admin.php:401 +msgid "Recipient Profile" +msgstr "" + +#: mod/admin.php:403 +msgid "Created" +msgstr "" + +#: mod/admin.php:404 +msgid "Last Tried" +msgstr "" + +#: mod/admin.php:405 +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 "" + +#: mod/admin.php:424 mod/admin.php:1330 +msgid "Normal Account" +msgstr "" + +#: mod/admin.php:425 mod/admin.php:1331 +msgid "Soapbox Account" +msgstr "" + +#: mod/admin.php:426 mod/admin.php:1332 +msgid "Community/Celebrity Account" +msgstr "" + +#: mod/admin.php:427 mod/admin.php:1333 +msgid "Automatic Friend Account" +msgstr "" + +#: mod/admin.php:428 +msgid "Blog Account" +msgstr "" + +#: mod/admin.php:429 +msgid "Private Forum" +msgstr "" + +#: mod/admin.php:455 +msgid "Message queues" +msgstr "" + +#: mod/admin.php:461 +msgid "Summary" +msgstr "" + +#: mod/admin.php:463 +msgid "Registered users" +msgstr "" + +#: mod/admin.php:465 +msgid "Pending registrations" +msgstr "" + +#: mod/admin.php:466 +msgid "Version" +msgstr "" + +#: mod/admin.php:471 +msgid "Active plugins" +msgstr "" + +#: mod/admin.php:494 +msgid "Can not parse base url. Must have at least ://" +msgstr "" + +#: mod/admin.php:797 +msgid "RINO2 needs mcrypt php extension to work." +msgstr "" + +#: mod/admin.php:805 +msgid "Site settings updated." +msgstr "" + +#: mod/admin.php:833 mod/settings.php:919 +msgid "No special theme for mobile devices" +msgstr "" + +#: mod/admin.php:852 +msgid "No community page" +msgstr "" + +#: mod/admin.php:853 +msgid "Public postings from users of this site" +msgstr "" + +#: mod/admin.php:854 +msgid "Global community page" +msgstr "" + +#: mod/admin.php:859 mod/contacts.php:530 +msgid "Never" +msgstr "" + +#: mod/admin.php:860 +msgid "At post arrival" +msgstr "" + +#: mod/admin.php:868 mod/contacts.php:557 +msgid "Disabled" +msgstr "" + +#: mod/admin.php:870 +msgid "Users, Global Contacts" +msgstr "" + +#: mod/admin.php:871 +msgid "Users, Global Contacts/fallback" +msgstr "" + +#: mod/admin.php:875 +msgid "One month" +msgstr "" + +#: mod/admin.php:876 +msgid "Three months" +msgstr "" + +#: mod/admin.php:877 +msgid "Half a year" +msgstr "" + +#: mod/admin.php:878 +msgid "One year" +msgstr "" + +#: mod/admin.php:883 +msgid "Multi user instance" +msgstr "" + +#: mod/admin.php:906 +msgid "Closed" +msgstr "" + +#: mod/admin.php:907 +msgid "Requires approval" +msgstr "" + +#: mod/admin.php:908 +msgid "Open" +msgstr "" + +#: mod/admin.php:912 +msgid "No SSL policy, links will track page SSL state" +msgstr "" + +#: mod/admin.php:913 +msgid "Force all links to use SSL" +msgstr "" + +#: mod/admin.php:914 +msgid "Self-signed certificate, use SSL for local links only (discouraged)" +msgstr "" + +#: mod/admin.php:926 mod/admin.php:1560 mod/admin.php:1808 mod/admin.php:1876 +#: mod/admin.php:2025 mod/settings.php:663 mod/settings.php:773 +#: mod/settings.php:820 mod/settings.php:889 mod/settings.php:976 +#: mod/settings.php:1214 +msgid "Save Settings" +msgstr "" + +#: mod/admin.php:927 mod/register.php:263 +msgid "Registration" +msgstr "" + +#: mod/admin.php:928 +msgid "File upload" +msgstr "" + +#: mod/admin.php:929 +msgid "Policies" +msgstr "" + +#: mod/admin.php:931 +msgid "Auto Discovered Contact Directory" +msgstr "" + +#: mod/admin.php:932 +msgid "Performance" +msgstr "" + +#: mod/admin.php:933 +msgid "Worker" +msgstr "" + +#: mod/admin.php:934 +msgid "" +"Relocate - WARNING: advanced function. Could make this server unreachable." +msgstr "" + +#: mod/admin.php:937 +msgid "Site name" +msgstr "" + +#: mod/admin.php:938 +msgid "Host name" +msgstr "" + +#: mod/admin.php:939 +msgid "Sender Email" +msgstr "" + +#: mod/admin.php:939 +msgid "" +"The email address your server shall use to send notification emails from." +msgstr "" + +#: mod/admin.php:940 +msgid "Banner/Logo" +msgstr "" + +#: mod/admin.php:941 +msgid "Shortcut icon" +msgstr "" + +#: mod/admin.php:941 +msgid "Link to an icon that will be used for browsers." +msgstr "" + +#: mod/admin.php:942 +msgid "Touch icon" +msgstr "" + +#: mod/admin.php:942 +msgid "Link to an icon that will be used for tablets and mobiles." +msgstr "" + +#: mod/admin.php:943 +msgid "Additional Info" +msgstr "" + +#: mod/admin.php:943 +#, php-format +msgid "" +"For public servers: you can add additional information here that will be " +"listed at %s/siteinfo." +msgstr "" + +#: mod/admin.php:944 +msgid "System language" +msgstr "" + +#: mod/admin.php:945 +msgid "System theme" +msgstr "" + +#: mod/admin.php:945 +msgid "" +"Default system theme - may be over-ridden by user profiles - change theme settings" +msgstr "" + +#: mod/admin.php:946 +msgid "Mobile system theme" +msgstr "" + +#: mod/admin.php:946 +msgid "Theme for mobile devices" +msgstr "" + +#: mod/admin.php:947 +msgid "SSL link policy" +msgstr "" + +#: mod/admin.php:947 +msgid "Determines whether generated links should be forced to use SSL" +msgstr "" + +#: mod/admin.php:948 +msgid "Force SSL" +msgstr "" + +#: mod/admin.php:948 +msgid "" +"Force all Non-SSL requests to SSL - Attention: on some systems it could lead " +"to endless loops." +msgstr "" + +#: mod/admin.php:949 +msgid "Old style 'Share'" +msgstr "" + +#: mod/admin.php:949 +msgid "Deactivates the bbcode element 'share' for repeating items." +msgstr "" + +#: mod/admin.php:950 +msgid "Hide help entry from navigation menu" +msgstr "" + +#: mod/admin.php:950 +msgid "" +"Hides the menu entry for the Help pages from the navigation menu. You can " +"still access it calling /help directly." +msgstr "" + +#: mod/admin.php:951 +msgid "Single user instance" +msgstr "" + +#: mod/admin.php:951 +msgid "Make this instance multi-user or single-user for the named user" +msgstr "" + +#: mod/admin.php:952 +msgid "Maximum image size" +msgstr "" + +#: mod/admin.php:952 +msgid "" +"Maximum size in bytes of uploaded images. Default is 0, which means no " +"limits." +msgstr "" + +#: mod/admin.php:953 +msgid "Maximum image length" +msgstr "" + +#: mod/admin.php:953 +msgid "" +"Maximum length in pixels of the longest side of uploaded images. Default is " +"-1, which means no limits." +msgstr "" + +#: mod/admin.php:954 +msgid "JPEG image quality" +msgstr "" + +#: mod/admin.php:954 +msgid "" +"Uploaded JPEGS will be saved at this quality setting [0-100]. Default is " +"100, which is full quality." +msgstr "" + +#: mod/admin.php:956 +msgid "Register policy" +msgstr "" + +#: mod/admin.php:957 +msgid "Maximum Daily Registrations" +msgstr "" + +#: mod/admin.php:957 +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 "" + +#: mod/admin.php:958 +msgid "Register text" +msgstr "" + +#: mod/admin.php:958 +msgid "Will be displayed prominently on the registration page." +msgstr "" + +#: mod/admin.php:959 +msgid "Accounts abandoned after x days" +msgstr "" + +#: mod/admin.php:959 +msgid "" +"Will not waste system resources polling external sites for abandonded " +"accounts. Enter 0 for no time limit." +msgstr "" + +#: mod/admin.php:960 +msgid "Allowed friend domains" +msgstr "" + +#: mod/admin.php:960 +msgid "" +"Comma separated list of domains which are allowed to establish friendships " +"with this site. Wildcards are accepted. Empty to allow any domains" +msgstr "" + +#: mod/admin.php:961 +msgid "Allowed email domains" +msgstr "" + +#: mod/admin.php:961 +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 "" + +#: mod/admin.php:962 +msgid "Block public" +msgstr "" + +#: mod/admin.php:962 +msgid "" +"Check to block public access to all otherwise public personal pages on this " +"site unless you are currently logged in." +msgstr "" + +#: mod/admin.php:963 +msgid "Force publish" +msgstr "" + +#: mod/admin.php:963 +msgid "" +"Check to force all profiles on this site to be listed in the site directory." +msgstr "" + +#: mod/admin.php:964 +msgid "Global directory URL" +msgstr "" + +#: mod/admin.php:964 +msgid "" +"URL to the global directory. If this is not set, the global directory is " +"completely unavailable to the application." +msgstr "" + +#: mod/admin.php:965 +msgid "Allow threaded items" +msgstr "" + +#: mod/admin.php:965 +msgid "Allow infinite level threading for items on this site." +msgstr "" + +#: mod/admin.php:966 +msgid "Private posts by default for new users" +msgstr "" + +#: mod/admin.php:966 +msgid "" +"Set default post permissions for all new members to the default privacy " +"group rather than public." +msgstr "" + +#: mod/admin.php:967 +msgid "Don't include post content in email notifications" +msgstr "" + +#: mod/admin.php:967 +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 "" + +#: mod/admin.php:968 +msgid "Disallow public access to addons listed in the apps menu." +msgstr "" + +#: mod/admin.php:968 +msgid "" +"Checking this box will restrict addons listed in the apps menu to members " +"only." +msgstr "" + +#: mod/admin.php:969 +msgid "Don't embed private images in posts" +msgstr "" + +#: mod/admin.php:969 +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 " +"photos will have to authenticate and load each image, which may take a while." +msgstr "" + +#: mod/admin.php:970 +msgid "Allow Users to set remote_self" +msgstr "" + +#: mod/admin.php:970 +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 "" + +#: mod/admin.php:971 +msgid "Block multiple registrations" +msgstr "" + +#: mod/admin.php:971 +msgid "Disallow users to register additional accounts for use as pages." +msgstr "" + +#: mod/admin.php:972 +msgid "OpenID support" +msgstr "" + +#: mod/admin.php:972 +msgid "OpenID support for registration and logins." +msgstr "" + +#: mod/admin.php:973 +msgid "Fullname check" +msgstr "" + +#: mod/admin.php:973 +msgid "" +"Force users to register with a space between firstname and lastname in Full " +"name, as an antispam measure" +msgstr "" + +#: mod/admin.php:974 +msgid "UTF-8 Regular expressions" +msgstr "" + +#: mod/admin.php:974 +msgid "Use PHP UTF8 regular expressions" +msgstr "" + +#: mod/admin.php:975 +msgid "Community Page Style" +msgstr "" + +#: mod/admin.php:975 +msgid "" +"Type of community page to show. 'Global community' shows every public " +"posting from an open distributed network that arrived on this server." +msgstr "" + +#: mod/admin.php:976 +msgid "Posts per user on community page" +msgstr "" + +#: mod/admin.php:976 +msgid "" +"The maximum number of posts per user on the community page. (Not valid for " +"'Global Community')" +msgstr "" + +#: mod/admin.php:977 +msgid "Enable OStatus support" +msgstr "" + +#: mod/admin.php:977 +msgid "" +"Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All " +"communications in OStatus are public, so privacy warnings will be " +"occasionally displayed." +msgstr "" + +#: mod/admin.php:978 +msgid "OStatus conversation completion interval" +msgstr "" + +#: mod/admin.php:978 +msgid "" +"How often shall the poller check for new entries in OStatus conversations? " +"This can be a very ressource task." +msgstr "" + +#: mod/admin.php:979 +msgid "Only import OStatus threads from our contacts" +msgstr "" + +#: mod/admin.php:979 +msgid "" +"Normally we import every content from our OStatus contacts. With this option " +"we only store threads that are started by a contact that is known on our " +"system." +msgstr "" + +#: mod/admin.php:980 +msgid "OStatus support can only be enabled if threading is enabled." +msgstr "" + +#: mod/admin.php:982 +msgid "" +"Diaspora support can't be enabled because Friendica was installed into a sub " +"directory." +msgstr "" + +#: mod/admin.php:983 +msgid "Enable Diaspora support" +msgstr "" + +#: mod/admin.php:983 +msgid "Provide built-in Diaspora network compatibility." +msgstr "" + +#: mod/admin.php:984 +msgid "Only allow Friendica contacts" +msgstr "" + +#: mod/admin.php:984 +msgid "" +"All contacts must use Friendica protocols. All other built-in communication " +"protocols disabled." +msgstr "" + +#: mod/admin.php:985 +msgid "Verify SSL" +msgstr "" + +#: mod/admin.php:985 +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 "" + +#: mod/admin.php:986 +msgid "Proxy user" +msgstr "" + +#: mod/admin.php:987 +msgid "Proxy URL" +msgstr "" + +#: mod/admin.php:988 +msgid "Network timeout" +msgstr "" + +#: mod/admin.php:988 +msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." +msgstr "" + +#: mod/admin.php:989 +msgid "Delivery interval" +msgstr "" + +#: mod/admin.php:989 +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 "" + +#: mod/admin.php:990 +msgid "Poll interval" +msgstr "" + +#: mod/admin.php:990 +msgid "" +"Delay background polling processes by this many seconds to reduce system " +"load. If 0, use delivery interval." +msgstr "" + +#: mod/admin.php:991 +msgid "Maximum Load Average" +msgstr "" + +#: mod/admin.php:991 +msgid "" +"Maximum system load before delivery and poll processes are deferred - " +"default 50." +msgstr "" + +#: mod/admin.php:992 +msgid "Maximum Load Average (Frontend)" +msgstr "" + +#: mod/admin.php:992 +msgid "Maximum system load before the frontend quits service - default 50." +msgstr "" + +#: mod/admin.php:993 +msgid "Maximum table size for optimization" +msgstr "" + +#: mod/admin.php:993 +msgid "" +"Maximum table size (in MB) for the automatic optimization - default 100 MB. " +"Enter -1 to disable it." +msgstr "" + +#: mod/admin.php:994 +msgid "Minimum level of fragmentation" +msgstr "" + +#: mod/admin.php:994 +msgid "" +"Minimum fragmenation level to start the automatic optimization - default " +"value is 30%." +msgstr "" + +#: mod/admin.php:996 +msgid "Periodical check of global contacts" +msgstr "" + +#: mod/admin.php:996 +msgid "" +"If enabled, the global contacts are checked periodically for missing or " +"outdated data and the vitality of the contacts and servers." +msgstr "" + +#: mod/admin.php:997 +msgid "Days between requery" +msgstr "" + +#: mod/admin.php:997 +msgid "Number of days after which a server is requeried for his contacts." +msgstr "" + +#: mod/admin.php:998 +msgid "Discover contacts from other servers" +msgstr "" + +#: mod/admin.php:998 +msgid "" +"Periodically query other servers for contacts. You can choose between " +"'users': the users on the remote system, 'Global Contacts': active contacts " +"that are known on the system. The fallback is meant for Redmatrix servers " +"and older friendica servers, where global contacts weren't available. The " +"fallback increases the server load, so the recommened setting is 'Users, " +"Global Contacts'." +msgstr "" + +#: mod/admin.php:999 +msgid "Timeframe for fetching global contacts" +msgstr "" + +#: mod/admin.php:999 +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 "" + +#: mod/admin.php:1000 +msgid "Search the local directory" +msgstr "" + +#: mod/admin.php:1000 +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 "" + +#: mod/admin.php:1002 +msgid "Publish server information" +msgstr "" + +#: mod/admin.php:1002 +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 " +"profiles, number of posts and the activated protocols and connectors. See the-federation.info for details." +msgstr "" + +#: mod/admin.php:1004 +msgid "Use MySQL full text engine" +msgstr "" + +#: mod/admin.php:1004 +msgid "" +"Activates the full text engine. Speeds up search - but can only search for " +"four and more characters." +msgstr "" + +#: mod/admin.php:1005 +msgid "Suppress Language" +msgstr "" + +#: mod/admin.php:1005 +msgid "Suppress language information in meta information about a posting." +msgstr "" + +#: mod/admin.php:1006 +msgid "Suppress Tags" +msgstr "" + +#: mod/admin.php:1006 +msgid "Suppress showing a list of hashtags at the end of the posting." +msgstr "" + +#: mod/admin.php:1007 +msgid "Path to item cache" +msgstr "" + +#: mod/admin.php:1007 +msgid "The item caches buffers generated bbcode and external images." +msgstr "" + +#: mod/admin.php:1008 +msgid "Cache duration in seconds" +msgstr "" + +#: mod/admin.php:1008 +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 "" + +#: mod/admin.php:1009 +msgid "Maximum numbers of comments per post" +msgstr "" + +#: mod/admin.php:1009 +msgid "How much comments should be shown for each post? Default value is 100." +msgstr "" + +#: mod/admin.php:1010 +msgid "Path for lock file" +msgstr "" + +#: mod/admin.php:1010 +msgid "" +"The lock file is used to avoid multiple pollers at one time. Only define a " +"folder here." +msgstr "" + +#: mod/admin.php:1011 +msgid "Temp path" +msgstr "" + +#: mod/admin.php:1011 +msgid "" +"If you have a restricted system where the webserver can't access the system " +"temp path, enter another path here." +msgstr "" + +#: mod/admin.php:1012 +msgid "Base path to installation" +msgstr "" + +#: mod/admin.php:1012 +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 "" + +#: mod/admin.php:1013 +msgid "Disable picture proxy" +msgstr "" + +#: mod/admin.php:1013 +msgid "" +"The picture proxy increases performance and privacy. It shouldn't be used on " +"systems with very low bandwith." +msgstr "" + +#: mod/admin.php:1014 +msgid "Enable old style pager" +msgstr "" + +#: mod/admin.php:1014 +msgid "" +"The old style pager has page numbers but slows down massively the page speed." +msgstr "" + +#: mod/admin.php:1015 +msgid "Only search in tags" +msgstr "" + +#: mod/admin.php:1015 +msgid "On large systems the text search can slow down the system extremely." +msgstr "" + +#: mod/admin.php:1017 +msgid "New base url" +msgstr "" + +#: mod/admin.php:1017 +msgid "" +"Change base url for this server. Sends relocate message to all DFRN contacts " +"of all users." +msgstr "" + +#: mod/admin.php:1019 +msgid "RINO Encryption" +msgstr "" + +#: mod/admin.php:1019 +msgid "Encryption layer between nodes." +msgstr "" + +#: mod/admin.php:1020 +msgid "Embedly API key" +msgstr "" + +#: mod/admin.php:1020 +msgid "" +"Embedly is used to fetch additional data for " +"web pages. This is an optional parameter." +msgstr "" + +#: mod/admin.php:1022 +msgid "Enable 'worker' background processing" +msgstr "" + +#: mod/admin.php:1022 +msgid "" +"The worker background processing limits the number of parallel background " +"jobs to a maximum number and respects the system load." +msgstr "" + +#: mod/admin.php:1023 +msgid "Maximum number of parallel workers" +msgstr "" + +#: mod/admin.php:1023 +msgid "" +"On shared hosters set this to 2. On larger systems, values of 10 are great. " +"Default value is 4." +msgstr "" + +#: mod/admin.php:1024 +msgid "Don't use 'proc_open' with the worker" +msgstr "" + +#: mod/admin.php:1024 +msgid "" +"Enable this if your system doesn't allow the use of 'proc_open'. This can " +"happen on shared hosters. If this is enabled you should increase the " +"frequency of poller calls in your crontab." +msgstr "" + +#: mod/admin.php:1025 +msgid "Enable fastlane" +msgstr "" + +#: mod/admin.php:1025 +msgid "" +"When enabed, the fastlane mechanism starts an additional worker if processes " +"with higher priority are blocked by processes of lower priority." +msgstr "" + +#: mod/admin.php:1054 +msgid "Update has been marked successful" +msgstr "" + +#: mod/admin.php:1062 +#, php-format +msgid "Database structure update %s was successfully applied." +msgstr "" + +#: mod/admin.php:1065 +#, php-format +msgid "Executing of database structure update %s failed with error: %s" +msgstr "" + +#: mod/admin.php:1077 +#, php-format +msgid "Executing %s failed with error: %s" +msgstr "" + +#: mod/admin.php:1080 +#, php-format +msgid "Update %s was successfully applied." +msgstr "" + +#: mod/admin.php:1084 +#, php-format +msgid "Update %s did not return a status. Unknown if it succeeded." +msgstr "" + +#: mod/admin.php:1086 +#, php-format +msgid "There was no additional update function %s that needed to be called." +msgstr "" + +#: mod/admin.php:1105 +msgid "No failed updates." +msgstr "" + +#: mod/admin.php:1106 +msgid "Check database structure" +msgstr "" + +#: mod/admin.php:1111 +msgid "Failed Updates" +msgstr "" + +#: mod/admin.php:1112 +msgid "" +"This does not include updates prior to 1139, which did not return a status." +msgstr "" + +#: mod/admin.php:1113 +msgid "Mark success (if update was manually applied)" +msgstr "" + +#: mod/admin.php:1114 +msgid "Attempt to execute this update step automatically" +msgstr "" + +#: mod/admin.php:1146 +#, php-format +msgid "" +"\n" +"\t\t\tDear %1$s,\n" +"\t\t\t\tthe administrator of %2$s has set up an account for you." +msgstr "" + +#: mod/admin.php:1149 +#, php-format +msgid "" +"\n" +"\t\t\tThe login details are as follows:\n" +"\n" +"\t\t\tSite Location:\t%1$s\n" +"\t\t\tLogin Name:\t\t%2$s\n" +"\t\t\tPassword:\t\t%3$s\n" +"\n" +"\t\t\tYou may change your password from your account \"Settings\" page after " +"logging\n" +"\t\t\tin.\n" +"\n" +"\t\t\tPlease take a few moments to review the other account settings on that " +"page.\n" +"\n" +"\t\t\tYou may also wish to add some basic information to your default " +"profile\n" +"\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n" +"\n" +"\t\t\tWe recommend setting your full name, adding a profile photo,\n" +"\t\t\tadding some profile \"keywords\" (very useful in making new friends) - " +"and\n" +"\t\t\tperhaps what country you live in; if you do not wish to be more " +"specific\n" +"\t\t\tthan that.\n" +"\n" +"\t\t\tWe fully respect your right to privacy, and none of these items are " +"necessary.\n" +"\t\t\tIf you are new and do not know anybody here, they may help\n" +"\t\t\tyou to make some new and interesting friends.\n" +"\n" +"\t\t\tThank you and welcome to %4$s." +msgstr "" + +#: mod/admin.php:1193 +#, php-format +msgid "%s user blocked/unblocked" +msgid_plural "%s users blocked/unblocked" +msgstr[0] "" +msgstr[1] "" + +#: mod/admin.php:1200 +#, php-format +msgid "%s user deleted" +msgid_plural "%s users deleted" +msgstr[0] "" +msgstr[1] "" + +#: mod/admin.php:1247 +#, php-format +msgid "User '%s' deleted" +msgstr "" + +#: mod/admin.php:1255 +#, php-format +msgid "User '%s' unblocked" +msgstr "" + +#: mod/admin.php:1255 +#, php-format +msgid "User '%s' blocked" +msgstr "" + +#: mod/admin.php:1374 mod/admin.php:1399 +msgid "Register date" +msgstr "" + +#: mod/admin.php:1374 mod/admin.php:1399 +msgid "Last login" +msgstr "" + +#: mod/admin.php:1374 mod/admin.php:1399 +msgid "Last item" +msgstr "" + +#: mod/admin.php:1374 mod/settings.php:43 +msgid "Account" +msgstr "" + +#: mod/admin.php:1383 +msgid "Add User" +msgstr "" + +#: mod/admin.php:1384 +msgid "select all" +msgstr "" + +#: mod/admin.php:1385 +msgid "User registrations waiting for confirm" +msgstr "" + +#: mod/admin.php:1386 +msgid "User waiting for permanent deletion" +msgstr "" + +#: mod/admin.php:1387 +msgid "Request date" +msgstr "" + +#: mod/admin.php:1388 +msgid "No registrations." +msgstr "" + +#: mod/admin.php:1390 +msgid "Deny" +msgstr "" + +#: mod/admin.php:1392 mod/contacts.php:605 mod/contacts.php:803 +#: mod/contacts.php:997 +msgid "Block" +msgstr "" + +#: mod/admin.php:1393 mod/contacts.php:605 mod/contacts.php:803 +#: mod/contacts.php:997 +msgid "Unblock" +msgstr "" + +#: mod/admin.php:1394 +msgid "Site admin" +msgstr "" + +#: mod/admin.php:1395 +msgid "Account expired" +msgstr "" + +#: mod/admin.php:1398 +msgid "New User" +msgstr "" + +#: mod/admin.php:1399 +msgid "Deleted since" +msgstr "" + +#: mod/admin.php:1404 +msgid "" +"Selected users will be deleted!\\n\\nEverything these users had posted on " +"this site will be permanently deleted!\\n\\nAre you sure?" +msgstr "" + +#: mod/admin.php:1405 +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 "" + +#: mod/admin.php:1415 +msgid "Name of the new user." +msgstr "" + +#: mod/admin.php:1416 +msgid "Nickname" +msgstr "" + +#: mod/admin.php:1416 +msgid "Nickname of the new user." +msgstr "" + +#: mod/admin.php:1417 +msgid "Email address of the new user." +msgstr "" + +#: mod/admin.php:1460 +#, php-format +msgid "Plugin %s disabled." +msgstr "" + +#: mod/admin.php:1464 +#, php-format +msgid "Plugin %s enabled." +msgstr "" + +#: mod/admin.php:1475 mod/admin.php:1711 +msgid "Disable" +msgstr "" + +#: mod/admin.php:1477 mod/admin.php:1713 +msgid "Enable" +msgstr "" + +#: mod/admin.php:1500 mod/admin.php:1758 +msgid "Toggle" +msgstr "" + +#: mod/admin.php:1508 mod/admin.php:1767 +msgid "Author: " +msgstr "" + +#: mod/admin.php:1509 mod/admin.php:1768 +msgid "Maintainer: " +msgstr "" + +#: mod/admin.php:1561 +msgid "Reload active plugins" +msgstr "" + +#: mod/admin.php:1566 +#, 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 "" + +#: mod/admin.php:1671 +msgid "No themes found." +msgstr "" + +#: mod/admin.php:1749 +msgid "Screenshot" +msgstr "" + +#: mod/admin.php:1809 +msgid "Reload active themes" +msgstr "" + +#: mod/admin.php:1814 +#, php-format +msgid "No themes found on the system. They should be paced in %1$s" +msgstr "" + +#: mod/admin.php:1815 +msgid "[Experimental]" +msgstr "" + +#: mod/admin.php:1816 +msgid "[Unsupported]" +msgstr "" + +#: mod/admin.php:1840 +msgid "Log settings updated." +msgstr "" + +#: mod/admin.php:1877 +msgid "Clear" +msgstr "" + +#: mod/admin.php:1882 +msgid "Enable Debugging" +msgstr "" + +#: mod/admin.php:1883 +msgid "Log file" +msgstr "" + +#: mod/admin.php:1883 +msgid "" +"Must be writable by web server. Relative to your Friendica top-level " +"directory." +msgstr "" + +#: mod/admin.php:1884 +msgid "Log level" +msgstr "" + +#: mod/admin.php:1887 +msgid "PHP logging" +msgstr "" + +#: mod/admin.php:1888 +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 "" + +#: mod/admin.php:2014 mod/admin.php:2015 mod/settings.php:763 +msgid "Off" +msgstr "" + +#: mod/admin.php:2014 mod/admin.php:2015 mod/settings.php:763 +msgid "On" +msgstr "" + +#: mod/admin.php:2015 +#, php-format +msgid "Lock feature %s" +msgstr "" + +#: mod/admin.php:2023 +msgid "Manage Additional Features" +msgstr "" + +#: mod/contacts.php:128 +#, php-format +msgid "%d contact edited." +msgid_plural "%d contacts edited." +msgstr[0] "" +msgstr[1] "" + +#: mod/contacts.php:159 mod/contacts.php:368 +msgid "Could not access contact record." +msgstr "" + +#: mod/contacts.php:173 +msgid "Could not locate selected profile." +msgstr "" + +#: mod/contacts.php:206 +msgid "Contact updated." +msgstr "" + +#: mod/contacts.php:389 +msgid "Contact has been blocked" +msgstr "" + +#: mod/contacts.php:389 +msgid "Contact has been unblocked" +msgstr "" + +#: mod/contacts.php:400 +msgid "Contact has been ignored" +msgstr "" + +#: mod/contacts.php:400 +msgid "Contact has been unignored" +msgstr "" + +#: mod/contacts.php:412 +msgid "Contact has been archived" +msgstr "" + +#: mod/contacts.php:412 +msgid "Contact has been unarchived" +msgstr "" + +#: mod/contacts.php:437 +msgid "Drop contact" +msgstr "" + +#: mod/contacts.php:440 mod/contacts.php:799 +msgid "Do you really want to delete this contact?" +msgstr "" + +#: mod/contacts.php:457 +msgid "Contact has been removed." +msgstr "" + +#: mod/contacts.php:498 +#, php-format +msgid "You are mutual friends with %s" +msgstr "" + +#: mod/contacts.php:502 +#, php-format +msgid "You are sharing with %s" +msgstr "" + +#: mod/contacts.php:507 +#, php-format +msgid "%s is sharing with you" +msgstr "" + +#: mod/contacts.php:527 +msgid "Private communications are not available for this contact." +msgstr "" + +#: mod/contacts.php:534 +msgid "(Update was successful)" +msgstr "" + +#: mod/contacts.php:534 +msgid "(Update was not successful)" +msgstr "" + +#: mod/contacts.php:536 mod/contacts.php:978 +msgid "Suggest friends" +msgstr "" + +#: mod/contacts.php:540 +#, php-format +msgid "Network type: %s" +msgstr "" + +#: mod/contacts.php:553 +msgid "Communications lost with this contact!" +msgstr "" + +#: mod/contacts.php:556 +msgid "Fetch further information for feeds" +msgstr "" + +#: mod/contacts.php:557 +msgid "Fetch information" +msgstr "" + +#: mod/contacts.php:557 +msgid "Fetch information and keywords" +msgstr "" + +#: mod/contacts.php:575 +msgid "Contact" +msgstr "" + +#: mod/contacts.php:578 +msgid "Profile Visibility" +msgstr "" + +#: mod/contacts.php:579 +#, php-format +msgid "" +"Please choose the profile you would like to display to %s when viewing your " +"profile securely." +msgstr "" + +#: mod/contacts.php:580 +msgid "Contact Information / Notes" +msgstr "" + +#: mod/contacts.php:581 +msgid "Edit contact notes" +msgstr "" + +#: mod/contacts.php:587 +msgid "Block/Unblock contact" +msgstr "" + +#: mod/contacts.php:588 +msgid "Ignore contact" +msgstr "" + +#: mod/contacts.php:589 +msgid "Repair URL settings" +msgstr "" + +#: mod/contacts.php:590 +msgid "View conversations" +msgstr "" + +#: mod/contacts.php:596 +msgid "Last update:" +msgstr "" + +#: mod/contacts.php:598 +msgid "Update public posts" +msgstr "" + +#: mod/contacts.php:600 mod/contacts.php:988 +msgid "Update now" +msgstr "" + +#: mod/contacts.php:606 mod/contacts.php:804 mod/contacts.php:1005 +msgid "Unignore" +msgstr "" + +#: mod/contacts.php:610 +msgid "Currently blocked" +msgstr "" + +#: mod/contacts.php:611 +msgid "Currently ignored" +msgstr "" + +#: mod/contacts.php:612 +msgid "Currently archived" +msgstr "" + +#: mod/contacts.php:613 +msgid "" +"Replies/likes to your public posts may still be visible" +msgstr "" + +#: mod/contacts.php:614 +msgid "Notification for new posts" +msgstr "" + +#: mod/contacts.php:614 +msgid "Send a notification of every new post of this contact" +msgstr "" + +#: mod/contacts.php:617 +msgid "Blacklisted keywords" +msgstr "" + +#: mod/contacts.php:617 +msgid "" +"Comma separated list of keywords that should not be converted to hashtags, " +"when \"Fetch information and keywords\" is selected" +msgstr "" + +#: mod/contacts.php:633 +msgid "Actions" +msgstr "" + +#: mod/contacts.php:636 +msgid "Contact Settings" +msgstr "" + +#: mod/contacts.php:682 +msgid "Suggestions" +msgstr "" + +#: mod/contacts.php:685 +msgid "Suggest potential friends" +msgstr "" + +#: mod/contacts.php:693 +msgid "Show all contacts" +msgstr "" + +#: mod/contacts.php:698 +msgid "Unblocked" +msgstr "" + +#: mod/contacts.php:701 +msgid "Only show unblocked contacts" +msgstr "" + +#: mod/contacts.php:707 +msgid "Blocked" +msgstr "" + +#: mod/contacts.php:710 +msgid "Only show blocked contacts" +msgstr "" + +#: mod/contacts.php:716 +msgid "Ignored" +msgstr "" + +#: mod/contacts.php:719 +msgid "Only show ignored contacts" +msgstr "" + +#: mod/contacts.php:725 +msgid "Archived" +msgstr "" + +#: mod/contacts.php:728 +msgid "Only show archived contacts" +msgstr "" + +#: mod/contacts.php:734 +msgid "Hidden" +msgstr "" + +#: mod/contacts.php:737 +msgid "Only show hidden contacts" +msgstr "" + +#: mod/contacts.php:794 +msgid "Search your contacts" +msgstr "" + +#: mod/contacts.php:802 mod/settings.php:158 mod/settings.php:689 +msgid "Update" +msgstr "" + +#: mod/contacts.php:805 mod/contacts.php:1013 +msgid "Archive" +msgstr "" + +#: mod/contacts.php:805 mod/contacts.php:1013 +msgid "Unarchive" +msgstr "" + +#: mod/contacts.php:808 +msgid "Batch Actions" +msgstr "" + +#: mod/contacts.php:854 +msgid "View all contacts" +msgstr "" + +#: mod/contacts.php:864 +msgid "View all common friends" +msgstr "" + +#: mod/contacts.php:871 +msgid "Advanced Contact Settings" +msgstr "" + +#: mod/contacts.php:916 +msgid "Mutual Friendship" +msgstr "" + +#: mod/contacts.php:920 +msgid "is a fan of yours" +msgstr "" + +#: mod/contacts.php:924 +msgid "you are a fan of" +msgstr "" + +#: mod/contacts.php:999 +msgid "Toggle Blocked status" +msgstr "" + +#: mod/contacts.php:1007 +msgid "Toggle Ignored status" +msgstr "" + +#: mod/contacts.php:1015 +msgid "Toggle Archive status" +msgstr "" + +#: mod/contacts.php:1023 +msgid "Delete contact" +msgstr "" + +#: mod/dfrn_confirm.php:66 mod/profiles.php:19 mod/profiles.php:134 +#: mod/profiles.php:180 mod/profiles.php:610 +msgid "Profile not found." +msgstr "" + +#: mod/dfrn_confirm.php:123 +msgid "" +"This may occasionally happen if contact was requested by both persons and it " +"has already been approved." +msgstr "" + +#: mod/dfrn_confirm.php:242 +msgid "Response from remote site was not understood." +msgstr "" + +#: mod/dfrn_confirm.php:251 mod/dfrn_confirm.php:256 +msgid "Unexpected response from remote site: " +msgstr "" + +#: mod/dfrn_confirm.php:265 +msgid "Confirmation completed successfully." +msgstr "" + +#: mod/dfrn_confirm.php:267 mod/dfrn_confirm.php:281 mod/dfrn_confirm.php:288 +msgid "Remote site reported: " +msgstr "" + +#: mod/dfrn_confirm.php:279 +msgid "Temporary failure. Please wait and try again." +msgstr "" + +#: mod/dfrn_confirm.php:286 +msgid "Introduction failed or was revoked." +msgstr "" + +#: mod/dfrn_confirm.php:415 +msgid "Unable to set contact photo." +msgstr "" + +#: mod/dfrn_confirm.php:553 +#, php-format +msgid "No user record found for '%s' " +msgstr "" + +#: mod/dfrn_confirm.php:563 +msgid "Our site encryption key is apparently messed up." +msgstr "" + +#: mod/dfrn_confirm.php:574 +msgid "Empty site URL was provided or URL could not be decrypted by us." +msgstr "" + +#: mod/dfrn_confirm.php:595 +msgid "Contact record was not found for you on our site." +msgstr "" + +#: mod/dfrn_confirm.php:609 +#, php-format +msgid "Site public key not available in contact record for URL %s." +msgstr "" + +#: mod/dfrn_confirm.php:629 +msgid "" +"The ID provided by your system is a duplicate on our system. It should work " +"if you try again." +msgstr "" + +#: mod/dfrn_confirm.php:640 +msgid "Unable to set your contact credentials on our system." +msgstr "" + +#: mod/dfrn_confirm.php:699 +msgid "Unable to update your contact profile details on our system" +msgstr "" + +#: mod/dfrn_confirm.php:771 +#, php-format +msgid "%1$s has joined %2$s" +msgstr "" + +#: mod/dirfind.php:36 +#, php-format +msgid "People Search - %s" +msgstr "" + +#: mod/dirfind.php:47 +#, php-format +msgid "Forum Search - %s" +msgstr "" + +#: mod/events.php:95 mod/events.php:97 +msgid "Event can not end before it has started." +msgstr "" + +#: mod/events.php:104 mod/events.php:106 +msgid "Event title and start time are required." +msgstr "" + +#: mod/events.php:381 +msgid "Create New Event" +msgstr "" + +#: mod/events.php:483 +msgid "Event details" +msgstr "" + +#: mod/events.php:484 +msgid "Starting date and Title are required." +msgstr "" + +#: mod/events.php:485 mod/events.php:486 +msgid "Event Starts:" +msgstr "" + +#: mod/events.php:485 mod/events.php:497 mod/profiles.php:709 +msgid "Required" +msgstr "" + +#: mod/events.php:487 mod/events.php:503 +msgid "Finish date/time is not known or not relevant" +msgstr "" + +#: mod/events.php:489 mod/events.php:490 +msgid "Event Finishes:" +msgstr "" + +#: mod/events.php:491 mod/events.php:504 +msgid "Adjust for viewer timezone" +msgstr "" + +#: mod/events.php:493 +msgid "Description:" +msgstr "" + +#: mod/events.php:497 mod/events.php:499 +msgid "Title:" +msgstr "" + +#: mod/events.php:500 mod/events.php:501 +msgid "Share this event" +msgstr "" + +#: mod/fsuggest.php:63 +msgid "Friend suggestion sent." +msgstr "" + +#: mod/fsuggest.php:97 +msgid "Suggest Friends" +msgstr "" + +#: mod/fsuggest.php:99 +#, php-format +msgid "Suggest a friend for %s" +msgstr "" + +#: mod/item.php:116 +msgid "Unable to locate original post." +msgstr "" + +#: mod/item.php:334 +msgid "Empty post discarded." +msgstr "" + +#: mod/item.php:867 +msgid "System error. Post not saved." +msgstr "" + +#: mod/item.php:993 +#, php-format +msgid "" +"This message was sent to you by %s, a member of the Friendica social network." +msgstr "" + +#: mod/item.php:995 +#, php-format +msgid "You may visit them online at %s" +msgstr "" + +#: mod/item.php:996 +msgid "" +"Please contact the sender by replying to this post if you do not wish to " +"receive these messages." +msgstr "" + +#: mod/item.php:1000 +#, php-format +msgid "%s posted an update." +msgstr "" + +#: mod/mood.php:133 +msgid "Mood" +msgstr "" + +#: mod/mood.php:134 +msgid "Set your current mood and tell your friends" +msgstr "" + +#: mod/photos.php:101 mod/photos.php:1887 +msgid "Recent Photos" +msgstr "" + +#: mod/photos.php:104 mod/photos.php:1308 mod/photos.php:1889 +msgid "Upload New Photos" +msgstr "" + +#: mod/photos.php:118 mod/settings.php:36 +msgid "everybody" +msgstr "" + +#: mod/photos.php:182 +msgid "Contact information unavailable" +msgstr "" + +#: mod/photos.php:203 +msgid "Album not found." +msgstr "" + +#: mod/photos.php:233 mod/photos.php:245 mod/photos.php:1250 +msgid "Delete Album" +msgstr "" + +#: mod/photos.php:243 +msgid "Do you really want to delete this photo album and all its photos?" +msgstr "" + +#: mod/photos.php:323 mod/photos.php:334 mod/photos.php:1568 +msgid "Delete Photo" +msgstr "" + +#: mod/photos.php:332 +msgid "Do you really want to delete this photo?" +msgstr "" + +#: mod/photos.php:707 +#, php-format +msgid "%1$s was tagged in %2$s by %3$s" +msgstr "" + +#: mod/photos.php:707 +msgid "a photo" +msgstr "" + +#: mod/photos.php:814 +msgid "Image file is empty." +msgstr "" + +#: mod/photos.php:974 +msgid "No photos selected" +msgstr "" + +#: mod/photos.php:1075 mod/videos.php:308 +msgid "Access to this item is restricted." +msgstr "" + +#: mod/photos.php:1135 +#, php-format +msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." +msgstr "" + +#: mod/photos.php:1170 +msgid "Upload Photos" +msgstr "" + +#: mod/photos.php:1174 mod/photos.php:1245 +msgid "New album name: " +msgstr "" + +#: mod/photos.php:1175 +msgid "or existing album name: " +msgstr "" + +#: mod/photos.php:1176 +msgid "Do not show a status post for this upload" +msgstr "" + +#: mod/photos.php:1187 mod/photos.php:1572 mod/settings.php:1250 +msgid "Show to Groups" +msgstr "" + +#: mod/photos.php:1188 mod/photos.php:1573 mod/settings.php:1251 +msgid "Show to Contacts" +msgstr "" + +#: mod/photos.php:1189 +msgid "Private Photo" +msgstr "" + +#: mod/photos.php:1190 +msgid "Public Photo" +msgstr "" + +#: mod/photos.php:1258 +msgid "Edit Album" +msgstr "" + +#: mod/photos.php:1264 +msgid "Show Newest First" +msgstr "" + +#: mod/photos.php:1266 +msgid "Show Oldest First" +msgstr "" + +#: mod/photos.php:1294 mod/photos.php:1872 +msgid "View Photo" +msgstr "" + +#: mod/photos.php:1341 +msgid "Permission denied. Access to this item may be restricted." +msgstr "" + +#: mod/photos.php:1343 +msgid "Photo not available" +msgstr "" + +#: mod/photos.php:1399 +msgid "View photo" +msgstr "" + +#: mod/photos.php:1399 +msgid "Edit photo" +msgstr "" + +#: mod/photos.php:1400 +msgid "Use as profile photo" +msgstr "" + +#: mod/photos.php:1425 +msgid "View Full Size" +msgstr "" + +#: mod/photos.php:1511 +msgid "Tags: " +msgstr "" + +#: mod/photos.php:1514 +msgid "[Remove any tag]" +msgstr "" + +#: mod/photos.php:1554 +msgid "New album name" +msgstr "" + +#: mod/photos.php:1555 +msgid "Caption" +msgstr "" + +#: mod/photos.php:1556 +msgid "Add a Tag" +msgstr "" + +#: mod/photos.php:1556 +msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" +msgstr "" + +#: mod/photos.php:1557 +msgid "Do not rotate" +msgstr "" + +#: mod/photos.php:1558 +msgid "Rotate CW (right)" +msgstr "" + +#: mod/photos.php:1559 +msgid "Rotate CCW (left)" +msgstr "" + +#: mod/photos.php:1574 +msgid "Private photo" +msgstr "" + +#: mod/photos.php:1575 +msgid "Public photo" +msgstr "" + +#: mod/photos.php:1801 +msgid "Map" +msgstr "" + +#: mod/photos.php:1878 mod/videos.php:390 +msgid "View Album" +msgstr "" + +#: mod/poke.php:192 +msgid "Poke/Prod" +msgstr "" + +#: mod/poke.php:193 +msgid "poke, prod or do other things to somebody" +msgstr "" + +#: mod/poke.php:194 +msgid "Recipient" +msgstr "" + +#: mod/poke.php:195 +msgid "Choose what you wish to do to recipient" +msgstr "" + +#: mod/poke.php:198 +msgid "Make this post private" +msgstr "" + #: mod/profile_photo.php:44 msgid "Image uploaded but image cropping failed." msgstr "" @@ -6071,6 +7433,291 @@ msgstr "" msgid "Image uploaded successfully." msgstr "" +#: mod/profiles.php:38 +msgid "Profile deleted." +msgstr "" + +#: mod/profiles.php:56 mod/profiles.php:90 +msgid "Profile-" +msgstr "" + +#: mod/profiles.php:75 mod/profiles.php:118 +msgid "New profile created." +msgstr "" + +#: mod/profiles.php:96 +msgid "Profile unavailable to clone." +msgstr "" + +#: mod/profiles.php:190 +msgid "Profile Name is required." +msgstr "" + +#: mod/profiles.php:337 +msgid "Marital Status" +msgstr "" + +#: mod/profiles.php:341 +msgid "Romantic Partner" +msgstr "" + +#: mod/profiles.php:353 +msgid "Work/Employment" +msgstr "" + +#: mod/profiles.php:356 +msgid "Religion" +msgstr "" + +#: mod/profiles.php:360 +msgid "Political Views" +msgstr "" + +#: mod/profiles.php:364 +msgid "Gender" +msgstr "" + +#: mod/profiles.php:368 +msgid "Sexual Preference" +msgstr "" + +#: mod/profiles.php:372 +msgid "Homepage" +msgstr "" + +#: mod/profiles.php:376 mod/profiles.php:695 +msgid "Interests" +msgstr "" + +#: mod/profiles.php:380 +msgid "Address" +msgstr "" + +#: mod/profiles.php:387 mod/profiles.php:691 +msgid "Location" +msgstr "" + +#: mod/profiles.php:470 +msgid "Profile updated." +msgstr "" + +#: mod/profiles.php:557 +msgid " and " +msgstr "" + +#: mod/profiles.php:565 +msgid "public profile" +msgstr "" + +#: mod/profiles.php:568 +#, php-format +msgid "%1$s changed %2$s to “%3$s”" +msgstr "" + +#: mod/profiles.php:569 +#, php-format +msgid " - Visit %1$s's %2$s" +msgstr "" + +#: mod/profiles.php:572 +#, php-format +msgid "%1$s has an updated %2$s, changing %3$s." +msgstr "" + +#: mod/profiles.php:638 +msgid "Hide contacts and friends:" +msgstr "" + +#: mod/profiles.php:643 +msgid "Hide your contact/friend list from viewers of this profile?" +msgstr "" + +#: mod/profiles.php:667 +msgid "Show more profile fields:" +msgstr "" + +#: mod/profiles.php:679 +msgid "Profile Actions" +msgstr "" + +#: mod/profiles.php:680 +msgid "Edit Profile Details" +msgstr "" + +#: mod/profiles.php:682 +msgid "Change Profile Photo" +msgstr "" + +#: mod/profiles.php:683 +msgid "View this profile" +msgstr "" + +#: mod/profiles.php:685 +msgid "Create a new profile using these settings" +msgstr "" + +#: mod/profiles.php:686 +msgid "Clone this profile" +msgstr "" + +#: mod/profiles.php:687 +msgid "Delete this profile" +msgstr "" + +#: mod/profiles.php:689 +msgid "Basic information" +msgstr "" + +#: mod/profiles.php:690 +msgid "Profile picture" +msgstr "" + +#: mod/profiles.php:692 +msgid "Preferences" +msgstr "" + +#: mod/profiles.php:693 +msgid "Status information" +msgstr "" + +#: mod/profiles.php:694 +msgid "Additional information" +msgstr "" + +#: mod/profiles.php:697 +msgid "Relation" +msgstr "" + +#: mod/profiles.php:701 +msgid "Your Gender:" +msgstr "" + +#: mod/profiles.php:702 +msgid "♥ Marital Status:" +msgstr "" + +#: mod/profiles.php:704 +msgid "Example: fishing photography software" +msgstr "" + +#: mod/profiles.php:709 +msgid "Profile Name:" +msgstr "" + +#: mod/profiles.php:711 +msgid "" +"This is your public profile.
It may " +"be visible to anybody using the internet." +msgstr "" + +#: mod/profiles.php:712 +msgid "Your Full Name:" +msgstr "" + +#: mod/profiles.php:713 +msgid "Title/Description:" +msgstr "" + +#: mod/profiles.php:716 +msgid "Street Address:" +msgstr "" + +#: mod/profiles.php:717 +msgid "Locality/City:" +msgstr "" + +#: mod/profiles.php:718 +msgid "Region/State:" +msgstr "" + +#: mod/profiles.php:719 +msgid "Postal/Zip Code:" +msgstr "" + +#: mod/profiles.php:720 +msgid "Country:" +msgstr "" + +#: mod/profiles.php:724 +msgid "Who: (if applicable)" +msgstr "" + +#: mod/profiles.php:724 +msgid "Examples: cathy123, Cathy Williams, cathy@example.com" +msgstr "" + +#: mod/profiles.php:725 +msgid "Since [date]:" +msgstr "" + +#: mod/profiles.php:727 +msgid "Tell us about yourself..." +msgstr "" + +#: mod/profiles.php:728 +msgid "Homepage URL:" +msgstr "" + +#: mod/profiles.php:731 +msgid "Religious Views:" +msgstr "" + +#: mod/profiles.php:732 +msgid "Public Keywords:" +msgstr "" + +#: mod/profiles.php:732 +msgid "(Used for suggesting potential friends, can be seen by others)" +msgstr "" + +#: mod/profiles.php:733 +msgid "Private Keywords:" +msgstr "" + +#: mod/profiles.php:733 +msgid "(Used for searching profiles, never shown to others)" +msgstr "" + +#: mod/profiles.php:736 +msgid "Musical interests" +msgstr "" + +#: mod/profiles.php:737 +msgid "Books, literature" +msgstr "" + +#: mod/profiles.php:738 +msgid "Television" +msgstr "" + +#: mod/profiles.php:739 +msgid "Film/dance/culture/entertainment" +msgstr "" + +#: mod/profiles.php:740 +msgid "Hobbies/Interests" +msgstr "" + +#: mod/profiles.php:741 +msgid "Love/romance" +msgstr "" + +#: mod/profiles.php:742 +msgid "Work/employment" +msgstr "" + +#: mod/profiles.php:743 +msgid "School/education" +msgstr "" + +#: mod/profiles.php:744 +msgid "Contact information and Social Networks" +msgstr "" + +#: mod/profiles.php:786 +msgid "Edit/Manage Profiles" +msgstr "" + #: mod/register.php:92 msgid "" "Registration successful. Please check your email for further instructions." @@ -6158,8 +7805,17 @@ msgstr "" msgid "Import your profile to this friendica instance" msgstr "" -#: mod/settings.php:36 mod/photos.php:118 -msgid "everybody" +#: mod/regmod.php:55 +msgid "Account approved." +msgstr "" + +#: mod/regmod.php:92 +#, php-format +msgid "Registration revoked for %s" +msgstr "" + +#: mod/regmod.php:104 +msgid "Please login." msgstr "" #: mod/settings.php:60 @@ -6182,10 +7838,6 @@ msgstr "" msgid "Missing some important data!" msgstr "" -#: mod/settings.php:158 mod/settings.php:689 mod/contacts.php:802 -msgid "Update" -msgstr "" - #: mod/settings.php:269 msgid "Failed to connect with email account using the settings provided." msgstr "" @@ -6278,11 +7930,6 @@ msgstr "" msgid "Connected Apps" msgstr "" -#: mod/settings.php:725 mod/content.php:746 object/Item.php:122 -#: object/Item.php:124 -msgid "Edit" -msgstr "" - #: mod/settings.php:727 msgid "Client key starts with" msgstr "" @@ -6715,14 +8362,6 @@ msgstr "" msgid "(click to open/close)" msgstr "" -#: mod/settings.php:1250 mod/photos.php:1187 mod/photos.php:1572 -msgid "Show to Groups" -msgstr "" - -#: mod/settings.php:1251 mod/photos.php:1188 mod/photos.php:1573 -msgid "Show to Contacts" -msgstr "" - #: mod/settings.php:1252 msgid "Default Private Post" msgstr "" @@ -6833,1651 +8472,24 @@ msgstr "" msgid "Resend relocate message to contacts" msgstr "" -#: mod/wallmessage.php:42 mod/wallmessage.php:112 -#, php-format -msgid "Number of daily wall messages for %s exceeded. Message failed." +#: mod/videos.php:123 +msgid "Do you really want to delete this video?" msgstr "" -#: mod/wallmessage.php:56 mod/message.php:71 -msgid "No recipient selected." +#: mod/videos.php:128 +msgid "Delete Video" msgstr "" -#: mod/wallmessage.php:59 -msgid "Unable to check your home location." +#: mod/videos.php:207 +msgid "No videos selected" msgstr "" -#: mod/wallmessage.php:62 mod/message.php:78 -msgid "Message could not be sent." +#: mod/videos.php:399 +msgid "Recent Videos" msgstr "" -#: mod/wallmessage.php:65 mod/message.php:81 -msgid "Message collection failure." -msgstr "" - -#: mod/wallmessage.php:68 mod/message.php:84 -msgid "Message sent." -msgstr "" - -#: mod/wallmessage.php:86 mod/wallmessage.php:95 -msgid "No recipient." -msgstr "" - -#: mod/wallmessage.php:142 mod/message.php:341 -msgid "Send Private Message" -msgstr "" - -#: mod/wallmessage.php:143 -#, php-format -msgid "" -"If you wish for %s to respond, please check that the privacy settings on " -"your site allow private mail from unknown senders." -msgstr "" - -#: mod/wallmessage.php:144 mod/message.php:342 mod/message.php:536 -msgid "To:" -msgstr "" - -#: mod/wallmessage.php:145 mod/message.php:347 mod/message.php:538 -msgid "Subject:" -msgstr "" - -#: mod/share.php:38 -msgid "link" -msgstr "" - -#: mod/api.php:76 mod/api.php:102 -msgid "Authorize application connection" -msgstr "" - -#: mod/api.php:77 -msgid "Return to your app and insert this Securty Code:" -msgstr "" - -#: mod/api.php:89 -msgid "Please login to continue." -msgstr "" - -#: mod/api.php:104 -msgid "" -"Do you want to authorize this application to access your posts and contacts, " -"and/or create new posts for you?" -msgstr "" - -#: mod/babel.php:17 -msgid "Source (bbcode) text:" -msgstr "" - -#: mod/babel.php:23 -msgid "Source (Diaspora) text to convert to BBcode:" -msgstr "" - -#: mod/babel.php:31 -msgid "Source input: " -msgstr "" - -#: mod/babel.php:35 -msgid "bb2html (raw HTML): " -msgstr "" - -#: mod/babel.php:39 -msgid "bb2html: " -msgstr "" - -#: mod/babel.php:43 -msgid "bb2html2bb: " -msgstr "" - -#: mod/babel.php:47 -msgid "bb2md: " -msgstr "" - -#: mod/babel.php:51 -msgid "bb2md2html: " -msgstr "" - -#: mod/babel.php:55 -msgid "bb2dia2bb: " -msgstr "" - -#: mod/babel.php:59 -msgid "bb2md2html2bb: " -msgstr "" - -#: mod/babel.php:69 -msgid "Source input (Diaspora format): " -msgstr "" - -#: mod/babel.php:74 -msgid "diaspora2bb: " -msgstr "" - -#: mod/item.php:116 -msgid "Unable to locate original post." -msgstr "" - -#: mod/item.php:334 -msgid "Empty post discarded." -msgstr "" - -#: mod/item.php:867 -msgid "System error. Post not saved." -msgstr "" - -#: mod/item.php:993 -#, php-format -msgid "" -"This message was sent to you by %s, a member of the Friendica social network." -msgstr "" - -#: mod/item.php:995 -#, php-format -msgid "You may visit them online at %s" -msgstr "" - -#: mod/item.php:996 -msgid "" -"Please contact the sender by replying to this post if you do not wish to " -"receive these messages." -msgstr "" - -#: mod/item.php:1000 -#, php-format -msgid "%s posted an update." -msgstr "" - -#: mod/ostatus_subscribe.php:14 -msgid "Subscribing to OStatus contacts" -msgstr "" - -#: mod/ostatus_subscribe.php:25 -msgid "No contact provided." -msgstr "" - -#: mod/ostatus_subscribe.php:30 -msgid "Couldn't fetch information for contact." -msgstr "" - -#: mod/ostatus_subscribe.php:38 -msgid "Couldn't fetch friends for contact." -msgstr "" - -#: mod/ostatus_subscribe.php:65 -msgid "success" -msgstr "" - -#: mod/ostatus_subscribe.php:67 -msgid "failed" -msgstr "" - -#: mod/ostatus_subscribe.php:69 mod/content.php:792 object/Item.php:245 -msgid "ignored" -msgstr "" - -#: mod/dfrn_poll.php:104 mod/dfrn_poll.php:537 -#, php-format -msgid "%1$s welcomes %2$s" -msgstr "" - -#: mod/profile.php:179 -msgid "Tips for New Members" -msgstr "" - -#: mod/message.php:75 -msgid "Unable to locate contact information." -msgstr "" - -#: mod/message.php:215 -msgid "Do you really want to delete this message?" -msgstr "" - -#: mod/message.php:235 -msgid "Message deleted." -msgstr "" - -#: mod/message.php:266 -msgid "Conversation removed." -msgstr "" - -#: mod/message.php:383 -msgid "No messages." -msgstr "" - -#: mod/message.php:426 -msgid "Message not available." -msgstr "" - -#: mod/message.php:503 -msgid "Delete message" -msgstr "" - -#: mod/message.php:529 mod/message.php:609 -msgid "Delete conversation" -msgstr "" - -#: mod/message.php:531 -msgid "" -"No secure communications available. You may be able to " -"respond from the sender's profile page." -msgstr "" - -#: mod/message.php:535 -msgid "Send Reply" -msgstr "" - -#: mod/message.php:579 -#, php-format -msgid "Unknown sender - %s" -msgstr "" - -#: mod/message.php:581 -#, php-format -msgid "You and %s" -msgstr "" - -#: mod/message.php:583 -#, php-format -msgid "%s and You" -msgstr "" - -#: mod/message.php:612 -msgid "D, d M Y - g:i A" -msgstr "" - -#: mod/message.php:615 -#, php-format -msgid "%d message" -msgid_plural "%d messages" -msgstr[0] "" -msgstr[1] "" - -#: mod/manage.php:139 -msgid "Manage Identities and/or Pages" -msgstr "" - -#: mod/manage.php:140 -msgid "" -"Toggle between different identities or community/group pages which share " -"your account details or which you have been granted \"manage\" permissions" -msgstr "" - -#: mod/manage.php:141 -msgid "Select an identity to manage: " -msgstr "" - -#: mod/contacts.php:128 -#, php-format -msgid "%d contact edited." -msgid_plural "%d contacts edited." -msgstr[0] "" -msgstr[1] "" - -#: mod/contacts.php:159 mod/contacts.php:368 -msgid "Could not access contact record." -msgstr "" - -#: mod/contacts.php:173 -msgid "Could not locate selected profile." -msgstr "" - -#: mod/contacts.php:206 -msgid "Contact updated." -msgstr "" - -#: mod/contacts.php:208 mod/dfrn_request.php:579 -msgid "Failed to update contact record." -msgstr "" - -#: mod/contacts.php:389 -msgid "Contact has been blocked" -msgstr "" - -#: mod/contacts.php:389 -msgid "Contact has been unblocked" -msgstr "" - -#: mod/contacts.php:400 -msgid "Contact has been ignored" -msgstr "" - -#: mod/contacts.php:400 -msgid "Contact has been unignored" -msgstr "" - -#: mod/contacts.php:412 -msgid "Contact has been archived" -msgstr "" - -#: mod/contacts.php:412 -msgid "Contact has been unarchived" -msgstr "" - -#: mod/contacts.php:437 -msgid "Drop contact" -msgstr "" - -#: mod/contacts.php:440 mod/contacts.php:799 -msgid "Do you really want to delete this contact?" -msgstr "" - -#: mod/contacts.php:457 -msgid "Contact has been removed." -msgstr "" - -#: mod/contacts.php:498 -#, php-format -msgid "You are mutual friends with %s" -msgstr "" - -#: mod/contacts.php:502 -#, php-format -msgid "You are sharing with %s" -msgstr "" - -#: mod/contacts.php:507 -#, php-format -msgid "%s is sharing with you" -msgstr "" - -#: mod/contacts.php:527 -msgid "Private communications are not available for this contact." -msgstr "" - -#: mod/contacts.php:534 -msgid "(Update was successful)" -msgstr "" - -#: mod/contacts.php:534 -msgid "(Update was not successful)" -msgstr "" - -#: mod/contacts.php:536 mod/contacts.php:978 -msgid "Suggest friends" -msgstr "" - -#: mod/contacts.php:540 -#, php-format -msgid "Network type: %s" -msgstr "" - -#: mod/contacts.php:553 -msgid "Communications lost with this contact!" -msgstr "" - -#: mod/contacts.php:556 -msgid "Fetch further information for feeds" -msgstr "" - -#: mod/contacts.php:557 -msgid "Fetch information" -msgstr "" - -#: mod/contacts.php:557 -msgid "Fetch information and keywords" -msgstr "" - -#: mod/contacts.php:575 -msgid "Contact" -msgstr "" - -#: mod/contacts.php:578 -msgid "Profile Visibility" -msgstr "" - -#: mod/contacts.php:579 -#, php-format -msgid "" -"Please choose the profile you would like to display to %s when viewing your " -"profile securely." -msgstr "" - -#: mod/contacts.php:580 -msgid "Contact Information / Notes" -msgstr "" - -#: mod/contacts.php:581 -msgid "Edit contact notes" -msgstr "" - -#: mod/contacts.php:587 -msgid "Block/Unblock contact" -msgstr "" - -#: mod/contacts.php:588 -msgid "Ignore contact" -msgstr "" - -#: mod/contacts.php:589 -msgid "Repair URL settings" -msgstr "" - -#: mod/contacts.php:590 -msgid "View conversations" -msgstr "" - -#: mod/contacts.php:596 -msgid "Last update:" -msgstr "" - -#: mod/contacts.php:598 -msgid "Update public posts" -msgstr "" - -#: mod/contacts.php:600 mod/contacts.php:988 -msgid "Update now" -msgstr "" - -#: mod/contacts.php:606 mod/contacts.php:804 mod/contacts.php:1005 -msgid "Unignore" -msgstr "" - -#: mod/contacts.php:606 mod/contacts.php:804 mod/contacts.php:1005 -#: mod/notifications.php:54 mod/notifications.php:142 -#: mod/notifications.php:227 -msgid "Ignore" -msgstr "" - -#: mod/contacts.php:610 -msgid "Currently blocked" -msgstr "" - -#: mod/contacts.php:611 -msgid "Currently ignored" -msgstr "" - -#: mod/contacts.php:612 -msgid "Currently archived" -msgstr "" - -#: mod/contacts.php:613 mod/notifications.php:135 mod/notifications.php:215 -msgid "Hide this contact from others" -msgstr "" - -#: mod/contacts.php:613 -msgid "" -"Replies/likes to your public posts may still be visible" -msgstr "" - -#: mod/contacts.php:614 -msgid "Notification for new posts" -msgstr "" - -#: mod/contacts.php:614 -msgid "Send a notification of every new post of this contact" -msgstr "" - -#: mod/contacts.php:617 -msgid "Blacklisted keywords" -msgstr "" - -#: mod/contacts.php:617 -msgid "" -"Comma separated list of keywords that should not be converted to hashtags, " -"when \"Fetch information and keywords\" is selected" -msgstr "" - -#: mod/contacts.php:633 -msgid "Actions" -msgstr "" - -#: mod/contacts.php:636 -msgid "Contact Settings" -msgstr "" - -#: mod/contacts.php:682 -msgid "Suggestions" -msgstr "" - -#: mod/contacts.php:685 -msgid "Suggest potential friends" -msgstr "" - -#: mod/contacts.php:693 -msgid "Show all contacts" -msgstr "" - -#: mod/contacts.php:698 -msgid "Unblocked" -msgstr "" - -#: mod/contacts.php:701 -msgid "Only show unblocked contacts" -msgstr "" - -#: mod/contacts.php:707 -msgid "Blocked" -msgstr "" - -#: mod/contacts.php:710 -msgid "Only show blocked contacts" -msgstr "" - -#: mod/contacts.php:716 -msgid "Ignored" -msgstr "" - -#: mod/contacts.php:719 -msgid "Only show ignored contacts" -msgstr "" - -#: mod/contacts.php:725 -msgid "Archived" -msgstr "" - -#: mod/contacts.php:728 -msgid "Only show archived contacts" -msgstr "" - -#: mod/contacts.php:734 -msgid "Hidden" -msgstr "" - -#: mod/contacts.php:737 -msgid "Only show hidden contacts" -msgstr "" - -#: mod/contacts.php:794 -msgid "Search your contacts" -msgstr "" - -#: mod/contacts.php:805 mod/contacts.php:1013 -msgid "Archive" -msgstr "" - -#: mod/contacts.php:805 mod/contacts.php:1013 -msgid "Unarchive" -msgstr "" - -#: mod/contacts.php:808 -msgid "Batch Actions" -msgstr "" - -#: mod/contacts.php:854 -msgid "View all contacts" -msgstr "" - -#: mod/contacts.php:864 -msgid "View all common friends" -msgstr "" - -#: mod/contacts.php:871 -msgid "Advanced Contact Settings" -msgstr "" - -#: mod/contacts.php:916 -msgid "Mutual Friendship" -msgstr "" - -#: mod/contacts.php:920 -msgid "is a fan of yours" -msgstr "" - -#: mod/contacts.php:924 -msgid "you are a fan of" -msgstr "" - -#: mod/contacts.php:999 -msgid "Toggle Blocked status" -msgstr "" - -#: mod/contacts.php:1007 -msgid "Toggle Ignored status" -msgstr "" - -#: mod/contacts.php:1015 -msgid "Toggle Archive status" -msgstr "" - -#: mod/contacts.php:1023 -msgid "Delete contact" -msgstr "" - -#: mod/crepair.php:87 -msgid "Contact settings applied." -msgstr "" - -#: mod/crepair.php:89 -msgid "Contact update failed." -msgstr "" - -#: mod/crepair.php:120 -msgid "" -"WARNING: This is highly advanced and if you enter incorrect " -"information your communications with this contact may stop working." -msgstr "" - -#: mod/crepair.php:121 -msgid "" -"Please use your browser 'Back' button now if you are " -"uncertain what to do on this page." -msgstr "" - -#: mod/crepair.php:134 mod/crepair.php:136 -msgid "No mirroring" -msgstr "" - -#: mod/crepair.php:134 -msgid "Mirror as forwarded posting" -msgstr "" - -#: mod/crepair.php:134 mod/crepair.php:136 -msgid "Mirror as my own posting" -msgstr "" - -#: mod/crepair.php:150 -msgid "Return to contact editor" -msgstr "" - -#: mod/crepair.php:152 -msgid "Refetch contact data" -msgstr "" - -#: mod/crepair.php:156 -msgid "Remote Self" -msgstr "" - -#: mod/crepair.php:159 -msgid "Mirror postings from this contact" -msgstr "" - -#: mod/crepair.php:161 -msgid "" -"Mark this contact as remote_self, this will cause friendica to repost new " -"entries from this contact." -msgstr "" - -#: mod/crepair.php:166 -msgid "Account Nickname" -msgstr "" - -#: mod/crepair.php:167 -msgid "@Tagname - overrides Name/Nickname" -msgstr "" - -#: mod/crepair.php:168 -msgid "Account URL" -msgstr "" - -#: mod/crepair.php:169 -msgid "Friend Request URL" -msgstr "" - -#: mod/crepair.php:170 -msgid "Friend Confirm URL" -msgstr "" - -#: mod/crepair.php:171 -msgid "Notification Endpoint URL" -msgstr "" - -#: mod/crepair.php:172 -msgid "Poll/Feed URL" -msgstr "" - -#: mod/crepair.php:173 -msgid "New photo from this URL" -msgstr "" - -#: mod/dfrn_confirm.php:66 mod/profiles.php:19 mod/profiles.php:134 -#: mod/profiles.php:180 mod/profiles.php:611 -msgid "Profile not found." -msgstr "" - -#: mod/dfrn_confirm.php:123 -msgid "" -"This may occasionally happen if contact was requested by both persons and it " -"has already been approved." -msgstr "" - -#: mod/dfrn_confirm.php:242 -msgid "Response from remote site was not understood." -msgstr "" - -#: mod/dfrn_confirm.php:251 mod/dfrn_confirm.php:256 -msgid "Unexpected response from remote site: " -msgstr "" - -#: mod/dfrn_confirm.php:265 -msgid "Confirmation completed successfully." -msgstr "" - -#: mod/dfrn_confirm.php:267 mod/dfrn_confirm.php:281 mod/dfrn_confirm.php:288 -msgid "Remote site reported: " -msgstr "" - -#: mod/dfrn_confirm.php:279 -msgid "Temporary failure. Please wait and try again." -msgstr "" - -#: mod/dfrn_confirm.php:286 -msgid "Introduction failed or was revoked." -msgstr "" - -#: mod/dfrn_confirm.php:415 -msgid "Unable to set contact photo." -msgstr "" - -#: mod/dfrn_confirm.php:553 -#, php-format -msgid "No user record found for '%s' " -msgstr "" - -#: mod/dfrn_confirm.php:563 -msgid "Our site encryption key is apparently messed up." -msgstr "" - -#: mod/dfrn_confirm.php:574 -msgid "Empty site URL was provided or URL could not be decrypted by us." -msgstr "" - -#: mod/dfrn_confirm.php:595 -msgid "Contact record was not found for you on our site." -msgstr "" - -#: mod/dfrn_confirm.php:609 -#, php-format -msgid "Site public key not available in contact record for URL %s." -msgstr "" - -#: mod/dfrn_confirm.php:629 -msgid "" -"The ID provided by your system is a duplicate on our system. It should work " -"if you try again." -msgstr "" - -#: mod/dfrn_confirm.php:640 -msgid "Unable to set your contact credentials on our system." -msgstr "" - -#: mod/dfrn_confirm.php:699 -msgid "Unable to update your contact profile details on our system" -msgstr "" - -#: mod/dfrn_confirm.php:771 -#, php-format -msgid "%1$s has joined %2$s" -msgstr "" - -#: mod/dfrn_request.php:100 -msgid "This introduction has already been accepted." -msgstr "" - -#: mod/dfrn_request.php:123 mod/dfrn_request.php:518 -msgid "Profile location is not valid or does not contain profile information." -msgstr "" - -#: mod/dfrn_request.php:128 mod/dfrn_request.php:523 -msgid "Warning: profile location has no identifiable owner name." -msgstr "" - -#: mod/dfrn_request.php:130 mod/dfrn_request.php:525 -msgid "Warning: profile location has no profile photo." -msgstr "" - -#: mod/dfrn_request.php:133 mod/dfrn_request.php:528 -#, 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] "" -msgstr[1] "" - -#: mod/dfrn_request.php:178 -msgid "Introduction complete." -msgstr "" - -#: mod/dfrn_request.php:220 -msgid "Unrecoverable protocol error." -msgstr "" - -#: mod/dfrn_request.php:248 -msgid "Profile unavailable." -msgstr "" - -#: mod/dfrn_request.php:273 -#, php-format -msgid "%s has received too many connection requests today." -msgstr "" - -#: mod/dfrn_request.php:274 -msgid "Spam protection measures have been invoked." -msgstr "" - -#: mod/dfrn_request.php:275 -msgid "Friends are advised to please try again in 24 hours." -msgstr "" - -#: mod/dfrn_request.php:337 -msgid "Invalid locator" -msgstr "" - -#: mod/dfrn_request.php:346 -msgid "Invalid email address." -msgstr "" - -#: mod/dfrn_request.php:373 -msgid "This account has not been configured for email. Request failed." -msgstr "" - -#: mod/dfrn_request.php:476 -msgid "You have already introduced yourself here." -msgstr "" - -#: mod/dfrn_request.php:480 -#, php-format -msgid "Apparently you are already friends with %s." -msgstr "" - -#: mod/dfrn_request.php:501 -msgid "Invalid profile URL." -msgstr "" - -#: mod/dfrn_request.php:600 -msgid "Your introduction has been sent." -msgstr "" - -#: mod/dfrn_request.php:640 -msgid "" -"Remote subscription can't be done for your network. Please subscribe " -"directly on your system." -msgstr "" - -#: mod/dfrn_request.php:663 -msgid "Please login to confirm introduction." -msgstr "" - -#: mod/dfrn_request.php:673 -msgid "" -"Incorrect identity currently logged in. Please login to this profile." -msgstr "" - -#: mod/dfrn_request.php:687 mod/dfrn_request.php:704 -msgid "Confirm" -msgstr "" - -#: mod/dfrn_request.php:699 -msgid "Hide this contact" -msgstr "" - -#: mod/dfrn_request.php:702 -#, php-format -msgid "Welcome home %s." -msgstr "" - -#: mod/dfrn_request.php:703 -#, php-format -msgid "Please confirm your introduction/connection request to %s." -msgstr "" - -#: mod/dfrn_request.php:832 -msgid "" -"Please enter your 'Identity Address' from one of the following supported " -"communications networks:" -msgstr "" - -#: mod/dfrn_request.php:853 -#, php-format -msgid "" -"If you are not yet a member of the free social web, follow this link to find a public Friendica site and join us today." -msgstr "" - -#: mod/dfrn_request.php:858 -msgid "Friend/Connection Request" -msgstr "" - -#: mod/dfrn_request.php:859 -msgid "" -"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, " -"testuser@identi.ca" -msgstr "" - -#: mod/dfrn_request.php:868 -msgid "StatusNet/Federated Social Web" -msgstr "" - -#: mod/dfrn_request.php:870 -#, php-format -msgid "" -" - please do not use this form. Instead, enter %s into your Diaspora search " -"bar." -msgstr "" - -#: mod/photos.php:101 mod/photos.php:1887 -msgid "Recent Photos" -msgstr "" - -#: mod/photos.php:104 mod/photos.php:1308 mod/photos.php:1889 -msgid "Upload New Photos" -msgstr "" - -#: mod/photos.php:182 -msgid "Contact information unavailable" -msgstr "" - -#: mod/photos.php:203 -msgid "Album not found." -msgstr "" - -#: mod/photos.php:233 mod/photos.php:245 mod/photos.php:1250 -msgid "Delete Album" -msgstr "" - -#: mod/photos.php:243 -msgid "Do you really want to delete this photo album and all its photos?" -msgstr "" - -#: mod/photos.php:323 mod/photos.php:334 mod/photos.php:1568 -msgid "Delete Photo" -msgstr "" - -#: mod/photos.php:332 -msgid "Do you really want to delete this photo?" -msgstr "" - -#: mod/photos.php:707 -#, php-format -msgid "%1$s was tagged in %2$s by %3$s" -msgstr "" - -#: mod/photos.php:707 -msgid "a photo" -msgstr "" - -#: mod/photos.php:814 -msgid "Image file is empty." -msgstr "" - -#: mod/photos.php:974 -msgid "No photos selected" -msgstr "" - -#: mod/photos.php:1135 -#, php-format -msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." -msgstr "" - -#: mod/photos.php:1170 -msgid "Upload Photos" -msgstr "" - -#: mod/photos.php:1174 mod/photos.php:1245 -msgid "New album name: " -msgstr "" - -#: mod/photos.php:1175 -msgid "or existing album name: " -msgstr "" - -#: mod/photos.php:1176 -msgid "Do not show a status post for this upload" -msgstr "" - -#: mod/photos.php:1189 -msgid "Private Photo" -msgstr "" - -#: mod/photos.php:1190 -msgid "Public Photo" -msgstr "" - -#: mod/photos.php:1258 -msgid "Edit Album" -msgstr "" - -#: mod/photos.php:1264 -msgid "Show Newest First" -msgstr "" - -#: mod/photos.php:1266 -msgid "Show Oldest First" -msgstr "" - -#: mod/photos.php:1294 mod/photos.php:1872 -msgid "View Photo" -msgstr "" - -#: mod/photos.php:1341 -msgid "Permission denied. Access to this item may be restricted." -msgstr "" - -#: mod/photos.php:1343 -msgid "Photo not available" -msgstr "" - -#: mod/photos.php:1399 -msgid "View photo" -msgstr "" - -#: mod/photos.php:1399 -msgid "Edit photo" -msgstr "" - -#: mod/photos.php:1400 -msgid "Use as profile photo" -msgstr "" - -#: mod/photos.php:1406 mod/content.php:638 object/Item.php:117 -msgid "Private Message" -msgstr "" - -#: mod/photos.php:1425 -msgid "View Full Size" -msgstr "" - -#: mod/photos.php:1511 -msgid "Tags: " -msgstr "" - -#: mod/photos.php:1514 -msgid "[Remove any tag]" -msgstr "" - -#: mod/photos.php:1554 -msgid "New album name" -msgstr "" - -#: mod/photos.php:1555 -msgid "Caption" -msgstr "" - -#: mod/photos.php:1556 -msgid "Add a Tag" -msgstr "" - -#: mod/photos.php:1556 -msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" -msgstr "" - -#: mod/photos.php:1557 -msgid "Do not rotate" -msgstr "" - -#: mod/photos.php:1558 -msgid "Rotate CW (right)" -msgstr "" - -#: mod/photos.php:1559 -msgid "Rotate CCW (left)" -msgstr "" - -#: mod/photos.php:1574 -msgid "Private photo" -msgstr "" - -#: mod/photos.php:1575 -msgid "Public photo" -msgstr "" - -#: mod/photos.php:1595 mod/content.php:702 object/Item.php:263 -msgid "I like this (toggle)" -msgstr "" - -#: mod/photos.php:1596 mod/content.php:703 object/Item.php:264 -msgid "I don't like this (toggle)" -msgstr "" - -#: mod/photos.php:1615 mod/photos.php:1663 mod/photos.php:1751 -#: mod/content.php:725 object/Item.php:717 -msgid "This is you" -msgstr "" - -#: mod/photos.php:1617 mod/photos.php:1665 mod/photos.php:1753 -#: mod/content.php:727 mod/content.php:945 object/Item.php:403 -#: object/Item.php:719 boot.php:888 -msgid "Comment" -msgstr "" - -#: mod/photos.php:1801 -msgid "Map" -msgstr "" - -#: mod/profiles.php:38 -msgid "Profile deleted." -msgstr "" - -#: mod/profiles.php:56 mod/profiles.php:90 -msgid "Profile-" -msgstr "" - -#: mod/profiles.php:75 mod/profiles.php:118 -msgid "New profile created." -msgstr "" - -#: mod/profiles.php:96 -msgid "Profile unavailable to clone." -msgstr "" - -#: mod/profiles.php:190 -msgid "Profile Name is required." -msgstr "" - -#: mod/profiles.php:337 -msgid "Marital Status" -msgstr "" - -#: mod/profiles.php:341 -msgid "Romantic Partner" -msgstr "" - -#: mod/profiles.php:353 -msgid "Work/Employment" -msgstr "" - -#: mod/profiles.php:356 -msgid "Religion" -msgstr "" - -#: mod/profiles.php:360 -msgid "Political Views" -msgstr "" - -#: mod/profiles.php:364 -msgid "Gender" -msgstr "" - -#: mod/profiles.php:368 -msgid "Sexual Preference" -msgstr "" - -#: mod/profiles.php:372 -msgid "Homepage" -msgstr "" - -#: mod/profiles.php:376 mod/profiles.php:696 -msgid "Interests" -msgstr "" - -#: mod/profiles.php:380 -msgid "Address" -msgstr "" - -#: mod/profiles.php:387 mod/profiles.php:692 -msgid "Location" -msgstr "" - -#: mod/profiles.php:470 -msgid "Profile updated." -msgstr "" - -#: mod/profiles.php:557 -msgid " and " -msgstr "" - -#: mod/profiles.php:565 -msgid "public profile" -msgstr "" - -#: mod/profiles.php:568 -#, php-format -msgid "%1$s changed %2$s to “%3$s”" -msgstr "" - -#: mod/profiles.php:569 -#, php-format -msgid " - Visit %1$s's %2$s" -msgstr "" - -#: mod/profiles.php:572 -#, php-format -msgid "%1$s has an updated %2$s, changing %3$s." -msgstr "" - -#: mod/profiles.php:639 -msgid "Hide contacts and friends:" -msgstr "" - -#: mod/profiles.php:644 -msgid "Hide your contact/friend list from viewers of this profile?" -msgstr "" - -#: mod/profiles.php:668 -msgid "Show more profile fields:" -msgstr "" - -#: mod/profiles.php:680 -msgid "Profile Actions" -msgstr "" - -#: mod/profiles.php:681 -msgid "Edit Profile Details" -msgstr "" - -#: mod/profiles.php:683 -msgid "Change Profile Photo" -msgstr "" - -#: mod/profiles.php:684 -msgid "View this profile" -msgstr "" - -#: mod/profiles.php:686 -msgid "Create a new profile using these settings" -msgstr "" - -#: mod/profiles.php:687 -msgid "Clone this profile" -msgstr "" - -#: mod/profiles.php:688 -msgid "Delete this profile" -msgstr "" - -#: mod/profiles.php:690 -msgid "Basic information" -msgstr "" - -#: mod/profiles.php:691 -msgid "Profile picture" -msgstr "" - -#: mod/profiles.php:693 -msgid "Preferences" -msgstr "" - -#: mod/profiles.php:694 -msgid "Status information" -msgstr "" - -#: mod/profiles.php:695 -msgid "Additional information" -msgstr "" - -#: mod/profiles.php:698 -msgid "Relation" -msgstr "" - -#: mod/profiles.php:702 -msgid "Your Gender:" -msgstr "" - -#: mod/profiles.php:703 -msgid "♥ Marital Status:" -msgstr "" - -#: mod/profiles.php:705 -msgid "Example: fishing photography software" -msgstr "" - -#: mod/profiles.php:710 -msgid "Profile Name:" -msgstr "" - -#: mod/profiles.php:712 -msgid "" -"This is your public profile.
It may " -"be visible to anybody using the internet." -msgstr "" - -#: mod/profiles.php:713 -msgid "Your Full Name:" -msgstr "" - -#: mod/profiles.php:714 -msgid "Title/Description:" -msgstr "" - -#: mod/profiles.php:717 -msgid "Street Address:" -msgstr "" - -#: mod/profiles.php:718 -msgid "Locality/City:" -msgstr "" - -#: mod/profiles.php:719 -msgid "Region/State:" -msgstr "" - -#: mod/profiles.php:720 -msgid "Postal/Zip Code:" -msgstr "" - -#: mod/profiles.php:721 -msgid "Country:" -msgstr "" - -#: mod/profiles.php:725 -msgid "Who: (if applicable)" -msgstr "" - -#: mod/profiles.php:725 -msgid "Examples: cathy123, Cathy Williams, cathy@example.com" -msgstr "" - -#: mod/profiles.php:726 -msgid "Since [date]:" -msgstr "" - -#: mod/profiles.php:728 -msgid "Tell us about yourself..." -msgstr "" - -#: mod/profiles.php:729 -msgid "Homepage URL:" -msgstr "" - -#: mod/profiles.php:732 -msgid "Religious Views:" -msgstr "" - -#: mod/profiles.php:733 -msgid "Public Keywords:" -msgstr "" - -#: mod/profiles.php:733 -msgid "(Used for suggesting potential friends, can be seen by others)" -msgstr "" - -#: mod/profiles.php:734 -msgid "Private Keywords:" -msgstr "" - -#: mod/profiles.php:734 -msgid "(Used for searching profiles, never shown to others)" -msgstr "" - -#: mod/profiles.php:737 -msgid "Musical interests" -msgstr "" - -#: mod/profiles.php:738 -msgid "Books, literature" -msgstr "" - -#: mod/profiles.php:739 -msgid "Television" -msgstr "" - -#: mod/profiles.php:740 -msgid "Film/dance/culture/entertainment" -msgstr "" - -#: mod/profiles.php:741 -msgid "Hobbies/Interests" -msgstr "" - -#: mod/profiles.php:742 -msgid "Love/romance" -msgstr "" - -#: mod/profiles.php:743 -msgid "Work/employment" -msgstr "" - -#: mod/profiles.php:744 -msgid "School/education" -msgstr "" - -#: mod/profiles.php:745 -msgid "Contact information and Social Networks" -msgstr "" - -#: mod/profiles.php:787 -msgid "Edit/Manage Profiles" -msgstr "" - -#: mod/content.php:325 object/Item.php:95 -msgid "This entry was edited" -msgstr "" - -#: mod/content.php:621 object/Item.php:429 -#, php-format -msgid "%d comment" -msgid_plural "%d comments" -msgstr[0] "" -msgstr[1] "" - -#: mod/content.php:702 object/Item.php:263 -msgid "like" -msgstr "" - -#: mod/content.php:703 object/Item.php:264 -msgid "dislike" -msgstr "" - -#: mod/content.php:705 object/Item.php:266 -msgid "Share this" -msgstr "" - -#: mod/content.php:705 object/Item.php:266 -msgid "share" -msgstr "" - -#: mod/content.php:729 object/Item.php:721 -msgid "Bold" -msgstr "" - -#: mod/content.php:730 object/Item.php:722 -msgid "Italic" -msgstr "" - -#: mod/content.php:731 object/Item.php:723 -msgid "Underline" -msgstr "" - -#: mod/content.php:732 object/Item.php:724 -msgid "Quote" -msgstr "" - -#: mod/content.php:733 object/Item.php:725 -msgid "Code" -msgstr "" - -#: mod/content.php:734 object/Item.php:726 -msgid "Image" -msgstr "" - -#: mod/content.php:735 object/Item.php:727 -msgid "Link" -msgstr "" - -#: mod/content.php:736 object/Item.php:728 -msgid "Video" -msgstr "" - -#: mod/content.php:771 object/Item.php:227 -msgid "add star" -msgstr "" - -#: mod/content.php:772 object/Item.php:228 -msgid "remove star" -msgstr "" - -#: mod/content.php:773 object/Item.php:229 -msgid "toggle star status" -msgstr "" - -#: mod/content.php:776 object/Item.php:232 -msgid "starred" -msgstr "" - -#: mod/content.php:777 mod/content.php:798 object/Item.php:252 -msgid "add tag" -msgstr "" - -#: mod/content.php:787 object/Item.php:240 -msgid "ignore thread" -msgstr "" - -#: mod/content.php:788 object/Item.php:241 -msgid "unignore thread" -msgstr "" - -#: mod/content.php:789 object/Item.php:242 -msgid "toggle ignore status" -msgstr "" - -#: mod/content.php:803 object/Item.php:137 -msgid "save to folder" -msgstr "" - -#: mod/content.php:848 object/Item.php:201 -msgid "I will attend" -msgstr "" - -#: mod/content.php:848 object/Item.php:201 -msgid "I will not attend" -msgstr "" - -#: mod/content.php:848 object/Item.php:201 -msgid "I might attend" -msgstr "" - -#: mod/content.php:912 object/Item.php:369 -msgid "to" -msgstr "" - -#: mod/content.php:913 object/Item.php:371 -msgid "Wall-to-Wall" -msgstr "" - -#: mod/content.php:914 object/Item.php:372 -msgid "via Wall-To-Wall:" -msgstr "" - -#: mod/notifications.php:29 -msgid "Invalid request identifier." -msgstr "" - -#: mod/notifications.php:38 mod/notifications.php:143 -#: mod/notifications.php:228 -msgid "Discard" -msgstr "" - -#: mod/notifications.php:91 -msgid "Show Ignored Requests" -msgstr "" - -#: mod/notifications.php:91 -msgid "Hide Ignored Requests" -msgstr "" - -#: mod/notifications.php:127 mod/notifications.php:198 -msgid "Notification type: " -msgstr "" - -#: mod/notifications.php:128 -msgid "Friend Suggestion" -msgstr "" - -#: mod/notifications.php:130 -#, php-format -msgid "suggested by %s" -msgstr "" - -#: mod/notifications.php:136 mod/notifications.php:216 -msgid "Post a new friend activity" -msgstr "" - -#: mod/notifications.php:136 mod/notifications.php:216 -msgid "if applicable" -msgstr "" - -#: mod/notifications.php:159 -msgid "Claims to be known to you: " -msgstr "" - -#: mod/notifications.php:160 -msgid "yes" -msgstr "" - -#: mod/notifications.php:160 -msgid "no" -msgstr "" - -#: mod/notifications.php:161 -msgid "" -"Shall your connection be bidirectional or not? \"Friend\" implies that you " -"allow to read and you subscribe to their posts. \"Fan/Admirer\" means that " -"you allow to read but you do not want to read theirs. Approve as: " -msgstr "" - -#: mod/notifications.php:164 -msgid "" -"Shall your connection be bidirectional or not? \"Friend\" implies that you " -"allow to read and you subscribe to their posts. \"Sharer\" means that you " -"allow to read but you do not want to read theirs. Approve as: " -msgstr "" - -#: mod/notifications.php:172 -msgid "Friend" -msgstr "" - -#: mod/notifications.php:173 -msgid "Sharer" -msgstr "" - -#: mod/notifications.php:173 -msgid "Fan/Admirer" -msgstr "" - -#: mod/notifications.php:199 -msgid "Friend/Connect Request" -msgstr "" - -#: mod/notifications.php:199 -msgid "New Follower" -msgstr "" - -#: mod/notifications.php:234 -msgid "No introductions." -msgstr "" - -#: mod/notifications.php:238 -msgid "Network Notifications" -msgstr "" - -#: mod/notifications.php:265 mod/notifications.php:382 -#: mod/notifications.php:461 -#, php-format -msgid "%s liked %s's post" -msgstr "" - -#: mod/notifications.php:275 mod/notifications.php:392 -#: mod/notifications.php:471 -#, php-format -msgid "%s disliked %s's post" -msgstr "" - -#: mod/notifications.php:290 mod/notifications.php:407 -#: mod/notifications.php:486 -#, php-format -msgid "%s is now friends with %s" -msgstr "" - -#: mod/notifications.php:297 mod/notifications.php:414 -#, php-format -msgid "%s created a new post" -msgstr "" - -#: mod/notifications.php:298 mod/notifications.php:415 -#: mod/notifications.php:496 -#, php-format -msgid "%s commented on %s's post" -msgstr "" - -#: mod/notifications.php:313 -msgid "No more network notifications." -msgstr "" - -#: mod/notifications.php:343 -msgid "Personal Notifications" -msgstr "" - -#: mod/notifications.php:430 -msgid "No more personal notifications." -msgstr "" - -#: mod/notifications.php:435 -msgid "Home Notifications" -msgstr "" - -#: mod/notifications.php:503 -msgid "No more home notifications." -msgstr "" - -#: mod/notifications.php:527 -msgid "System" +#: mod/videos.php:401 +msgid "Upload New Videos" msgstr "" #: object/Item.php:370 @@ -8743,51 +8755,51 @@ msgstr "" msgid "toggle mobile" msgstr "" -#: boot.php:887 +#: boot.php:898 msgid "Delete this item?" msgstr "" -#: boot.php:890 +#: boot.php:901 msgid "show fewer" msgstr "" -#: boot.php:1483 +#: boot.php:1515 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: boot.php:1595 +#: boot.php:1627 msgid "Create a New Account" msgstr "" -#: boot.php:1624 +#: boot.php:1656 msgid "Password: " msgstr "" -#: boot.php:1625 +#: boot.php:1657 msgid "Remember me" msgstr "" -#: boot.php:1628 +#: boot.php:1660 msgid "Or login using OpenID: " msgstr "" -#: boot.php:1634 +#: boot.php:1666 msgid "Forgot your password?" msgstr "" -#: boot.php:1637 +#: boot.php:1669 msgid "Website Terms of Service" msgstr "" -#: boot.php:1638 +#: boot.php:1670 msgid "terms of service" msgstr "" -#: boot.php:1640 +#: boot.php:1672 msgid "Website Privacy Policy" msgstr "" -#: boot.php:1641 +#: boot.php:1673 msgid "privacy policy" msgstr "" From e34e1f7c2b6cc9a9c3b14c6d658c012bd569c50f Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Thu, 4 Aug 2016 11:36:31 +0200 Subject: [PATCH 029/352] frio: add intro action buttons for mobile devices --- view/theme/frio/css/style.css | 19 ++++++++++ view/theme/frio/templates/intros.tpl | 54 ++++++++++++++++++++-------- 2 files changed, 59 insertions(+), 14 deletions(-) diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index 3596c5aa0b..773a2f305c 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -2200,11 +2200,30 @@ ul li:hover .intro-wrapper button.intro-action-link { ul li:hover .intro-wrapper button.intro-action-link:hover { opacity: 1; } +.intro-action-buttons { + margin-top: 15px; + /*display: none;*/ + max-height: 0px; + overflow: hidden; + transition: max-height 0.1s ease-out; +} +ul.notif-network-list > li:hover .intro-action-buttons { + /*display: block;*/ + max-height: 30px; + transition: max-height 0.1s ease-in; +} .intro-desc-label, .intro-url-label, .intro-network-label, .intro-location-label, .intro-gender-label, .intro-keywords-label, .intro-about-label, .intro-knowyou-label { font-weight: bold; } +.intro-contact-info.xs .intro-url-label, .intro-contact-info.xs .intro-network-label, +.intro-contact-info.xs .intro-location-label, .intro-contact-info.xs .intro-gender-label, +.intro-contact-info.xs .intro-keywords-label, .intro-contact-info.xs .intro-about-label, +.intro-contact-info.xs .intro-knowyou-label { + display: block; + margin-top: 5px +} /* * Overwriting for transparency and other colors */ diff --git a/view/theme/frio/templates/intros.tpl b/view/theme/frio/templates/intros.tpl index 86c7fc342c..8fd7ee6090 100644 --- a/view/theme/frio/templates/intros.tpl +++ b/view/theme/frio/templates/intros.tpl @@ -8,26 +8,40 @@
{{* The intro actions like approve, ignore, discard intro*}} -
+ + {{* On mobile touch devices we use buttons for approve, ingnore && discard to have a better UX *}} + {{if $APP->is_mobile}} +
+
+ +   +
+ +
+
+ {{/if}}
From 8ad345c43431d222a61f4e6217cc7dbbd4fd6bd4 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Thu, 4 Aug 2016 11:46:57 +0200 Subject: [PATCH 030/352] notifications - remove TAB (clean up) --- include/NotificationsManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/NotificationsManager.php b/include/NotificationsManager.php index fef48d5d43..87c72536c4 100644 --- a/include/NotificationsManager.php +++ b/include/NotificationsManager.php @@ -430,7 +430,7 @@ class NotificationsManager { return 0; } - /** + /** * @brief Get system notifications * * @param int|string $seen From c46a7ddd4a3b5d8eb219161f6e047016278f2ad1 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Thu, 4 Aug 2016 12:12:52 +0200 Subject: [PATCH 031/352] DE translations THX Andreas --- view/de/messages.po | 8246 ++++++++++++++++++++++--------------------- view/de/strings.php | 1650 ++++----- 2 files changed, 4955 insertions(+), 4941 deletions(-) diff --git a/view/de/messages.po b/view/de/messages.po index c541ce9089..6901a06c31 100644 --- a/view/de/messages.po +++ b/view/de/messages.po @@ -35,9 +35,9 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-01 07:44+0200\n" -"PO-Revision-Date: 2016-08-02 10:25+0000\n" -"Last-Translator: Tobias Diekershoff \n" +"POT-Creation-Date: 2016-08-04 09:06+0200\n" +"PO-Revision-Date: 2016-08-04 09:25+0000\n" +"Last-Translator: Andreas H.\n" "Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -45,7 +45,7 @@ msgstr "" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: include/datetime.php:57 include/datetime.php:59 mod/profiles.php:699 +#: include/datetime.php:57 include/datetime.php:59 mod/profiles.php:698 msgid "Miscellaneous" msgstr "Verschiedenes" @@ -53,7 +53,7 @@ msgstr "Verschiedenes" msgid "Birthday:" msgstr "Geburtstag:" -#: include/datetime.php:185 mod/profiles.php:722 +#: include/datetime.php:185 mod/profiles.php:721 msgid "Age: " msgstr "Alter: " @@ -77,8 +77,8 @@ msgstr "Jahr" msgid "years" msgstr "Jahre" -#: include/datetime.php:358 include/event.php:480 mod/events.php:389 -#: mod/cal.php:287 +#: include/datetime.php:358 include/event.php:480 mod/cal.php:287 +#: mod/events.php:389 msgid "month" msgstr "Monat" @@ -86,8 +86,8 @@ msgstr "Monat" msgid "months" msgstr "Monate" -#: include/datetime.php:359 include/event.php:481 mod/events.php:390 -#: mod/cal.php:288 +#: include/datetime.php:359 include/event.php:481 mod/cal.php:288 +#: mod/events.php:390 msgid "week" msgstr "Woche" @@ -95,8 +95,8 @@ msgstr "Woche" msgid "weeks" msgstr "Wochen" -#: include/datetime.php:360 include/event.php:482 mod/events.php:391 -#: mod/cal.php:289 +#: include/datetime.php:360 include/event.php:482 mod/cal.php:289 +#: mod/events.php:391 msgid "day" msgstr "Tag" @@ -155,8 +155,8 @@ msgstr "Adresse oder Web-Link eingeben" msgid "Example: bob@example.com, http://example.com/barbara" msgstr "Beispiel: bob@example.com, http://example.com/barbara" -#: include/contact_widgets.php:10 include/identity.php:212 mod/dirfind.php:201 -#: mod/match.php:87 mod/allfriends.php:82 mod/suggest.php:101 +#: include/contact_widgets.php:10 include/identity.php:212 mod/match.php:87 +#: mod/allfriends.php:82 mod/suggest.php:101 mod/dirfind.php:201 msgid "Connect" msgstr "Verbinden" @@ -176,9 +176,9 @@ msgid "Enter name or interest" msgstr "Name oder Interessen eingeben" #: include/contact_widgets.php:32 include/conversation.php:978 -#: include/Contact.php:324 mod/dirfind.php:204 mod/match.php:72 -#: mod/allfriends.php:66 mod/follow.php:103 mod/suggest.php:83 -#: mod/contacts.php:602 +#: include/Contact.php:324 mod/match.php:72 mod/allfriends.php:66 +#: mod/follow.php:103 mod/suggest.php:83 mod/contacts.php:602 +#: mod/dirfind.php:204 msgid "Connect/Follow" msgstr "Verbinden/Folgen" @@ -238,7 +238,7 @@ msgstr[1] "%d gemeinsame Kontakte" #: include/contact_widgets.php:242 include/ForumManager.php:119 #: include/items.php:2122 mod/content.php:624 object/Item.php:432 -#: view/theme/vier/theme.php:260 boot.php:889 +#: view/theme/vier/theme.php:260 boot.php:900 msgid "show more" msgstr "mehr anzeigen" @@ -539,7 +539,7 @@ 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/ForumManager.php:114 include/text.php:998 include/nav.php:130 +#: include/ForumManager.php:114 include/nav.php:130 include/text.php:1007 #: view/theme/vier/theme.php:255 msgid "Forums" msgstr "Foren" @@ -548,47 +548,6 @@ msgstr "Foren" msgid "External link to forum" msgstr "Externer Link zum Forum" -#: include/dfrn.php:1110 -#, php-format -msgid "%s\\'s birthday" -msgstr "%ss Geburtstag" - -#: include/uimport.php:94 -msgid "Error decoding account file" -msgstr "Fehler beim Verarbeiten der Account Datei" - -#: include/uimport.php:100 -msgid "Error! No version data in file! This is not a Friendica account file?" -msgstr "Fehler! Keine Versionsdaten in der Datei! Ist das wirklich eine Friendica Account Datei?" - -#: include/uimport.php:116 include/uimport.php:127 -msgid "Error! Cannot check nickname" -msgstr "Fehler! Konnte den Nickname nicht überprüfen." - -#: include/uimport.php:120 include/uimport.php:131 -#, php-format -msgid "User '%s' already exists on this server!" -msgstr "Nutzer '%s' existiert bereits auf diesem Server!" - -#: include/uimport.php:153 -msgid "User creation error" -msgstr "Fehler beim Anlegen des Nutzeraccounts aufgetreten" - -#: include/uimport.php:173 -msgid "User profile creation error" -msgstr "Fehler beim Anlegen des Nutzerkontos" - -#: include/uimport.php:222 -#, php-format -msgid "%d contact not imported" -msgid_plural "%d contacts not imported" -msgstr[0] "%d Kontakt nicht importiert" -msgstr[1] "%d Kontakte nicht importiert" - -#: include/uimport.php:292 -msgid "Done. You can now login with your username and password" -msgstr "Erledigt. Du kannst Dich jetzt mit Deinem Nutzernamen und Passwort anmelden" - #: include/dba.php:56 include/dba_pdo.php:72 #, php-format msgid "Cannot locate DNS info for database server '%s'" @@ -606,9 +565,9 @@ msgstr "Beginnt:" msgid "Finishes:" msgstr "Endet:" -#: include/event.php:39 include/event.php:63 include/identity.php:329 -#: include/bb2diaspora.php:170 mod/events.php:495 mod/directory.php:145 -#: mod/contacts.php:628 mod/notifications.php:208 +#: include/event.php:39 include/event.php:63 include/bb2diaspora.php:170 +#: include/identity.php:329 mod/directory.php:145 mod/notifications.php:208 +#: mod/contacts.php:628 mod/events.php:495 msgid "Location:" msgstr "Ort:" @@ -640,31 +599,31 @@ msgstr "Fr" msgid "Sat" msgstr "Sa" -#: include/event.php:448 include/text.php:1103 mod/settings.php:955 +#: include/event.php:448 include/text.php:1112 mod/settings.php:955 msgid "Sunday" msgstr "Sonntag" -#: include/event.php:449 include/text.php:1103 mod/settings.php:955 +#: include/event.php:449 include/text.php:1112 mod/settings.php:955 msgid "Monday" msgstr "Montag" -#: include/event.php:450 include/text.php:1103 +#: include/event.php:450 include/text.php:1112 msgid "Tuesday" msgstr "Dienstag" -#: include/event.php:451 include/text.php:1103 +#: include/event.php:451 include/text.php:1112 msgid "Wednesday" msgstr "Mittwoch" -#: include/event.php:452 include/text.php:1103 +#: include/event.php:452 include/text.php:1112 msgid "Thursday" msgstr "Donnerstag" -#: include/event.php:453 include/text.php:1103 +#: include/event.php:453 include/text.php:1112 msgid "Friday" msgstr "Freitag" -#: include/event.php:454 include/text.php:1103 +#: include/event.php:454 include/text.php:1112 msgid "Saturday" msgstr "Samstag" @@ -684,7 +643,7 @@ msgstr "März" msgid "Apr" msgstr "Apr" -#: include/event.php:459 include/event.php:471 include/text.php:1107 +#: include/event.php:459 include/event.php:471 include/text.php:1116 msgid "May" msgstr "Mai" @@ -716,51 +675,51 @@ msgstr "Nov" msgid "Dec" msgstr "Dez" -#: include/event.php:467 include/text.php:1107 +#: include/event.php:467 include/text.php:1116 msgid "January" msgstr "Januar" -#: include/event.php:468 include/text.php:1107 +#: include/event.php:468 include/text.php:1116 msgid "February" msgstr "Februar" -#: include/event.php:469 include/text.php:1107 +#: include/event.php:469 include/text.php:1116 msgid "March" msgstr "März" -#: include/event.php:470 include/text.php:1107 +#: include/event.php:470 include/text.php:1116 msgid "April" msgstr "April" -#: include/event.php:472 include/text.php:1107 +#: include/event.php:472 include/text.php:1116 msgid "June" msgstr "Juni" -#: include/event.php:473 include/text.php:1107 +#: include/event.php:473 include/text.php:1116 msgid "July" msgstr "Juli" -#: include/event.php:474 include/text.php:1107 +#: include/event.php:474 include/text.php:1116 msgid "August" msgstr "August" -#: include/event.php:475 include/text.php:1107 +#: include/event.php:475 include/text.php:1116 msgid "September" msgstr "September" -#: include/event.php:476 include/text.php:1107 +#: include/event.php:476 include/text.php:1116 msgid "October" msgstr "Oktober" -#: include/event.php:477 include/text.php:1107 +#: include/event.php:477 include/text.php:1116 msgid "November" msgstr "November" -#: include/event.php:478 include/text.php:1107 +#: include/event.php:478 include/text.php:1116 msgid "December" msgstr "Dezember" -#: include/event.php:479 mod/events.php:388 mod/cal.php:286 +#: include/event.php:479 mod/cal.php:286 mod/events.php:388 msgid "today" msgstr "Heute" @@ -772,7 +731,7 @@ msgstr "l, F j" msgid "Edit event" msgstr "Veranstaltung bearbeiten" -#: include/event.php:608 include/text.php:1509 include/text.php:1516 +#: include/event.php:608 include/text.php:1518 include/text.php:1525 msgid "link to source" msgstr "Link zum Originalbeitrag" @@ -1040,640 +999,6 @@ msgstr "Ist mir nicht wichtig" msgid "Ask me" msgstr "Frag mich" -#: include/items.php:1447 mod/dfrn_confirm.php:726 mod/dfrn_request.php:745 -msgid "[Name Withheld]" -msgstr "[Name unterdrückt]" - -#: include/items.php:1805 mod/viewsrc.php:15 mod/admin.php:234 -#: mod/admin.php:1445 mod/admin.php:1679 mod/display.php:104 -#: mod/display.php:279 mod/display.php:478 mod/notice.php:15 -msgid "Item not found." -msgstr "Beitrag nicht gefunden." - -#: include/items.php:1844 -msgid "Do you really want to delete this item?" -msgstr "Möchtest Du wirklich dieses Item löschen?" - -#: include/items.php:1846 mod/follow.php:110 mod/suggest.php:29 -#: mod/register.php:238 mod/settings.php:1113 mod/settings.php:1119 -#: mod/settings.php:1127 mod/settings.php:1131 mod/settings.php:1136 -#: mod/settings.php:1142 mod/settings.php:1148 mod/settings.php:1154 -#: mod/settings.php:1180 mod/settings.php:1181 mod/settings.php:1182 -#: mod/settings.php:1183 mod/settings.php:1184 mod/api.php:105 -#: mod/message.php:217 mod/contacts.php:442 mod/dfrn_request.php:861 -#: mod/profiles.php:642 mod/profiles.php:645 mod/profiles.php:671 -msgid "Yes" -msgstr "Ja" - -#: include/items.php:1849 include/conversation.php:1274 mod/fbrowser.php:101 -#: mod/fbrowser.php:136 mod/tagrm.php:11 mod/tagrm.php:94 mod/videos.php:131 -#: mod/follow.php:121 mod/suggest.php:32 mod/editpost.php:148 -#: mod/settings.php:664 mod/settings.php:690 mod/message.php:220 -#: mod/contacts.php:445 mod/dfrn_request.php:875 mod/photos.php:248 -#: mod/photos.php:337 -msgid "Cancel" -msgstr "Abbrechen" - -#: include/items.php:2011 mod/regmod.php:110 mod/dirfind.php:11 -#: mod/wall_upload.php:77 mod/wall_upload.php:80 mod/fsuggest.php:78 -#: mod/notes.php:22 mod/events.php:190 mod/uimport.php:23 mod/nogroup.php:25 -#: mod/invite.php:15 mod/invite.php:101 mod/viewcontacts.php:45 -#: mod/wall_attach.php:67 mod/wall_attach.php:70 mod/allfriends.php:12 -#: mod/cal.php:308 mod/repair_ostatus.php:9 mod/delegate.php:12 -#: mod/poke.php:150 mod/attach.php:33 mod/follow.php:11 mod/follow.php:73 -#: mod/follow.php:155 mod/suggest.php:58 mod/display.php:474 mod/common.php:18 -#: mod/mood.php:114 mod/editpost.php:10 mod/network.php:4 mod/group.php:19 -#: mod/profile_photo.php:19 mod/profile_photo.php:175 -#: mod/profile_photo.php:186 mod/profile_photo.php:199 mod/register.php:42 -#: mod/settings.php:22 mod/settings.php:128 mod/settings.php:650 -#: mod/wallmessage.php:9 mod/wallmessage.php:33 mod/wallmessage.php:79 -#: mod/wallmessage.php:103 mod/api.php:26 mod/api.php:31 mod/item.php:185 -#: mod/item.php:197 mod/ostatus_subscribe.php:9 mod/message.php:46 -#: mod/message.php:182 mod/manage.php:96 mod/contacts.php:350 -#: mod/crepair.php:100 mod/dfrn_confirm.php:57 mod/photos.php:172 -#: mod/photos.php:1093 mod/profiles.php:166 mod/profiles.php:599 -#: mod/notifications.php:65 index.php:397 -msgid "Permission denied." -msgstr "Zugriff verweigert." - -#: include/items.php:2116 -msgid "Archives" -msgstr "Archiv" - -#: include/text.php:304 -msgid "newer" -msgstr "neuer" - -#: include/text.php:306 -msgid "older" -msgstr "älter" - -#: include/text.php:311 -msgid "prev" -msgstr "vorige" - -#: include/text.php:313 -msgid "first" -msgstr "erste" - -#: include/text.php:345 -msgid "last" -msgstr "letzte" - -#: include/text.php:348 -msgid "next" -msgstr "nächste" - -#: include/text.php:403 -msgid "Loading more entries..." -msgstr "lade weitere Einträge..." - -#: include/text.php:404 -msgid "The end" -msgstr "Das Ende" - -#: include/text.php:871 -msgid "No contacts" -msgstr "Keine Kontakte" - -#: include/text.php:886 -#, php-format -msgid "%d Contact" -msgid_plural "%d Contacts" -msgstr[0] "%d Kontakt" -msgstr[1] "%d Kontakte" - -#: include/text.php:898 -msgid "View Contacts" -msgstr "Kontakte anzeigen" - -#: include/text.php:985 include/nav.php:122 mod/search.php:149 -msgid "Search" -msgstr "Suche" - -#: include/text.php:986 mod/notes.php:61 mod/filer.php:31 mod/editpost.php:109 -msgid "Save" -msgstr "Speichern" - -#: include/text.php:988 include/nav.php:40 -msgid "@name, !forum, #tags, content" -msgstr "@name, !forum, #tags, content" - -#: include/text.php:993 include/nav.php:125 -msgid "Full Text" -msgstr "Volltext" - -#: include/text.php:994 include/nav.php:126 -msgid "Tags" -msgstr "Tags" - -#: include/text.php:995 include/identity.php:781 include/identity.php:784 -#: include/nav.php:127 include/nav.php:193 mod/viewcontacts.php:116 -#: mod/contacts.php:790 mod/contacts.php:851 view/theme/frio/theme.php:257 -#: view/theme/diabook/theme.php:125 -msgid "Contacts" -msgstr "Kontakte" - -#: include/text.php:1049 -msgid "poke" -msgstr "anstupsen" - -#: include/text.php:1049 -msgid "poked" -msgstr "stupste" - -#: include/text.php:1050 -msgid "ping" -msgstr "anpingen" - -#: include/text.php:1050 -msgid "pinged" -msgstr "pingte" - -#: include/text.php:1051 -msgid "prod" -msgstr "knuffen" - -#: include/text.php:1051 -msgid "prodded" -msgstr "knuffte" - -#: include/text.php:1052 -msgid "slap" -msgstr "ohrfeigen" - -#: include/text.php:1052 -msgid "slapped" -msgstr "ohrfeigte" - -#: include/text.php:1053 -msgid "finger" -msgstr "befummeln" - -#: include/text.php:1053 -msgid "fingered" -msgstr "befummelte" - -#: include/text.php:1054 -msgid "rebuff" -msgstr "eine Abfuhr erteilen" - -#: include/text.php:1054 -msgid "rebuffed" -msgstr "abfuhrerteilte" - -#: include/text.php:1068 -msgid "happy" -msgstr "glücklich" - -#: include/text.php:1069 -msgid "sad" -msgstr "traurig" - -#: include/text.php:1070 -msgid "mellow" -msgstr "sanft" - -#: include/text.php:1071 -msgid "tired" -msgstr "müde" - -#: include/text.php:1072 -msgid "perky" -msgstr "frech" - -#: include/text.php:1073 -msgid "angry" -msgstr "sauer" - -#: include/text.php:1074 -msgid "stupified" -msgstr "verblüfft" - -#: include/text.php:1075 -msgid "puzzled" -msgstr "verwirrt" - -#: include/text.php:1076 -msgid "interested" -msgstr "interessiert" - -#: include/text.php:1077 -msgid "bitter" -msgstr "verbittert" - -#: include/text.php:1078 -msgid "cheerful" -msgstr "fröhlich" - -#: include/text.php:1079 -msgid "alive" -msgstr "lebendig" - -#: include/text.php:1080 -msgid "annoyed" -msgstr "verärgert" - -#: include/text.php:1081 -msgid "anxious" -msgstr "unruhig" - -#: include/text.php:1082 -msgid "cranky" -msgstr "schrullig" - -#: include/text.php:1083 -msgid "disturbed" -msgstr "verstört" - -#: include/text.php:1084 -msgid "frustrated" -msgstr "frustriert" - -#: include/text.php:1085 -msgid "motivated" -msgstr "motiviert" - -#: include/text.php:1086 -msgid "relaxed" -msgstr "entspannt" - -#: include/text.php:1087 -msgid "surprised" -msgstr "überrascht" - -#: include/text.php:1301 mod/videos.php:383 -msgid "View Video" -msgstr "Video ansehen" - -#: include/text.php:1333 -msgid "bytes" -msgstr "Byte" - -#: include/text.php:1365 include/text.php:1377 -msgid "Click to open/close" -msgstr "Zum öffnen/schließen klicken" - -#: include/text.php:1503 -msgid "View on separate page" -msgstr "Auf separater Seite ansehen" - -#: include/text.php:1504 -msgid "view on separate page" -msgstr "auf separater Seite ansehen" - -#: include/text.php:1779 include/like.php:165 include/conversation.php:122 -#: include/conversation.php:258 view/theme/diabook/theme.php:463 -msgid "event" -msgstr "Event" - -#: include/text.php:1781 include/like.php:163 include/conversation.php:130 -#: include/conversation.php:266 mod/tagger.php:62 mod/subthread.php:87 -#: view/theme/diabook/theme.php:471 -msgid "photo" -msgstr "Foto" - -#: include/text.php:1783 -msgid "activity" -msgstr "Aktivität" - -#: include/text.php:1785 mod/content.php:623 object/Item.php:431 -#: object/Item.php:444 -msgid "comment" -msgid_plural "comments" -msgstr[0] "Kommentar" -msgstr[1] "Kommentare" - -#: include/text.php:1786 -msgid "post" -msgstr "Beitrag" - -#: include/text.php:1954 -msgid "Item filed" -msgstr "Beitrag abgelegt" - -#: include/identity.php:42 -msgid "Requested account is not available." -msgstr "Das angefragte Profil ist nicht vorhanden." - -#: include/identity.php:51 mod/profile.php:21 -msgid "Requested profile is not available." -msgstr "Das angefragte Profil ist nicht vorhanden." - -#: include/identity.php:95 include/identity.php:305 include/identity.php:686 -msgid "Edit profile" -msgstr "Profil bearbeiten" - -#: include/identity.php:245 -msgid "Atom feed" -msgstr "Atom-Feed" - -#: include/identity.php:250 include/conversation.php:1287 mod/editpost.php:152 -msgid "Message" -msgstr "Nachricht" - -#: include/identity.php:276 include/nav.php:191 -msgid "Profiles" -msgstr "Profile" - -#: include/identity.php:276 -msgid "Manage/edit profiles" -msgstr "Profile verwalten/editieren" - -#: include/identity.php:281 include/identity.php:307 mod/profiles.php:788 -msgid "Change profile photo" -msgstr "Profilbild ändern" - -#: include/identity.php:282 mod/profiles.php:789 -msgid "Create New Profile" -msgstr "Neues Profil anlegen" - -#: include/identity.php:292 mod/profiles.php:778 -msgid "Profile Image" -msgstr "Profilbild" - -#: include/identity.php:295 mod/profiles.php:780 -msgid "visible to everybody" -msgstr "sichtbar für jeden" - -#: include/identity.php:296 mod/profiles.php:685 mod/profiles.php:781 -msgid "Edit visibility" -msgstr "Sichtbarkeit bearbeiten" - -#: include/identity.php:319 mod/dirfind.php:223 mod/directory.php:174 -#: mod/match.php:84 mod/viewcontacts.php:105 mod/allfriends.php:79 -#: mod/cal.php:44 mod/videos.php:37 mod/suggest.php:98 mod/hovercard.php:80 -#: mod/common.php:123 mod/network.php:517 mod/contacts.php:51 -#: mod/contacts.php:626 mod/contacts.php:953 mod/photos.php:42 -msgid "Forum" -msgstr "Forum" - -#: include/identity.php:331 include/identity.php:614 mod/directory.php:147 -#: mod/notifications.php:214 -msgid "Gender:" -msgstr "Geschlecht:" - -#: include/identity.php:334 include/identity.php:634 mod/directory.php:149 -msgid "Status:" -msgstr "Status:" - -#: include/identity.php:336 include/identity.php:645 mod/directory.php:151 -msgid "Homepage:" -msgstr "Homepage:" - -#: include/identity.php:338 include/identity.php:655 mod/directory.php:153 -#: mod/contacts.php:630 mod/notifications.php:210 -msgid "About:" -msgstr "Über:" - -#: include/identity.php:420 mod/contacts.php:50 mod/notifications.php:222 -msgid "Network:" -msgstr "Netzwerk:" - -#: include/identity.php:449 include/identity.php:533 -msgid "g A l F d" -msgstr "l, d. F G \\U\\h\\r" - -#: include/identity.php:450 include/identity.php:534 -msgid "F d" -msgstr "d. F" - -#: include/identity.php:495 include/identity.php:580 -msgid "[today]" -msgstr "[heute]" - -#: include/identity.php:507 -msgid "Birthday Reminders" -msgstr "Geburtstagserinnerungen" - -#: include/identity.php:508 -msgid "Birthdays this week:" -msgstr "Geburtstage diese Woche:" - -#: include/identity.php:567 -msgid "[No description]" -msgstr "[keine Beschreibung]" - -#: include/identity.php:591 -msgid "Event Reminders" -msgstr "Veranstaltungserinnerungen" - -#: include/identity.php:592 -msgid "Events this week:" -msgstr "Veranstaltungen diese Woche" - -#: include/identity.php:603 include/identity.php:689 include/identity.php:720 -#: include/nav.php:79 mod/profperm.php:104 mod/newmember.php:32 -#: mod/contacts.php:637 mod/contacts.php:839 view/theme/frio/theme.php:247 -#: view/theme/diabook/theme.php:124 -msgid "Profile" -msgstr "Profil" - -#: include/identity.php:612 mod/settings.php:1229 -msgid "Full Name:" -msgstr "Kompletter Name:" - -#: include/identity.php:619 -msgid "j F, Y" -msgstr "j F, Y" - -#: include/identity.php:620 -msgid "j F" -msgstr "j F" - -#: include/identity.php:631 -msgid "Age:" -msgstr "Alter:" - -#: include/identity.php:640 -#, php-format -msgid "for %1$d %2$s" -msgstr "für %1$d %2$s" - -#: include/identity.php:643 mod/profiles.php:704 -msgid "Sexual Preference:" -msgstr "Sexuelle Vorlieben:" - -#: include/identity.php:647 mod/profiles.php:730 -msgid "Hometown:" -msgstr "Heimatort:" - -#: include/identity.php:649 mod/follow.php:134 mod/contacts.php:632 -#: mod/notifications.php:212 -msgid "Tags:" -msgstr "Tags" - -#: include/identity.php:651 mod/profiles.php:731 -msgid "Political Views:" -msgstr "Politische Ansichten:" - -#: include/identity.php:653 -msgid "Religion:" -msgstr "Religion:" - -#: include/identity.php:657 -msgid "Hobbies/Interests:" -msgstr "Hobbies/Interessen:" - -#: include/identity.php:659 mod/profiles.php:735 -msgid "Likes:" -msgstr "Likes:" - -#: include/identity.php:661 mod/profiles.php:736 -msgid "Dislikes:" -msgstr "Dislikes:" - -#: include/identity.php:664 -msgid "Contact information and Social Networks:" -msgstr "Kontaktinformationen und Soziale Netzwerke:" - -#: include/identity.php:666 -msgid "Musical interests:" -msgstr "Musikalische Interessen:" - -#: include/identity.php:668 -msgid "Books, literature:" -msgstr "Literatur/Bücher:" - -#: include/identity.php:670 -msgid "Television:" -msgstr "Fernsehen:" - -#: include/identity.php:672 -msgid "Film/dance/culture/entertainment:" -msgstr "Filme/Tänze/Kultur/Unterhaltung:" - -#: include/identity.php:674 -msgid "Love/Romance:" -msgstr "Liebesleben:" - -#: include/identity.php:676 -msgid "Work/employment:" -msgstr "Arbeit/Beschäftigung:" - -#: include/identity.php:678 -msgid "School/education:" -msgstr "Schule/Ausbildung:" - -#: include/identity.php:682 -msgid "Forums:" -msgstr "Foren:" - -#: include/identity.php:690 mod/events.php:508 -msgid "Basic" -msgstr "Allgemein" - -#: include/identity.php:691 mod/events.php:509 mod/admin.php:928 -#: mod/contacts.php:868 -msgid "Advanced" -msgstr "Erweitert" - -#: include/identity.php:712 include/nav.php:78 mod/contacts.php:635 -#: mod/contacts.php:831 view/theme/frio/theme.php:246 -msgid "Status" -msgstr "Status" - -#: include/identity.php:715 mod/follow.php:143 mod/contacts.php:834 -msgid "Status Messages and Posts" -msgstr "Statusnachrichten und Beiträge" - -#: include/identity.php:723 mod/contacts.php:842 -msgid "Profile Details" -msgstr "Profildetails" - -#: include/identity.php:728 include/nav.php:80 mod/fbrowser.php:32 -#: view/theme/frio/theme.php:248 view/theme/diabook/theme.php:126 -msgid "Photos" -msgstr "Bilder" - -#: include/identity.php:731 mod/photos.php:100 -msgid "Photo Albums" -msgstr "Fotoalben" - -#: include/identity.php:736 include/identity.php:739 include/nav.php:81 -#: view/theme/frio/theme.php:249 -msgid "Videos" -msgstr "Videos" - -#: include/identity.php:748 include/identity.php:759 include/nav.php:82 -#: include/nav.php:146 mod/events.php:379 mod/cal.php:278 -#: view/theme/frio/theme.php:250 view/theme/frio/theme.php:254 -#: view/theme/diabook/theme.php:127 -msgid "Events" -msgstr "Veranstaltungen" - -#: include/identity.php:751 include/identity.php:762 include/nav.php:146 -#: view/theme/frio/theme.php:254 -msgid "Events and Calendar" -msgstr "Ereignisse und Kalender" - -#: include/identity.php:770 mod/notes.php:46 -msgid "Personal Notes" -msgstr "Persönliche Notizen" - -#: include/identity.php:773 -msgid "Only You Can See This" -msgstr "Nur Du kannst das sehen" - -#: include/follow.php:77 mod/dfrn_request.php:507 -msgid "Disallowed profile URL." -msgstr "Nicht erlaubte Profil-URL." - -#: include/follow.php:82 -msgid "Connect URL missing." -msgstr "Connect-URL fehlt" - -#: include/follow.php:109 -msgid "" -"This site is not configured to allow communications with other networks." -msgstr "Diese Seite ist so konfiguriert, dass keine Kommunikation mit anderen Netzwerken erfolgen kann." - -#: include/follow.php:110 include/follow.php:130 -msgid "No compatible communication protocols or feeds were discovered." -msgstr "Es wurden keine kompatiblen Kommunikationsprotokolle oder Feeds gefunden." - -#: include/follow.php:128 -msgid "The profile address specified does not provide adequate information." -msgstr "Die angegebene Profiladresse liefert unzureichende Informationen." - -#: include/follow.php:132 -msgid "An author or name was not found." -msgstr "Es wurde kein Autor oder Name gefunden." - -#: include/follow.php:134 -msgid "No browser URL could be matched to this address." -msgstr "Zu dieser Adresse konnte keine passende Browser URL gefunden werden." - -#: include/follow.php:136 -msgid "" -"Unable to match @-style Identity Address with a known protocol or email " -"contact." -msgstr "Konnte die @-Adresse mit keinem der bekannten Protokolle oder Email-Kontakte abgleichen." - -#: include/follow.php:137 -msgid "Use mailto: in front of address to force email check." -msgstr "Verwende mailto: vor der Email Adresse, um eine Überprüfung der E-Mail-Adresse zu erzwingen." - -#: include/follow.php:143 -msgid "" -"The profile address specified belongs to a network which has been disabled " -"on this site." -msgstr "Die Adresse dieses Profils gehört zu einem Netzwerk, mit dem die Kommunikation auf dieser Seite ausgeschaltet wurde." - -#: include/follow.php:153 -msgid "" -"Limited profile. This person will be unable to receive direct/personal " -"notifications from you." -msgstr "Eingeschränktes Profil. Diese Person wird keine direkten/privaten Nachrichten von Dir erhalten können." - -#: include/follow.php:254 -msgid "Unable to retrieve contact information." -msgstr "Konnte die Kontaktinformationen nicht empfangen." - -#: include/follow.php:287 -msgid "following" -msgstr "folgen" - #: include/oembed.php:229 msgid "Embedded content" msgstr "Eingebetteter Inhalt" @@ -1849,11 +1174,11 @@ msgid "An error occurred creating your default profile. Please try again." msgstr "Bei der Erstellung des Standardprofils ist ein Fehler aufgetreten. Bitte versuche es noch einmal." #: include/user.php:345 include/user.php:352 include/user.php:359 -#: mod/profile_photo.php:74 mod/profile_photo.php:81 mod/profile_photo.php:88 -#: mod/profile_photo.php:210 mod/profile_photo.php:302 -#: mod/profile_photo.php:311 mod/photos.php:79 mod/photos.php:193 -#: mod/photos.php:770 mod/photos.php:1233 mod/photos.php:1256 -#: mod/photos.php:1850 view/theme/diabook/theme.php:500 +#: mod/photos.php:79 mod/photos.php:193 mod/photos.php:770 mod/photos.php:1233 +#: mod/photos.php:1256 mod/photos.php:1850 mod/profile_photo.php:74 +#: mod/profile_photo.php:81 mod/profile_photo.php:88 mod/profile_photo.php:210 +#: mod/profile_photo.php:302 mod/profile_photo.php:311 +#: view/theme/diabook/theme.php:500 msgid "Profile Photos" msgstr "Profilbilder" @@ -1896,7 +1221,7 @@ msgid "" "\t\tThank you and welcome to %2$s." msgstr "\nDie Anmelde-Details sind die folgenden:\n\tAdresse der Seite:\t%3$s\n\tBenutzernamename:\t%1$s\n\tPasswort:\t%5$s\n\nDu kannst Dein Passwort unter \"Einstellungen\" ändern, sobald Du Dich\nangemeldet hast.\n\nBitte nimm Dir ein paar Minuten um die anderen Einstellungen auf dieser\nSeite zu kontrollieren.\n\nEventuell magst Du ja auch einige Informationen über Dich in Deinem\nProfil veröffentlichen, damit andere Leute Dich einfacher finden können.\nBearbeite hierfür einfach Dein Standard-Profil (über die Profil-Seite).\n\nWir empfehlen Dir, Deinen kompletten Namen anzugeben und ein zu Dir\npassendes Profilbild zu wählen, damit Dich alte Bekannte wieder finden.\nAußerdem ist es nützlich, wenn Du auf Deinem Profil Schlüsselwörter\nangibst. Das erleichtert es, Leute zu finden, die Deine Interessen teilen.\n\nWir respektieren Deine Privatsphäre - keine dieser Angaben ist nötig.\nWenn Du neu im Netzwerk bist und noch niemanden kennst, dann können sie\nallerdings dabei helfen, neue und interessante Kontakte zu knüpfen.\n\nDanke für Deine Aufmerksamkeit und willkommen auf %2$s." -#: include/user.php:423 mod/admin.php:1178 +#: include/user.php:423 mod/admin.php:1181 #, php-format msgid "Registration details for %s" msgstr "Details der Registration von %s" @@ -2112,7 +1437,11 @@ msgstr "Keine Neuigkeiten" msgid "Clear notifications" msgstr "Bereinige Benachrichtigungen" -#: include/nav.php:75 view/theme/frio/theme.php:243 boot.php:1620 +#: include/nav.php:40 include/text.php:997 +msgid "@name, !forum, #tags, content" +msgstr "@name, !forum, #tags, content" + +#: include/nav.php:75 view/theme/frio/theme.php:243 boot.php:1652 msgid "Logout" msgstr "Abmelden" @@ -2120,25 +1449,54 @@ msgstr "Abmelden" msgid "End this session" msgstr "Diese Sitzung beenden" +#: include/nav.php:78 include/identity.php:712 mod/contacts.php:635 +#: mod/contacts.php:831 view/theme/frio/theme.php:246 +msgid "Status" +msgstr "Status" + #: include/nav.php:78 include/nav.php:163 view/theme/frio/theme.php:246 #: view/theme/diabook/theme.php:123 msgid "Your posts and conversations" msgstr "Deine Beiträge und Unterhaltungen" +#: include/nav.php:79 include/identity.php:603 include/identity.php:689 +#: include/identity.php:720 mod/profperm.php:104 mod/newmember.php:32 +#: mod/contacts.php:637 mod/contacts.php:839 view/theme/frio/theme.php:247 +#: view/theme/diabook/theme.php:124 +msgid "Profile" +msgstr "Profil" + #: include/nav.php:79 view/theme/frio/theme.php:247 #: view/theme/diabook/theme.php:124 msgid "Your profile page" msgstr "Deine Profilseite" +#: include/nav.php:80 include/identity.php:728 mod/fbrowser.php:32 +#: view/theme/frio/theme.php:248 view/theme/diabook/theme.php:126 +msgid "Photos" +msgstr "Bilder" + #: include/nav.php:80 view/theme/frio/theme.php:248 #: view/theme/diabook/theme.php:126 msgid "Your photos" msgstr "Deine Fotos" +#: include/nav.php:81 include/identity.php:736 include/identity.php:739 +#: view/theme/frio/theme.php:249 +msgid "Videos" +msgstr "Videos" + #: include/nav.php:81 view/theme/frio/theme.php:249 msgid "Your videos" msgstr "Deine Videos" +#: include/nav.php:82 include/nav.php:146 include/identity.php:748 +#: include/identity.php:759 mod/cal.php:278 mod/events.php:379 +#: view/theme/frio/theme.php:250 view/theme/frio/theme.php:254 +#: view/theme/diabook/theme.php:127 +msgid "Events" +msgstr "Veranstaltungen" + #: include/nav.php:82 view/theme/frio/theme.php:250 #: view/theme/diabook/theme.php:127 msgid "Your events" @@ -2152,7 +1510,7 @@ msgstr "Persönliche Notizen" msgid "Your personal notes" msgstr "Deine persönlichen Notizen" -#: include/nav.php:94 mod/bookmarklet.php:12 boot.php:1621 +#: include/nav.php:94 mod/bookmarklet.php:12 boot.php:1653 msgid "Login" msgstr "Anmeldung" @@ -2169,7 +1527,7 @@ msgstr "Pinnwand" msgid "Home Page" msgstr "Homepage" -#: include/nav.php:111 mod/register.php:280 boot.php:1596 +#: include/nav.php:111 mod/register.php:280 boot.php:1628 msgid "Register" msgstr "Registrieren" @@ -2193,10 +1551,29 @@ msgstr "Apps" msgid "Addon applications, utilities, games" msgstr "Addon Anwendungen, Dienstprogramme, Spiele" +#: include/nav.php:122 include/text.php:994 mod/search.php:149 +msgid "Search" +msgstr "Suche" + #: include/nav.php:122 msgid "Search site content" msgstr "Inhalt der Seite durchsuchen" +#: include/nav.php:125 include/text.php:1002 +msgid "Full Text" +msgstr "Volltext" + +#: include/nav.php:126 include/text.php:1003 +msgid "Tags" +msgstr "Tags" + +#: include/nav.php:127 include/nav.php:193 include/identity.php:781 +#: include/identity.php:784 include/text.php:1004 mod/viewcontacts.php:116 +#: mod/contacts.php:790 mod/contacts.php:851 view/theme/frio/theme.php:257 +#: view/theme/diabook/theme.php:125 +msgid "Contacts" +msgstr "Kontakte" + #: include/nav.php:141 include/nav.php:143 mod/community.php:36 #: view/theme/diabook/theme.php:129 msgid "Community" @@ -2210,6 +1587,11 @@ msgstr "Unterhaltungen auf dieser Seite" msgid "Conversations on the network" msgstr "Unterhaltungen im Netzwerk" +#: include/nav.php:146 include/identity.php:751 include/identity.php:762 +#: view/theme/frio/theme.php:254 +msgid "Events and Calendar" +msgstr "Ereignisse und Kalender" + #: include/nav.php:148 msgid "Directory" msgstr "Verzeichnis" @@ -2226,7 +1608,7 @@ msgstr "Information" msgid "Information about this friendica instance" msgstr "Informationen zu dieser Friendica Instanz" -#: include/nav.php:160 mod/admin.php:402 mod/notifications.php:533 +#: include/nav.php:160 mod/notifications.php:533 mod/admin.php:402 #: view/theme/frio/theme.php:253 msgid "Network" msgstr "Netzwerk" @@ -2303,8 +1685,8 @@ msgstr "Delegationen" msgid "Delegate Page Management" msgstr "Delegiere das Management für die Seite" -#: include/nav.php:188 mod/admin.php:1498 mod/admin.php:1756 -#: mod/newmember.php:22 mod/settings.php:111 view/theme/frio/theme.php:256 +#: include/nav.php:188 mod/newmember.php:22 mod/admin.php:1501 +#: mod/admin.php:1759 mod/settings.php:111 view/theme/frio/theme.php:256 #: view/theme/diabook/theme.php:544 view/theme/diabook/theme.php:648 msgid "Settings" msgstr "Einstellungen" @@ -2313,6 +1695,10 @@ msgstr "Einstellungen" msgid "Account settings" msgstr "Kontoeinstellungen" +#: include/nav.php:191 include/identity.php:276 +msgid "Profiles" +msgstr "Profile" + #: include/nav.php:191 msgid "Manage/Edit Profiles" msgstr "Profile Verwalten/Editieren" @@ -2337,87 +1723,6 @@ msgstr "Navigation" msgid "Site map" msgstr "Sitemap" -#: include/like.php:163 include/conversation.php:125 -#: include/conversation.php:134 include/conversation.php:261 -#: include/conversation.php:270 include/diaspora.php:1402 mod/tagger.php:62 -#: mod/subthread.php:87 view/theme/diabook/theme.php:466 -#: view/theme/diabook/theme.php:475 -msgid "status" -msgstr "Status" - -#: include/like.php:182 include/conversation.php:141 include/diaspora.php:1398 -#: 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:184 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:186 -#, 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:188 -#, 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:190 -#, php-format -msgid "%1$s may attend %2$s's %3$s" -msgstr "%1$s nimmt eventuell an %2$ss %3$s teil." - -#: include/message.php:15 include/message.php:173 -msgid "[no subject]" -msgstr "[kein Betreff]" - -#: include/acl_selectors.php:327 -msgid "Post to Email" -msgstr "An E-Mail senden" - -#: include/acl_selectors.php:332 -#, php-format -msgid "Connectors disabled, since \"%s\" is enabled." -msgstr "Konnektoren sind nicht verfügbar, da \"%s\" aktiv ist." - -#: include/acl_selectors.php:333 mod/settings.php:1131 -msgid "Hide your profile details from unknown viewers?" -msgstr "Profil-Details vor unbekannten Betrachtern verbergen?" - -#: include/acl_selectors.php:338 -msgid "Visible to everybody" -msgstr "Für jeden sichtbar" - -#: include/acl_selectors.php:339 view/theme/vier/config.php:103 -#: view/theme/diabook/theme.php:621 view/theme/diabook/config.php:142 -msgid "show" -msgstr "zeigen" - -#: include/acl_selectors.php:340 view/theme/vier/config.php:103 -#: view/theme/diabook/theme.php:621 view/theme/diabook/config.php:142 -msgid "don't show" -msgstr "nicht zeigen" - -#: include/acl_selectors.php:346 mod/editpost.php:133 -msgid "CC: email addresses" -msgstr "Cc: E-Mail-Addressen" - -#: include/acl_selectors.php:347 mod/editpost.php:140 -msgid "Example: bob@example.com, mary@example.com" -msgstr "Z.B.: bob@example.com, mary@example.com" - -#: include/acl_selectors.php:349 mod/photos.php:1178 mod/photos.php:1563 -msgid "Permissions" -msgstr "Berechtigungen" - -#: include/acl_selectors.php:350 -msgid "Close" -msgstr "Schließen" - #: include/contact_selectors.php:32 msgid "Unknown | Not categorised" msgstr "Unbekannt | Nicht kategorisiert" @@ -2442,19 +1747,19 @@ msgstr "OK, wahrscheinlich harmlos" msgid "Reputable, has my trust" msgstr "Seriös, hat mein Vertrauen" -#: include/contact_selectors.php:56 mod/admin.php:859 +#: include/contact_selectors.php:56 mod/admin.php:861 msgid "Frequently" msgstr "immer wieder" -#: include/contact_selectors.php:57 mod/admin.php:860 +#: include/contact_selectors.php:57 mod/admin.php:862 msgid "Hourly" msgstr "Stündlich" -#: include/contact_selectors.php:58 mod/admin.php:861 +#: include/contact_selectors.php:58 mod/admin.php:863 msgid "Twice daily" msgstr "Zweimal täglich" -#: include/contact_selectors.php:59 mod/admin.php:862 +#: include/contact_selectors.php:59 mod/admin.php:864 msgid "Daily" msgstr "Täglich" @@ -2479,12 +1784,12 @@ msgid "RSS/Atom" msgstr "RSS/Atom" #: include/contact_selectors.php:79 include/contact_selectors.php:86 -#: mod/admin.php:1371 mod/admin.php:1384 mod/admin.php:1396 mod/admin.php:1414 +#: mod/admin.php:1374 mod/admin.php:1387 mod/admin.php:1399 mod/admin.php:1417 msgid "Email" msgstr "E-Mail" -#: include/contact_selectors.php:80 mod/settings.php:827 -#: mod/dfrn_request.php:869 +#: include/contact_selectors.php:80 mod/dfrn_request.php:869 +#: mod/settings.php:827 msgid "Diaspora" msgstr "Diaspora" @@ -2536,6 +1841,36 @@ msgstr "App.net" msgid "Hubzilla/Redmatrix" msgstr "Hubzilla/Redmatrix" +#: include/conversation.php:122 include/conversation.php:258 +#: include/like.php:165 include/text.php:1788 view/theme/diabook/theme.php:463 +msgid "event" +msgstr "Event" + +#: include/conversation.php:125 include/conversation.php:134 +#: include/conversation.php:261 include/conversation.php:270 +#: include/diaspora.php:1402 include/like.php:163 mod/subthread.php:87 +#: mod/tagger.php:62 view/theme/diabook/theme.php:466 +#: view/theme/diabook/theme.php:475 +msgid "status" +msgstr "Status" + +#: include/conversation.php:130 include/conversation.php:266 +#: include/like.php:163 include/text.php:1790 mod/subthread.php:87 +#: mod/tagger.php:62 view/theme/diabook/theme.php:471 +msgid "photo" +msgstr "Foto" + +#: include/conversation.php:141 include/diaspora.php:1398 include/like.php:182 +#: 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/conversation.php:144 include/like.php:184 +#, php-format +msgid "%1$s doesn't like %2$s's %3$s" +msgstr "%1$s mag %2$ss %3$s nicht" + #: include/conversation.php:147 #, php-format msgid "%1$s attends %2$s's %3$s" @@ -2580,39 +1915,39 @@ msgstr "Nachricht/Beitrag" msgid "%1$s marked %2$s's %3$s as favorite" msgstr "%1$s hat %2$s\\s %3$s als Favorit markiert" -#: include/conversation.php:587 mod/photos.php:1635 mod/profiles.php:345 -#: mod/content.php:372 +#: include/conversation.php:587 mod/content.php:372 mod/photos.php:1635 +#: mod/profiles.php:345 msgid "Likes" msgstr "Likes" -#: include/conversation.php:587 mod/photos.php:1635 mod/profiles.php:349 -#: mod/content.php:372 +#: include/conversation.php:587 mod/content.php:372 mod/photos.php:1635 +#: mod/profiles.php:349 msgid "Dislikes" msgstr "Dislikes" #: include/conversation.php:588 include/conversation.php:1471 -#: mod/photos.php:1636 mod/content.php:373 +#: mod/content.php:373 mod/photos.php:1636 msgid "Attending" msgid_plural "Attending" msgstr[0] "Teilnehmend" msgstr[1] "Teilnehmend" -#: include/conversation.php:588 mod/photos.php:1636 mod/content.php:373 +#: include/conversation.php:588 mod/content.php:373 mod/photos.php:1636 msgid "Not attending" msgstr "Nicht teilnehmend" -#: include/conversation.php:588 mod/photos.php:1636 mod/content.php:373 +#: include/conversation.php:588 mod/content.php:373 mod/photos.php:1636 msgid "Might attend" msgstr "Eventuell teilnehmend" -#: include/conversation.php:710 mod/photos.php:1710 mod/content.php:453 -#: mod/content.php:758 object/Item.php:133 +#: include/conversation.php:710 mod/content.php:453 mod/content.php:758 +#: mod/photos.php:1710 object/Item.php:133 msgid "Select" msgstr "Auswählen" -#: include/conversation.php:711 mod/admin.php:1388 mod/group.php:171 -#: mod/settings.php:726 mod/contacts.php:806 mod/contacts.php:1021 -#: mod/photos.php:1711 mod/content.php:454 mod/content.php:759 +#: include/conversation.php:711 mod/group.php:171 mod/content.php:454 +#: mod/content.php:759 mod/admin.php:1391 mod/contacts.php:806 +#: mod/contacts.php:1021 mod/photos.php:1711 mod/settings.php:726 #: object/Item.php:134 msgid "Delete" msgstr "Löschen" @@ -2643,8 +1978,8 @@ msgstr "Im Zusammenhang betrachten" #: include/conversation.php:793 include/conversation.php:1255 #: mod/editpost.php:124 mod/wallmessage.php:156 mod/message.php:356 -#: mod/message.php:548 mod/photos.php:1598 mod/content.php:515 -#: mod/content.php:948 object/Item.php:406 +#: mod/message.php:548 mod/content.php:515 mod/content.php:948 +#: mod/photos.php:1598 object/Item.php:406 msgid "Please wait" msgstr "Bitte warten" @@ -2666,8 +2001,8 @@ msgstr "Pinnwand anschauen" #: include/conversation.php:966 include/conversation.php:980 #: include/Contact.php:310 include/Contact.php:323 include/Contact.php:365 -#: mod/dirfind.php:203 mod/directory.php:163 mod/match.php:71 -#: mod/allfriends.php:65 mod/suggest.php:82 +#: mod/directory.php:163 mod/match.php:71 mod/allfriends.php:65 +#: mod/suggest.php:82 mod/dirfind.php:203 msgid "View Profile" msgstr "Profil anschauen" @@ -2892,12 +2227,21 @@ msgstr "Zugriffsrechte" msgid "Public post" msgstr "Öffentlicher Beitrag" -#: include/conversation.php:1270 mod/events.php:505 mod/editpost.php:145 -#: mod/photos.php:1619 mod/photos.php:1667 mod/photos.php:1755 -#: mod/content.php:737 object/Item.php:729 +#: include/conversation.php:1270 mod/editpost.php:145 mod/content.php:737 +#: mod/events.php:505 mod/photos.php:1619 mod/photos.php:1667 +#: mod/photos.php:1755 object/Item.php:729 msgid "Preview" msgstr "Vorschau" +#: include/conversation.php:1274 include/items.php:1849 mod/fbrowser.php:101 +#: mod/fbrowser.php:136 mod/tagrm.php:11 mod/tagrm.php:94 mod/follow.php:121 +#: mod/suggest.php:32 mod/editpost.php:148 mod/message.php:220 +#: mod/dfrn_request.php:875 mod/contacts.php:445 mod/photos.php:248 +#: mod/photos.php:337 mod/settings.php:664 mod/settings.php:690 +#: mod/videos.php:131 +msgid "Cancel" +msgstr "Abbrechen" + #: include/conversation.php:1280 msgid "Post to Groups" msgstr "Poste an Gruppe" @@ -2910,6 +2254,10 @@ msgstr "Poste an Kontakte" msgid "Private post" msgstr "Privater Beitrag" +#: include/conversation.php:1287 include/identity.php:250 mod/editpost.php:152 +msgid "Message" +msgstr "Nachricht" + #: include/conversation.php:1288 mod/editpost.php:153 msgid "Browser" msgstr "Browser" @@ -2936,53 +2284,10 @@ msgid_plural "Not Attending" msgstr[0] "Nicht teilnehmend " msgstr[1] "Nicht teilnehmend" -#: include/diaspora.php:1954 -msgid "Sharing notification from Diaspora network" -msgstr "Freigabe-Benachrichtigung von Diaspora" - -#: include/diaspora.php:2854 -msgid "Attachments:" -msgstr "Anhänge:" - #: include/network.php:595 msgid "view full size" msgstr "Volle Größe anzeigen" -#: include/plugin.php:522 include/plugin.php:524 -msgid "Click here to upgrade." -msgstr "Zum Upgraden hier klicken." - -#: include/plugin.php:530 -msgid "This action exceeds the limits set by your subscription plan." -msgstr "Diese Aktion überschreitet die Obergrenze Deines Abonnements." - -#: include/plugin.php:535 -msgid "This action is not available under your subscription plan." -msgstr "Diese Aktion ist in Deinem Abonnement nicht verfügbar." - -#: include/Contact.php:119 -msgid "stopped following" -msgstr "wird nicht mehr gefolgt" - -#: include/Contact.php:369 -msgid "Drop Contact" -msgstr "Kontakt löschen" - -#: include/api.php:974 -#, 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:994 -#, 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:1015 -#, 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/dbstructure.php:26 #, php-format msgid "" @@ -3008,18 +2313,700 @@ msgstr "Fehler aufgetreten während der Erzeugung der Datenbanktabellen." msgid "Errors encountered performing database changes." msgstr "Es sind Fehler beim Bearbeiten der Datenbank aufgetreten." -#: mod/regmod.php:55 -msgid "Account approved." -msgstr "Konto freigegeben." +#: include/Contact.php:119 +msgid "stopped following" +msgstr "wird nicht mehr gefolgt" -#: mod/regmod.php:92 +#: include/Contact.php:369 +msgid "Drop Contact" +msgstr "Kontakt löschen" + +#: include/acl_selectors.php:327 +msgid "Post to Email" +msgstr "An E-Mail senden" + +#: include/acl_selectors.php:332 #, php-format -msgid "Registration revoked for %s" -msgstr "Registrierung für %s wurde zurückgezogen" +msgid "Connectors disabled, since \"%s\" is enabled." +msgstr "Konnektoren sind nicht verfügbar, da \"%s\" aktiv ist." -#: mod/regmod.php:104 -msgid "Please login." -msgstr "Bitte melde Dich an." +#: include/acl_selectors.php:333 mod/settings.php:1131 +msgid "Hide your profile details from unknown viewers?" +msgstr "Profil-Details vor unbekannten Betrachtern verbergen?" + +#: include/acl_selectors.php:338 +msgid "Visible to everybody" +msgstr "Für jeden sichtbar" + +#: include/acl_selectors.php:339 view/theme/vier/config.php:103 +#: view/theme/diabook/theme.php:621 view/theme/diabook/config.php:142 +msgid "show" +msgstr "zeigen" + +#: include/acl_selectors.php:340 view/theme/vier/config.php:103 +#: view/theme/diabook/theme.php:621 view/theme/diabook/config.php:142 +msgid "don't show" +msgstr "nicht zeigen" + +#: include/acl_selectors.php:346 mod/editpost.php:133 +msgid "CC: email addresses" +msgstr "Cc: E-Mail-Addressen" + +#: include/acl_selectors.php:347 mod/editpost.php:140 +msgid "Example: bob@example.com, mary@example.com" +msgstr "Z.B.: bob@example.com, mary@example.com" + +#: include/acl_selectors.php:349 mod/photos.php:1178 mod/photos.php:1563 +msgid "Permissions" +msgstr "Berechtigungen" + +#: include/acl_selectors.php:350 +msgid "Close" +msgstr "Schließen" + +#: include/api.php:975 +#, 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:995 +#, 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:1016 +#, 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/dfrn.php:1110 +#, php-format +msgid "%s\\'s birthday" +msgstr "%ss Geburtstag" + +#: include/diaspora.php:1954 +msgid "Sharing notification from Diaspora network" +msgstr "Freigabe-Benachrichtigung von Diaspora" + +#: include/diaspora.php:2854 +msgid "Attachments:" +msgstr "Anhänge:" + +#: include/follow.php:77 mod/dfrn_request.php:507 +msgid "Disallowed profile URL." +msgstr "Nicht erlaubte Profil-URL." + +#: include/follow.php:82 +msgid "Connect URL missing." +msgstr "Connect-URL fehlt" + +#: include/follow.php:109 +msgid "" +"This site is not configured to allow communications with other networks." +msgstr "Diese Seite ist so konfiguriert, dass keine Kommunikation mit anderen Netzwerken erfolgen kann." + +#: include/follow.php:110 include/follow.php:130 +msgid "No compatible communication protocols or feeds were discovered." +msgstr "Es wurden keine kompatiblen Kommunikationsprotokolle oder Feeds gefunden." + +#: include/follow.php:128 +msgid "The profile address specified does not provide adequate information." +msgstr "Die angegebene Profiladresse liefert unzureichende Informationen." + +#: include/follow.php:132 +msgid "An author or name was not found." +msgstr "Es wurde kein Autor oder Name gefunden." + +#: include/follow.php:134 +msgid "No browser URL could be matched to this address." +msgstr "Zu dieser Adresse konnte keine passende Browser URL gefunden werden." + +#: include/follow.php:136 +msgid "" +"Unable to match @-style Identity Address with a known protocol or email " +"contact." +msgstr "Konnte die @-Adresse mit keinem der bekannten Protokolle oder Email-Kontakte abgleichen." + +#: include/follow.php:137 +msgid "Use mailto: in front of address to force email check." +msgstr "Verwende mailto: vor der Email Adresse, um eine Überprüfung der E-Mail-Adresse zu erzwingen." + +#: include/follow.php:143 +msgid "" +"The profile address specified belongs to a network which has been disabled " +"on this site." +msgstr "Die Adresse dieses Profils gehört zu einem Netzwerk, mit dem die Kommunikation auf dieser Seite ausgeschaltet wurde." + +#: include/follow.php:153 +msgid "" +"Limited profile. This person will be unable to receive direct/personal " +"notifications from you." +msgstr "Eingeschränktes Profil. Diese Person wird keine direkten/privaten Nachrichten von Dir erhalten können." + +#: include/follow.php:254 +msgid "Unable to retrieve contact information." +msgstr "Konnte die Kontaktinformationen nicht empfangen." + +#: include/follow.php:287 +msgid "following" +msgstr "folgen" + +#: include/identity.php:42 +msgid "Requested account is not available." +msgstr "Das angefragte Profil ist nicht vorhanden." + +#: include/identity.php:51 mod/profile.php:21 +msgid "Requested profile is not available." +msgstr "Das angefragte Profil ist nicht vorhanden." + +#: include/identity.php:95 include/identity.php:305 include/identity.php:686 +msgid "Edit profile" +msgstr "Profil bearbeiten" + +#: include/identity.php:245 +msgid "Atom feed" +msgstr "Atom-Feed" + +#: include/identity.php:276 +msgid "Manage/edit profiles" +msgstr "Profile verwalten/editieren" + +#: include/identity.php:281 include/identity.php:307 mod/profiles.php:787 +msgid "Change profile photo" +msgstr "Profilbild ändern" + +#: include/identity.php:282 mod/profiles.php:788 +msgid "Create New Profile" +msgstr "Neues Profil anlegen" + +#: include/identity.php:292 mod/profiles.php:777 +msgid "Profile Image" +msgstr "Profilbild" + +#: include/identity.php:295 mod/profiles.php:779 +msgid "visible to everybody" +msgstr "sichtbar für jeden" + +#: include/identity.php:296 mod/profiles.php:684 mod/profiles.php:780 +msgid "Edit visibility" +msgstr "Sichtbarkeit bearbeiten" + +#: include/identity.php:319 mod/directory.php:174 mod/match.php:84 +#: mod/viewcontacts.php:105 mod/allfriends.php:79 mod/cal.php:44 +#: mod/suggest.php:98 mod/hovercard.php:80 mod/common.php:123 +#: mod/network.php:517 mod/contacts.php:51 mod/contacts.php:626 +#: mod/contacts.php:953 mod/dirfind.php:223 mod/photos.php:42 +#: mod/videos.php:37 +msgid "Forum" +msgstr "Forum" + +#: include/identity.php:331 include/identity.php:614 mod/directory.php:147 +#: mod/notifications.php:214 +msgid "Gender:" +msgstr "Geschlecht:" + +#: include/identity.php:334 include/identity.php:634 mod/directory.php:149 +msgid "Status:" +msgstr "Status:" + +#: include/identity.php:336 include/identity.php:645 mod/directory.php:151 +msgid "Homepage:" +msgstr "Homepage:" + +#: include/identity.php:338 include/identity.php:655 mod/directory.php:153 +#: mod/notifications.php:210 mod/contacts.php:630 +msgid "About:" +msgstr "Über:" + +#: include/identity.php:420 mod/notifications.php:222 mod/contacts.php:50 +msgid "Network:" +msgstr "Netzwerk:" + +#: include/identity.php:449 include/identity.php:533 +msgid "g A l F d" +msgstr "l, d. F G \\U\\h\\r" + +#: include/identity.php:450 include/identity.php:534 +msgid "F d" +msgstr "d. F" + +#: include/identity.php:495 include/identity.php:580 +msgid "[today]" +msgstr "[heute]" + +#: include/identity.php:507 +msgid "Birthday Reminders" +msgstr "Geburtstagserinnerungen" + +#: include/identity.php:508 +msgid "Birthdays this week:" +msgstr "Geburtstage diese Woche:" + +#: include/identity.php:567 +msgid "[No description]" +msgstr "[keine Beschreibung]" + +#: include/identity.php:591 +msgid "Event Reminders" +msgstr "Veranstaltungserinnerungen" + +#: include/identity.php:592 +msgid "Events this week:" +msgstr "Veranstaltungen diese Woche" + +#: include/identity.php:612 mod/settings.php:1229 +msgid "Full Name:" +msgstr "Kompletter Name:" + +#: include/identity.php:619 +msgid "j F, Y" +msgstr "j F, Y" + +#: include/identity.php:620 +msgid "j F" +msgstr "j F" + +#: include/identity.php:631 +msgid "Age:" +msgstr "Alter:" + +#: include/identity.php:640 +#, php-format +msgid "for %1$d %2$s" +msgstr "für %1$d %2$s" + +#: include/identity.php:643 mod/profiles.php:703 +msgid "Sexual Preference:" +msgstr "Sexuelle Vorlieben:" + +#: include/identity.php:647 mod/profiles.php:729 +msgid "Hometown:" +msgstr "Heimatort:" + +#: include/identity.php:649 mod/follow.php:134 mod/notifications.php:212 +#: mod/contacts.php:632 +msgid "Tags:" +msgstr "Tags:" + +#: include/identity.php:651 mod/profiles.php:730 +msgid "Political Views:" +msgstr "Politische Ansichten:" + +#: include/identity.php:653 +msgid "Religion:" +msgstr "Religion:" + +#: include/identity.php:657 +msgid "Hobbies/Interests:" +msgstr "Hobbies/Interessen:" + +#: include/identity.php:659 mod/profiles.php:734 +msgid "Likes:" +msgstr "Likes:" + +#: include/identity.php:661 mod/profiles.php:735 +msgid "Dislikes:" +msgstr "Dislikes:" + +#: include/identity.php:664 +msgid "Contact information and Social Networks:" +msgstr "Kontaktinformationen und Soziale Netzwerke:" + +#: include/identity.php:666 +msgid "Musical interests:" +msgstr "Musikalische Interessen:" + +#: include/identity.php:668 +msgid "Books, literature:" +msgstr "Literatur/Bücher:" + +#: include/identity.php:670 +msgid "Television:" +msgstr "Fernsehen:" + +#: include/identity.php:672 +msgid "Film/dance/culture/entertainment:" +msgstr "Filme/Tänze/Kultur/Unterhaltung:" + +#: include/identity.php:674 +msgid "Love/Romance:" +msgstr "Liebesleben:" + +#: include/identity.php:676 +msgid "Work/employment:" +msgstr "Arbeit/Beschäftigung:" + +#: include/identity.php:678 +msgid "School/education:" +msgstr "Schule/Ausbildung:" + +#: include/identity.php:682 +msgid "Forums:" +msgstr "Foren:" + +#: include/identity.php:690 mod/events.php:508 +msgid "Basic" +msgstr "Allgemein" + +#: include/identity.php:691 mod/admin.php:930 mod/contacts.php:868 +#: mod/events.php:509 +msgid "Advanced" +msgstr "Erweitert" + +#: include/identity.php:715 mod/follow.php:143 mod/contacts.php:834 +msgid "Status Messages and Posts" +msgstr "Statusnachrichten und Beiträge" + +#: include/identity.php:723 mod/contacts.php:842 +msgid "Profile Details" +msgstr "Profildetails" + +#: include/identity.php:731 mod/photos.php:100 +msgid "Photo Albums" +msgstr "Fotoalben" + +#: include/identity.php:770 mod/notes.php:46 +msgid "Personal Notes" +msgstr "Persönliche Notizen" + +#: include/identity.php:773 +msgid "Only You Can See This" +msgstr "Nur Du kannst das sehen" + +#: include/items.php:1447 mod/dfrn_request.php:745 mod/dfrn_confirm.php:726 +msgid "[Name Withheld]" +msgstr "[Name unterdrückt]" + +#: include/items.php:1805 mod/viewsrc.php:15 mod/display.php:104 +#: mod/display.php:279 mod/display.php:478 mod/notice.php:15 mod/admin.php:234 +#: mod/admin.php:1448 mod/admin.php:1682 +msgid "Item not found." +msgstr "Beitrag nicht gefunden." + +#: include/items.php:1844 +msgid "Do you really want to delete this item?" +msgstr "Möchtest Du wirklich dieses Item löschen?" + +#: include/items.php:1846 mod/follow.php:110 mod/suggest.php:29 +#: mod/api.php:105 mod/message.php:217 mod/dfrn_request.php:861 +#: mod/contacts.php:442 mod/profiles.php:641 mod/profiles.php:644 +#: mod/profiles.php:670 mod/register.php:238 mod/settings.php:1113 +#: mod/settings.php:1119 mod/settings.php:1127 mod/settings.php:1131 +#: mod/settings.php:1136 mod/settings.php:1142 mod/settings.php:1148 +#: mod/settings.php:1154 mod/settings.php:1180 mod/settings.php:1181 +#: mod/settings.php:1182 mod/settings.php:1183 mod/settings.php:1184 +msgid "Yes" +msgstr "Ja" + +#: include/items.php:2011 mod/wall_upload.php:77 mod/wall_upload.php:80 +#: mod/notes.php:22 mod/uimport.php:23 mod/nogroup.php:25 mod/invite.php:15 +#: mod/invite.php:101 mod/viewcontacts.php:45 mod/wall_attach.php:67 +#: mod/wall_attach.php:70 mod/allfriends.php:12 mod/cal.php:308 +#: mod/repair_ostatus.php:9 mod/delegate.php:12 mod/attach.php:33 +#: mod/follow.php:11 mod/follow.php:73 mod/follow.php:155 mod/suggest.php:58 +#: mod/display.php:474 mod/common.php:18 mod/editpost.php:10 mod/network.php:4 +#: mod/group.php:19 mod/wallmessage.php:9 mod/wallmessage.php:33 +#: mod/wallmessage.php:79 mod/wallmessage.php:103 mod/api.php:26 +#: mod/api.php:31 mod/ostatus_subscribe.php:9 mod/message.php:46 +#: mod/message.php:182 mod/manage.php:96 mod/crepair.php:100 +#: mod/notifications.php:65 mod/contacts.php:350 mod/dfrn_confirm.php:57 +#: mod/dirfind.php:11 mod/events.php:190 mod/fsuggest.php:78 mod/item.php:185 +#: mod/item.php:197 mod/mood.php:114 mod/photos.php:172 mod/photos.php:1093 +#: mod/poke.php:150 mod/profile_photo.php:19 mod/profile_photo.php:175 +#: mod/profile_photo.php:186 mod/profile_photo.php:199 mod/profiles.php:166 +#: mod/profiles.php:598 mod/register.php:42 mod/regmod.php:110 +#: mod/settings.php:22 mod/settings.php:128 mod/settings.php:650 index.php:397 +msgid "Permission denied." +msgstr "Zugriff verweigert." + +#: include/items.php:2116 +msgid "Archives" +msgstr "Archiv" + +#: include/like.php:186 +#, 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:188 +#, 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:190 +#, php-format +msgid "%1$s may attend %2$s's %3$s" +msgstr "%1$s nimmt eventuell an %2$ss %3$s teil." + +#: include/message.php:15 include/message.php:173 +msgid "[no subject]" +msgstr "[kein Betreff]" + +#: include/plugin.php:526 include/plugin.php:528 +msgid "Click here to upgrade." +msgstr "Zum Upgraden hier klicken." + +#: include/plugin.php:534 +msgid "This action exceeds the limits set by your subscription plan." +msgstr "Diese Aktion überschreitet die Obergrenze Deines Abonnements." + +#: include/plugin.php:539 +msgid "This action is not available under your subscription plan." +msgstr "Diese Aktion ist in Deinem Abonnement nicht verfügbar." + +#: include/text.php:304 +msgid "newer" +msgstr "neuer" + +#: include/text.php:306 +msgid "older" +msgstr "älter" + +#: include/text.php:311 +msgid "prev" +msgstr "vorige" + +#: include/text.php:313 +msgid "first" +msgstr "erste" + +#: include/text.php:345 +msgid "last" +msgstr "letzte" + +#: include/text.php:348 +msgid "next" +msgstr "nächste" + +#: include/text.php:403 +msgid "Loading more entries..." +msgstr "lade weitere Einträge..." + +#: include/text.php:404 +msgid "The end" +msgstr "Das Ende" + +#: include/text.php:871 +msgid "No contacts" +msgstr "Keine Kontakte" + +#: include/text.php:894 +#, php-format +msgid "%d Contact" +msgid_plural "%d Contacts" +msgstr[0] "%d Kontakt" +msgstr[1] "%d Kontakte" + +#: include/text.php:907 +msgid "View Contacts" +msgstr "Kontakte anzeigen" + +#: include/text.php:995 mod/notes.php:61 mod/filer.php:31 mod/editpost.php:109 +msgid "Save" +msgstr "Speichern" + +#: include/text.php:1058 +msgid "poke" +msgstr "anstupsen" + +#: include/text.php:1058 +msgid "poked" +msgstr "stupste" + +#: include/text.php:1059 +msgid "ping" +msgstr "anpingen" + +#: include/text.php:1059 +msgid "pinged" +msgstr "pingte" + +#: include/text.php:1060 +msgid "prod" +msgstr "knuffen" + +#: include/text.php:1060 +msgid "prodded" +msgstr "knuffte" + +#: include/text.php:1061 +msgid "slap" +msgstr "ohrfeigen" + +#: include/text.php:1061 +msgid "slapped" +msgstr "ohrfeigte" + +#: include/text.php:1062 +msgid "finger" +msgstr "befummeln" + +#: include/text.php:1062 +msgid "fingered" +msgstr "befummelte" + +#: include/text.php:1063 +msgid "rebuff" +msgstr "eine Abfuhr erteilen" + +#: include/text.php:1063 +msgid "rebuffed" +msgstr "abfuhrerteilte" + +#: include/text.php:1077 +msgid "happy" +msgstr "glücklich" + +#: include/text.php:1078 +msgid "sad" +msgstr "traurig" + +#: include/text.php:1079 +msgid "mellow" +msgstr "sanft" + +#: include/text.php:1080 +msgid "tired" +msgstr "müde" + +#: include/text.php:1081 +msgid "perky" +msgstr "frech" + +#: include/text.php:1082 +msgid "angry" +msgstr "sauer" + +#: include/text.php:1083 +msgid "stupified" +msgstr "verblüfft" + +#: include/text.php:1084 +msgid "puzzled" +msgstr "verwirrt" + +#: include/text.php:1085 +msgid "interested" +msgstr "interessiert" + +#: include/text.php:1086 +msgid "bitter" +msgstr "verbittert" + +#: include/text.php:1087 +msgid "cheerful" +msgstr "fröhlich" + +#: include/text.php:1088 +msgid "alive" +msgstr "lebendig" + +#: include/text.php:1089 +msgid "annoyed" +msgstr "verärgert" + +#: include/text.php:1090 +msgid "anxious" +msgstr "unruhig" + +#: include/text.php:1091 +msgid "cranky" +msgstr "schrullig" + +#: include/text.php:1092 +msgid "disturbed" +msgstr "verstört" + +#: include/text.php:1093 +msgid "frustrated" +msgstr "frustriert" + +#: include/text.php:1094 +msgid "motivated" +msgstr "motiviert" + +#: include/text.php:1095 +msgid "relaxed" +msgstr "entspannt" + +#: include/text.php:1096 +msgid "surprised" +msgstr "überrascht" + +#: include/text.php:1310 mod/videos.php:383 +msgid "View Video" +msgstr "Video ansehen" + +#: include/text.php:1342 +msgid "bytes" +msgstr "Byte" + +#: include/text.php:1374 include/text.php:1386 +msgid "Click to open/close" +msgstr "Zum öffnen/schließen klicken" + +#: include/text.php:1512 +msgid "View on separate page" +msgstr "Auf separater Seite ansehen" + +#: include/text.php:1513 +msgid "view on separate page" +msgstr "auf separater Seite ansehen" + +#: include/text.php:1792 +msgid "activity" +msgstr "Aktivität" + +#: include/text.php:1794 mod/content.php:623 object/Item.php:431 +#: object/Item.php:444 +msgid "comment" +msgid_plural "comments" +msgstr[0] "Kommentar" +msgstr[1] "Kommentare" + +#: include/text.php:1795 +msgid "post" +msgstr "Beitrag" + +#: include/text.php:1963 +msgid "Item filed" +msgstr "Beitrag abgelegt" + +#: include/uimport.php:94 +msgid "Error decoding account file" +msgstr "Fehler beim Verarbeiten der Account Datei" + +#: include/uimport.php:100 +msgid "Error! No version data in file! This is not a Friendica account file?" +msgstr "Fehler! Keine Versionsdaten in der Datei! Ist das wirklich eine Friendica Account Datei?" + +#: include/uimport.php:116 include/uimport.php:127 +msgid "Error! Cannot check nickname" +msgstr "Fehler! Konnte den Nickname nicht überprüfen." + +#: include/uimport.php:120 include/uimport.php:131 +#, php-format +msgid "User '%s' already exists on this server!" +msgstr "Nutzer '%s' existiert bereits auf diesem Server!" + +#: include/uimport.php:153 +msgid "User creation error" +msgstr "Fehler beim Anlegen des Nutzeraccounts aufgetreten" + +#: include/uimport.php:173 +msgid "User profile creation error" +msgstr "Fehler beim Anlegen des Nutzerkontos" + +#: include/uimport.php:222 +#, php-format +msgid "%d contact not imported" +msgid_plural "%d contacts not imported" +msgstr[0] "%d Kontakt nicht importiert" +msgstr[1] "%d Kontakte nicht importiert" + +#: include/uimport.php:292 +msgid "Done. You can now login with your username and password" +msgstr "Erledigt. Du kannst Dich jetzt mit Deinem Nutzernamen und Passwort anmelden" #: mod/oexchange.php:25 msgid "Post successful." @@ -3031,20 +3018,6 @@ msgstr "Beitrag erfolgreich veröffentlicht." msgid "[Embedded content - reload page to view]" msgstr "[Eingebetteter Inhalt - Seite neu laden zum Betrachten]" -#: mod/dirfind.php:36 -#, php-format -msgid "People Search - %s" -msgstr "Personensuche - %s" - -#: mod/dirfind.php:47 -#, php-format -msgid "Forum Search - %s" -msgstr "Forensuche - %s" - -#: mod/dirfind.php:240 mod/match.php:107 -msgid "No matches" -msgstr "Keine Übereinstimmungen" - #: mod/viewsrc.php:7 msgid "Access denied." msgstr "Zugriff verweigert." @@ -3067,8 +3040,8 @@ msgid "Remove term" msgstr "Begriff entfernen" #: mod/search.php:93 mod/search.php:99 mod/directory.php:37 -#: mod/viewcontacts.php:35 mod/videos.php:197 mod/display.php:199 -#: mod/community.php:22 mod/dfrn_request.php:790 mod/photos.php:964 +#: mod/viewcontacts.php:35 mod/display.php:199 mod/community.php:22 +#: mod/dfrn_request.php:790 mod/photos.php:964 mod/videos.php:197 msgid "Public access denied." msgstr "Öffentlicher Zugriff verweigert." @@ -3186,7 +3159,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:1635 +#: mod/lostpass.php:109 boot.php:1667 msgid "Password Reset" msgstr "Passwort zurücksetzen" @@ -3252,7 +3225,7 @@ msgid "" "your email for further instructions." msgstr "Gib Deine E-Mail-Adresse an und fordere ein neues Passwort an. Es werden Dir dann weitere Informationen per Mail zugesendet." -#: mod/lostpass.php:161 boot.php:1623 +#: mod/lostpass.php:161 boot.php:1655 msgid "Nickname or Email: " msgstr "Spitzname oder E-Mail:" @@ -3283,51 +3256,19 @@ msgstr "Seite nicht gefunden." msgid "Invalid request." msgstr "Ungültige Anfrage" -#: mod/wall_upload.php:151 mod/profile_photo.php:150 mod/photos.php:806 +#: mod/wall_upload.php:151 mod/photos.php:806 mod/profile_photo.php:150 #, php-format msgid "Image exceeds size limit of %s" msgstr "Bildgröße überschreitet das Limit von %s" -#: mod/wall_upload.php:188 mod/profile_photo.php:159 mod/photos.php:846 +#: mod/wall_upload.php:188 mod/photos.php:846 mod/profile_photo.php:159 msgid "Unable to process image." msgstr "Konnte das Bild nicht bearbeiten." -#: mod/wall_upload.php:221 mod/profile_photo.php:307 mod/photos.php:873 +#: mod/wall_upload.php:221 mod/photos.php:873 mod/profile_photo.php:307 msgid "Image upload failed." msgstr "Hochladen des Bildes gescheitert." -#: mod/fsuggest.php:20 mod/fsuggest.php:92 mod/crepair.php:114 -#: mod/dfrn_confirm.php:122 -msgid "Contact not found." -msgstr "Kontakt nicht gefunden." - -#: mod/fsuggest.php:63 -msgid "Friend suggestion sent." -msgstr "Kontaktvorschlag gesendet." - -#: mod/fsuggest.php:97 -msgid "Suggest Friends" -msgstr "Kontakte vorschlagen" - -#: mod/fsuggest.php:99 -#, php-format -msgid "Suggest a friend for %s" -msgstr "Schlage %s einen Kontakt vor" - -#: mod/fsuggest.php:107 mod/events.php:507 mod/invite.php:140 mod/poke.php:199 -#: mod/install.php:272 mod/install.php:312 mod/mood.php:137 -#: mod/localtime.php:45 mod/message.php:357 mod/message.php:547 -#: mod/manage.php:143 mod/contacts.php:577 mod/crepair.php:154 -#: mod/photos.php:1125 mod/photos.php:1249 mod/photos.php:1567 -#: mod/photos.php:1618 mod/photos.php:1666 mod/photos.php:1754 -#: mod/profiles.php:682 mod/content.php:728 object/Item.php:720 -#: view/theme/frio/config.php:59 view/theme/cleanzero/config.php:80 -#: view/theme/quattro/config.php:64 view/theme/dispy/config.php:70 -#: view/theme/vier/config.php:107 view/theme/diabook/theme.php:633 -#: view/theme/diabook/config.php:148 view/theme/duepuntozero/config.php:59 -msgid "Submit" -msgstr "Senden" - #: mod/lockview.php:31 mod/lockview.php:39 msgid "Remote privacy information not available." msgstr "Entfernte Privatsphäreneinstellungen nicht verfügbar." @@ -3336,70 +3277,6 @@ msgstr "Entfernte Privatsphäreneinstellungen nicht verfügbar." msgid "Visible to:" msgstr "Sichtbar für:" -#: mod/events.php:95 mod/events.php:97 -msgid "Event can not end before it has started." -msgstr "Die Veranstaltung kann nicht enden bevor sie beginnt." - -#: mod/events.php:104 mod/events.php:106 -msgid "Event title and start time are required." -msgstr "Der Veranstaltungstitel und die Anfangszeit müssen angegeben werden." - -#: mod/events.php:380 mod/cal.php:279 -msgid "View" -msgstr "Ansehen" - -#: mod/events.php:381 -msgid "Create New Event" -msgstr "Neue Veranstaltung erstellen" - -#: mod/events.php:382 mod/cal.php:280 -msgid "Previous" -msgstr "Vorherige" - -#: mod/events.php:383 mod/cal.php:281 mod/install.php:231 -msgid "Next" -msgstr "Nächste" - -#: mod/events.php:483 -msgid "Event details" -msgstr "Veranstaltungsdetails" - -#: mod/events.php:484 -msgid "Starting date and Title are required." -msgstr "Anfangszeitpunkt und Titel werden benötigt" - -#: mod/events.php:485 mod/events.php:486 -msgid "Event Starts:" -msgstr "Veranstaltungsbeginn:" - -#: mod/events.php:485 mod/events.php:497 mod/profiles.php:710 -msgid "Required" -msgstr "Benötigt" - -#: mod/events.php:487 mod/events.php:503 -msgid "Finish date/time is not known or not relevant" -msgstr "Enddatum/-zeit ist nicht bekannt oder nicht relevant" - -#: mod/events.php:489 mod/events.php:490 -msgid "Event Finishes:" -msgstr "Veranstaltungsende:" - -#: mod/events.php:491 mod/events.php:504 -msgid "Adjust for viewer timezone" -msgstr "An Zeitzone des Betrachters anpassen" - -#: mod/events.php:493 -msgid "Description:" -msgstr "Beschreibung" - -#: mod/events.php:497 mod/events.php:499 -msgid "Title:" -msgstr "Titel:" - -#: mod/events.php:500 mod/events.php:501 -msgid "Share this event" -msgstr "Veranstaltung teilen" - #: mod/directory.php:205 view/theme/vier/theme.php:201 #: view/theme/diabook/theme.php:525 msgid "Global Directory" @@ -3497,6 +3374,10 @@ msgstr "ist interessiert an:" msgid "Profile Match" msgstr "Profilübereinstimmungen" +#: mod/match.php:107 mod/dirfind.php:240 +msgid "No matches" +msgstr "Keine Übereinstimmungen" + #: mod/uexport.php:29 msgid "Export account" msgstr "Account exportieren" @@ -3619,6 +3500,21 @@ msgid "" "important, please visit http://friendica.com" msgstr "Für weitere Informationen über das Friendica Projekt und warum wir es für ein wichtiges Projekt halten, besuche bitte http://friendica.com" +#: mod/invite.php:140 mod/install.php:272 mod/install.php:312 +#: mod/localtime.php:45 mod/message.php:357 mod/message.php:547 +#: mod/manage.php:143 mod/crepair.php:154 mod/content.php:728 +#: mod/contacts.php:577 mod/events.php:507 mod/fsuggest.php:107 +#: mod/mood.php:137 mod/photos.php:1125 mod/photos.php:1249 +#: mod/photos.php:1567 mod/photos.php:1618 mod/photos.php:1666 +#: mod/photos.php:1754 mod/poke.php:199 mod/profiles.php:681 +#: object/Item.php:720 view/theme/frio/config.php:59 +#: view/theme/cleanzero/config.php:80 view/theme/quattro/config.php:64 +#: view/theme/dispy/config.php:70 view/theme/vier/config.php:107 +#: view/theme/diabook/theme.php:633 view/theme/diabook/config.php:148 +#: view/theme/duepuntozero/config.php:59 +msgid "Submit" +msgstr "Senden" + #: mod/fbrowser.php:41 mod/fbrowser.php:62 mod/photos.php:63 #: mod/photos.php:193 mod/photos.php:1107 mod/photos.php:1233 #: mod/photos.php:1256 mod/photos.php:1826 mod/photos.php:1838 @@ -3690,1375 +3586,6 @@ msgstr "{0} schickte Dir eine Nachricht" msgid "{0} requested registration" msgstr "{0} möchte sich registrieren" -#: mod/admin.php:92 -msgid "Theme settings updated." -msgstr "Themeneinstellungen aktualisiert." - -#: mod/admin.php:156 mod/admin.php:923 -msgid "Site" -msgstr "Seite" - -#: mod/admin.php:157 mod/admin.php:867 mod/admin.php:1379 mod/admin.php:1394 -msgid "Users" -msgstr "Nutzer" - -#: mod/admin.php:158 mod/admin.php:1496 mod/admin.php:1556 mod/settings.php:74 -msgid "Plugins" -msgstr "Plugins" - -#: mod/admin.php:159 mod/admin.php:1754 mod/admin.php:1804 -msgid "Themes" -msgstr "Themen" - -#: mod/admin.php:160 mod/settings.php:52 -msgid "Additional features" -msgstr "Zusätzliche Features" - -#: mod/admin.php:161 -msgid "DB updates" -msgstr "DB Updates" - -#: mod/admin.php:162 mod/admin.php:397 -msgid "Inspect Queue" -msgstr "Warteschlange Inspizieren" - -#: mod/admin.php:163 mod/admin.php:363 -msgid "Federation Statistics" -msgstr "Federation Statistik" - -#: mod/admin.php:177 mod/admin.php:188 mod/admin.php:1872 -msgid "Logs" -msgstr "Protokolle" - -#: mod/admin.php:178 mod/admin.php:1939 -msgid "View Logs" -msgstr "Protokolle anzeigen" - -#: mod/admin.php:179 -msgid "probe address" -msgstr "Adresse untersuchen" - -#: mod/admin.php:180 -msgid "check webfinger" -msgstr "Webfinger überprüfen" - -#: mod/admin.php:187 -msgid "Plugin Features" -msgstr "Plugin Features" - -#: mod/admin.php:189 -msgid "diagnostics" -msgstr "Diagnose" - -#: mod/admin.php:190 -msgid "User registrations waiting for confirmation" -msgstr "Nutzeranmeldungen die auf Bestätigung warten" - -#: mod/admin.php:356 -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:357 -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:362 mod/admin.php:396 mod/admin.php:460 mod/admin.php:922 -#: mod/admin.php:1378 mod/admin.php:1495 mod/admin.php:1555 mod/admin.php:1753 -#: mod/admin.php:1803 mod/admin.php:1871 mod/admin.php:1938 -msgid "Administration" -msgstr "Administration" - -#: mod/admin.php:369 -#, php-format -msgid "Currently this node is aware of %d nodes from the following platforms:" -msgstr "Momentan kennt dieser Knoten %d andere Knoten der folgenden Plattformen:" - -#: mod/admin.php:399 -msgid "ID" -msgstr "ID" - -#: mod/admin.php:400 -msgid "Recipient Name" -msgstr "Empfänger Name" - -#: mod/admin.php:401 -msgid "Recipient Profile" -msgstr "Empfänger Profil" - -#: mod/admin.php:403 -msgid "Created" -msgstr "Erstellt" - -#: mod/admin.php:404 -msgid "Last Tried" -msgstr "Zuletzt versucht" - -#: mod/admin.php:405 -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:424 mod/admin.php:1327 -msgid "Normal Account" -msgstr "Normales Konto" - -#: mod/admin.php:425 mod/admin.php:1328 -msgid "Soapbox Account" -msgstr "Marktschreier-Konto" - -#: mod/admin.php:426 mod/admin.php:1329 -msgid "Community/Celebrity Account" -msgstr "Forum/Promi-Konto" - -#: mod/admin.php:427 mod/admin.php:1330 -msgid "Automatic Friend Account" -msgstr "Automatisches Freundekonto" - -#: mod/admin.php:428 -msgid "Blog Account" -msgstr "Blog-Konto" - -#: mod/admin.php:429 -msgid "Private Forum" -msgstr "Privates Forum" - -#: mod/admin.php:455 -msgid "Message queues" -msgstr "Nachrichten-Warteschlangen" - -#: mod/admin.php:461 -msgid "Summary" -msgstr "Zusammenfassung" - -#: mod/admin.php:463 -msgid "Registered users" -msgstr "Registrierte Nutzer" - -#: mod/admin.php:465 -msgid "Pending registrations" -msgstr "Anstehende Anmeldungen" - -#: mod/admin.php:466 -msgid "Version" -msgstr "Version" - -#: mod/admin.php:471 -msgid "Active plugins" -msgstr "Aktive Plugins" - -#: mod/admin.php:494 -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:795 -msgid "RINO2 needs mcrypt php extension to work." -msgstr "RINO2 benötigt die PHP Extension mcrypt." - -#: mod/admin.php:803 -msgid "Site settings updated." -msgstr "Seiteneinstellungen aktualisiert." - -#: mod/admin.php:831 mod/settings.php:919 -msgid "No special theme for mobile devices" -msgstr "Kein spezielles Theme für mobile Geräte verwenden." - -#: mod/admin.php:850 -msgid "No community page" -msgstr "Keine Gemeinschaftsseite" - -#: mod/admin.php:851 -msgid "Public postings from users of this site" -msgstr "Öffentliche Beiträge von Nutzer_innen dieser Seite" - -#: mod/admin.php:852 -msgid "Global community page" -msgstr "Globale Gemeinschaftsseite" - -#: mod/admin.php:857 mod/contacts.php:530 -msgid "Never" -msgstr "Niemals" - -#: mod/admin.php:858 -msgid "At post arrival" -msgstr "Beim Empfang von Nachrichten" - -#: mod/admin.php:866 mod/contacts.php:557 -msgid "Disabled" -msgstr "Deaktiviert" - -#: mod/admin.php:868 -msgid "Users, Global Contacts" -msgstr "Nutzer, globale Kontakte" - -#: mod/admin.php:869 -msgid "Users, Global Contacts/fallback" -msgstr "Nutzer, globale Kontakte / Fallback" - -#: mod/admin.php:873 -msgid "One month" -msgstr "ein Monat" - -#: mod/admin.php:874 -msgid "Three months" -msgstr "drei Monate" - -#: mod/admin.php:875 -msgid "Half a year" -msgstr "ein halbes Jahr" - -#: mod/admin.php:876 -msgid "One year" -msgstr "ein Jahr" - -#: mod/admin.php:881 -msgid "Multi user instance" -msgstr "Mehrbenutzer Instanz" - -#: mod/admin.php:904 -msgid "Closed" -msgstr "Geschlossen" - -#: mod/admin.php:905 -msgid "Requires approval" -msgstr "Bedarf der Zustimmung" - -#: mod/admin.php:906 -msgid "Open" -msgstr "Offen" - -#: mod/admin.php:910 -msgid "No SSL policy, links will track page SSL state" -msgstr "Keine SSL Richtlinie, Links werden das verwendete Protokoll beibehalten" - -#: mod/admin.php:911 -msgid "Force all links to use SSL" -msgstr "SSL für alle Links erzwingen" - -#: mod/admin.php:912 -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:924 mod/admin.php:1557 mod/admin.php:1805 mod/admin.php:1873 -#: mod/admin.php:2022 mod/settings.php:663 mod/settings.php:773 -#: mod/settings.php:820 mod/settings.php:889 mod/settings.php:976 -#: mod/settings.php:1214 -msgid "Save Settings" -msgstr "Einstellungen speichern" - -#: mod/admin.php:925 mod/register.php:263 -msgid "Registration" -msgstr "Registrierung" - -#: mod/admin.php:926 -msgid "File upload" -msgstr "Datei hochladen" - -#: mod/admin.php:927 -msgid "Policies" -msgstr "Regeln" - -#: mod/admin.php:929 -msgid "Auto Discovered Contact Directory" -msgstr "Automatisch ein Kontaktverzeichnis erstellen" - -#: mod/admin.php:930 -msgid "Performance" -msgstr "Performance" - -#: mod/admin.php:931 -msgid "Worker" -msgstr "Worker" - -#: mod/admin.php:932 -msgid "" -"Relocate - WARNING: advanced function. Could make this server unreachable." -msgstr "Umsiedeln - WARNUNG: Könnte diesen Server unerreichbar machen." - -#: mod/admin.php:935 -msgid "Site name" -msgstr "Seitenname" - -#: mod/admin.php:936 -msgid "Host name" -msgstr "Host Name" - -#: mod/admin.php:937 -msgid "Sender Email" -msgstr "Absender für Emails" - -#: mod/admin.php:937 -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:938 -msgid "Banner/Logo" -msgstr "Banner/Logo" - -#: mod/admin.php:939 -msgid "Shortcut icon" -msgstr "Shortcut Icon" - -#: mod/admin.php:939 -msgid "Link to an icon that will be used for browsers." -msgstr "Link zu einem Icon, das Browser verwenden werden." - -#: mod/admin.php:940 -msgid "Touch icon" -msgstr "Touch Icon" - -#: mod/admin.php:940 -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:941 -msgid "Additional Info" -msgstr "Zusätzliche Informationen" - -#: mod/admin.php:941 -#, 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:942 -msgid "System language" -msgstr "Systemsprache" - -#: mod/admin.php:943 -msgid "System theme" -msgstr "Systemweites Theme" - -#: mod/admin.php:943 -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:944 -msgid "Mobile system theme" -msgstr "Systemweites mobiles Theme" - -#: mod/admin.php:944 -msgid "Theme for mobile devices" -msgstr "Thema für mobile Geräte" - -#: mod/admin.php:945 -msgid "SSL link policy" -msgstr "Regeln für SSL Links" - -#: mod/admin.php:945 -msgid "Determines whether generated links should be forced to use SSL" -msgstr "Bestimmt, ob generierte Links SSL verwenden müssen" - -#: mod/admin.php:946 -msgid "Force SSL" -msgstr "Erzwinge SSL" - -#: mod/admin.php:946 -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:947 -msgid "Old style 'Share'" -msgstr "Altes \"Teilen\" Element" - -#: mod/admin.php:947 -msgid "Deactivates the bbcode element 'share' for repeating items." -msgstr "Deaktiviert das BBCode Element \"share\" beim Wiederholen von Beiträgen." - -#: mod/admin.php:948 -msgid "Hide help entry from navigation menu" -msgstr "Verberge den Menüeintrag für die Hilfe im Navigationsmenü" - -#: mod/admin.php:948 -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:949 -msgid "Single user instance" -msgstr "Ein-Nutzer Instanz" - -#: mod/admin.php:949 -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:950 -msgid "Maximum image size" -msgstr "Maximale Bildgröße" - -#: mod/admin.php:950 -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:951 -msgid "Maximum image length" -msgstr "Maximale Bildlänge" - -#: mod/admin.php:951 -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:952 -msgid "JPEG image quality" -msgstr "Qualität des JPEG Bildes" - -#: mod/admin.php:952 -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:954 -msgid "Register policy" -msgstr "Registrierungsmethode" - -#: mod/admin.php:955 -msgid "Maximum Daily Registrations" -msgstr "Maximum täglicher Registrierungen" - -#: mod/admin.php:955 -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:956 -msgid "Register text" -msgstr "Registrierungstext" - -#: mod/admin.php:956 -msgid "Will be displayed prominently on the registration page." -msgstr "Wird gut sichtbar auf der Registrierungsseite angezeigt." - -#: mod/admin.php:957 -msgid "Accounts abandoned after x days" -msgstr "Nutzerkonten gelten nach x Tagen als unbenutzt" - -#: mod/admin.php:957 -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:958 -msgid "Allowed friend domains" -msgstr "Erlaubte Domains für Kontakte" - -#: mod/admin.php:958 -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 Kontakte erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben." - -#: mod/admin.php:959 -msgid "Allowed email domains" -msgstr "Erlaubte Domains für E-Mails" - -#: mod/admin.php:959 -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:960 -msgid "Block public" -msgstr "Öffentlichen Zugriff blockieren" - -#: mod/admin.php:960 -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:961 -msgid "Force publish" -msgstr "Erzwinge Veröffentlichung" - -#: mod/admin.php:961 -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:962 -msgid "Global directory URL" -msgstr "URL des weltweiten Verzeichnisses" - -#: mod/admin.php:962 -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:963 -msgid "Allow threaded items" -msgstr "Erlaube Threads in Diskussionen" - -#: mod/admin.php:963 -msgid "Allow infinite level threading for items on this site." -msgstr "Erlaube ein unendliches Level für Threads auf dieser Seite." - -#: mod/admin.php:964 -msgid "Private posts by default for new users" -msgstr "Private Beiträge als Standard für neue Nutzer" - -#: mod/admin.php:964 -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:965 -msgid "Don't include post content in email notifications" -msgstr "Inhalte von Beiträgen nicht in E-Mail-Benachrichtigungen versenden" - -#: mod/admin.php:965 -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:966 -msgid "Disallow public access to addons listed in the apps menu." -msgstr "Öffentlichen Zugriff auf Addons im Apps Menü verbieten." - -#: mod/admin.php:966 -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:967 -msgid "Don't embed private images in posts" -msgstr "Private Bilder nicht in Beiträgen einbetten." - -#: mod/admin.php:967 -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 " -"photos will have to authenticate and load each image, which may take a " -"while." -msgstr "Ersetze lokal gehostete private Fotos in Beiträgen nicht mit einer eingebetteten Kopie des Bildes. Dies bedeutet, dass Kontakte, die Beiträge mit privaten Fotos erhalten sich zunächst auf den jeweiligen Servern authentifizieren müssen bevor die Bilder geladen und angezeigt werden, was eine gewisse Zeit dauert." - -#: mod/admin.php:968 -msgid "Allow Users to set remote_self" -msgstr "Nutzern erlauben das remote_self Flag zu setzen" - -#: mod/admin.php:968 -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:969 -msgid "Block multiple registrations" -msgstr "Unterbinde Mehrfachregistrierung" - -#: mod/admin.php:969 -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:970 -msgid "OpenID support" -msgstr "OpenID Unterstützung" - -#: mod/admin.php:970 -msgid "OpenID support for registration and logins." -msgstr "OpenID-Unterstützung für Registrierung und Login." - -#: mod/admin.php:971 -msgid "Fullname check" -msgstr "Namen auf Vollständigkeit überprüfen" - -#: mod/admin.php:971 -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:972 -msgid "UTF-8 Regular expressions" -msgstr "UTF-8 Reguläre Ausdrücke" - -#: mod/admin.php:972 -msgid "Use PHP UTF8 regular expressions" -msgstr "PHP UTF8 Ausdrücke verwenden" - -#: mod/admin.php:973 -msgid "Community Page Style" -msgstr "Art der Gemeinschaftsseite" - -#: mod/admin.php:973 -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:974 -msgid "Posts per user on community page" -msgstr "Anzahl der Beiträge pro Benutzer auf der Gemeinschaftsseite" - -#: mod/admin.php:974 -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:975 -msgid "Enable OStatus support" -msgstr "OStatus Unterstützung aktivieren" - -#: mod/admin.php:975 -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:976 -msgid "OStatus conversation completion interval" -msgstr "Intervall zum Vervollständigen von OStatus Unterhaltungen" - -#: mod/admin.php:976 -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:977 -msgid "Only import OStatus threads from our contacts" -msgstr "Nur OStatus Konversationen unserer Kontakte importieren" - -#: mod/admin.php:977 -msgid "" -"Normally we import every content from our OStatus contacts. With this option" -" we only store threads that are started by a contact that is known on our " -"system." -msgstr "Normalerweise werden alle Inhalte von OStatus Kontakten importiert. Mit dieser Option werden nur solche Konversationen gespeichert, die von Kontakten der Nutzer dieses Knotens gestartet wurden." - -#: mod/admin.php:978 -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:980 -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:981 -msgid "Enable Diaspora support" -msgstr "Diaspora Unterstützung aktivieren" - -#: mod/admin.php:981 -msgid "Provide built-in Diaspora network compatibility." -msgstr "Verwende die eingebaute Diaspora-Verknüpfung." - -#: mod/admin.php:982 -msgid "Only allow Friendica contacts" -msgstr "Nur Friendica-Kontakte erlauben" - -#: mod/admin.php:982 -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:983 -msgid "Verify SSL" -msgstr "SSL Überprüfen" - -#: mod/admin.php:983 -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:984 -msgid "Proxy user" -msgstr "Proxy Nutzer" - -#: mod/admin.php:985 -msgid "Proxy URL" -msgstr "Proxy URL" - -#: mod/admin.php:986 -msgid "Network timeout" -msgstr "Netzwerk Wartezeit" - -#: mod/admin.php:986 -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:987 -msgid "Delivery interval" -msgstr "Zustellungsintervall" - -#: mod/admin.php:987 -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:988 -msgid "Poll interval" -msgstr "Abfrageintervall" - -#: mod/admin.php:988 -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:989 -msgid "Maximum Load Average" -msgstr "Maximum Load Average" - -#: mod/admin.php:989 -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:990 -msgid "Maximum Load Average (Frontend)" -msgstr "Maximum Load Average (Frontend)" - -#: mod/admin.php:990 -msgid "Maximum system load before the frontend quits service - default 50." -msgstr "Maximale Systemlast bevor Vordergrundprozesse pausiert werden - Standard 50." - -#: mod/admin.php:991 -msgid "Maximum table size for optimization" -msgstr "Maximale Tabellengröße zur Optimierung" - -#: mod/admin.php:991 -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:992 -msgid "Minimum level of fragmentation" -msgstr "Minimaler Fragmentationsgrad" - -#: mod/admin.php:992 -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:994 -msgid "Periodical check of global contacts" -msgstr "Regelmäßig globale Kontakte überprüfen" - -#: mod/admin.php:994 -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:995 -msgid "Days between requery" -msgstr "Tage zwischen erneuten Abfragen" - -#: mod/admin.php:995 -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:996 -msgid "Discover contacts from other servers" -msgstr "Neue Kontakte auf anderen Servern entdecken" - -#: mod/admin.php:996 -msgid "" -"Periodically query other servers for contacts. You can choose between " -"'users': the users on the remote system, 'Global Contacts': active contacts " -"that are known on the system. The fallback is meant for Redmatrix servers " -"and older friendica servers, where global contacts weren't available. The " -"fallback increases the server load, so the recommened setting is 'Users, " -"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:997 -msgid "Timeframe for fetching global contacts" -msgstr "Zeitfenster für globale Kontakte" - -#: mod/admin.php:997 -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:998 -msgid "Search the local directory" -msgstr "Lokales Verzeichnis durchsuchen" - -#: mod/admin.php:998 -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:1000 -msgid "Publish server information" -msgstr "Server Informationen veröffentlichen" - -#: mod/admin.php:1000 -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 " -"profiles, number of posts and the activated protocols and connectors. See 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:1002 -msgid "Use MySQL full text engine" -msgstr "Nutze MySQL full text engine" - -#: mod/admin.php:1002 -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:1003 -msgid "Suppress Language" -msgstr "Sprachinformation unterdrücken" - -#: mod/admin.php:1003 -msgid "Suppress language information in meta information about a posting." -msgstr "Verhindert das Erzeugen der Meta-Information zur Spracherkennung eines Beitrags." - -#: mod/admin.php:1004 -msgid "Suppress Tags" -msgstr "Tags Unterdrücken" - -#: mod/admin.php:1004 -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:1005 -msgid "Path to item cache" -msgstr "Pfad zum Eintrag Cache" - -#: mod/admin.php:1005 -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:1006 -msgid "Cache duration in seconds" -msgstr "Cache-Dauer in Sekunden" - -#: mod/admin.php:1006 -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:1007 -msgid "Maximum numbers of comments per post" -msgstr "Maximale Anzahl von Kommentaren pro Beitrag" - -#: mod/admin.php:1007 -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:1008 -msgid "Path for lock file" -msgstr "Pfad für die Sperrdatei" - -#: mod/admin.php:1008 -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:1009 -msgid "Temp path" -msgstr "Temp Pfad" - -#: mod/admin.php:1009 -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:1010 -msgid "Base path to installation" -msgstr "Basis-Pfad zur Installation" - -#: mod/admin.php:1010 -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:1011 -msgid "Disable picture proxy" -msgstr "Bilder Proxy deaktivieren" - -#: mod/admin.php:1011 -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:1012 -msgid "Enable old style pager" -msgstr "Den Old-Style Pager aktiviren" - -#: mod/admin.php:1012 -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:1013 -msgid "Only search in tags" -msgstr "Nur in Tags suchen" - -#: mod/admin.php:1013 -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:1015 -msgid "New base url" -msgstr "Neue Basis-URL" - -#: mod/admin.php:1015 -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:1017 -msgid "RINO Encryption" -msgstr "RINO Verschlüsselung" - -#: mod/admin.php:1017 -msgid "Encryption layer between nodes." -msgstr "Verschlüsselung zwischen Friendica Instanzen" - -#: mod/admin.php:1018 -msgid "Embedly API key" -msgstr "Embedly API Schlüssel" - -#: mod/admin.php:1018 -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:1020 -msgid "Enable 'worker' background processing" -msgstr "Aktiviere die 'Worker' Hintergrundprozesse" - -#: mod/admin.php:1020 -msgid "" -"The worker background processing limits the number of parallel background " -"jobs to a maximum number and respects the system load." -msgstr "Der 'background worker' Prozess begrenzt die Zahl der Prozesse, die im Hintergrund parallel laufen und beachtet dabei die Systemlast." - -#: mod/admin.php:1021 -msgid "Maximum number of parallel workers" -msgstr "Maximale Anzahl parallel laufender Worker" - -#: mod/admin.php:1021 -msgid "" -"On shared hosters set this to 2. On larger systems, values of 10 are great. " -"Default value is 4." -msgstr "Wenn dein Knoten bei einem Shared Hoster ist, setzte diesen Wert auf 2. Auf größeren Systemen funktioniert ein Wert von 10 recht gut. Standardeinstellung sind 4." - -#: mod/admin.php:1022 -msgid "Don't use 'proc_open' with the worker" -msgstr "'proc_open' nicht mit den Workern verwenden" - -#: mod/admin.php:1022 -msgid "" -"Enable this if your system doesn't allow the use of 'proc_open'. This can " -"happen on shared hosters. If this is enabled you should increase the " -"frequency of poller calls in your crontab." -msgstr "Aktiviere diese Option, wenn dein System die Verwendung von 'proc_open' verhindert. Dies könnte auf Shared Hostern der Fall sein. Wenn du diese Option aktivierst, solltest du die Frequenz der poller Aufrufe in deiner crontab erhöhen." - -#: mod/admin.php:1051 -msgid "Update has been marked successful" -msgstr "Update wurde als erfolgreich markiert" - -#: mod/admin.php:1059 -#, php-format -msgid "Database structure update %s was successfully applied." -msgstr "Das Update %s der Struktur der Datenbank wurde erfolgreich angewandt." - -#: mod/admin.php:1062 -#, 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:1074 -#, php-format -msgid "Executing %s failed with error: %s" -msgstr "Die Ausführung von %s schlug fehl. Fehlermeldung: %s" - -#: mod/admin.php:1077 -#, php-format -msgid "Update %s was successfully applied." -msgstr "Update %s war erfolgreich." - -#: mod/admin.php:1081 -#, 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:1083 -#, 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:1102 -msgid "No failed updates." -msgstr "Keine fehlgeschlagenen Updates." - -#: mod/admin.php:1103 -msgid "Check database structure" -msgstr "Datenbank Struktur überprüfen" - -#: mod/admin.php:1108 -msgid "Failed Updates" -msgstr "Fehlgeschlagene Updates" - -#: mod/admin.php:1109 -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:1110 -msgid "Mark success (if update was manually applied)" -msgstr "Als erfolgreich markieren (falls das Update manuell installiert wurde)" - -#: mod/admin.php:1111 -msgid "Attempt to execute this update step automatically" -msgstr "Versuchen, diesen Schritt automatisch auszuführen" - -#: mod/admin.php:1143 -#, php-format -msgid "" -"\n" -"\t\t\tDear %1$s,\n" -"\t\t\t\tthe administrator of %2$s has set up an account for you." -msgstr "\nHallo %1$s,\n\nauf %2$s wurde ein Account für Dich angelegt." - -#: mod/admin.php:1146 -#, php-format -msgid "" -"\n" -"\t\t\tThe login details are as follows:\n" -"\n" -"\t\t\tSite Location:\t%1$s\n" -"\t\t\tLogin Name:\t\t%2$s\n" -"\t\t\tPassword:\t\t%3$s\n" -"\n" -"\t\t\tYou may change your password from your account \"Settings\" page after logging\n" -"\t\t\tin.\n" -"\n" -"\t\t\tPlease take a few moments to review the other account settings on that page.\n" -"\n" -"\t\t\tYou may also wish to add some basic information to your default profile\n" -"\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n" -"\n" -"\t\t\tWe recommend setting your full name, adding a profile photo,\n" -"\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n" -"\t\t\tperhaps what country you live in; if you do not wish to be more specific\n" -"\t\t\tthan that.\n" -"\n" -"\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n" -"\t\t\tIf you are new and do not know anybody here, they may help\n" -"\t\t\tyou to make some new and interesting friends.\n" -"\n" -"\t\t\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:1190 -#, 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:1197 -#, 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:1244 -#, php-format -msgid "User '%s' deleted" -msgstr "Nutzer '%s' gelöscht" - -#: mod/admin.php:1252 -#, php-format -msgid "User '%s' unblocked" -msgstr "Nutzer '%s' entsperrt" - -#: mod/admin.php:1252 -#, php-format -msgid "User '%s' blocked" -msgstr "Nutzer '%s' gesperrt" - -#: mod/admin.php:1371 mod/admin.php:1384 mod/admin.php:1396 mod/admin.php:1412 -#: mod/settings.php:665 mod/settings.php:691 mod/crepair.php:165 -msgid "Name" -msgstr "Name" - -#: mod/admin.php:1371 mod/admin.php:1396 -msgid "Register date" -msgstr "Anmeldedatum" - -#: mod/admin.php:1371 mod/admin.php:1396 -msgid "Last login" -msgstr "Letzte Anmeldung" - -#: mod/admin.php:1371 mod/admin.php:1396 -msgid "Last item" -msgstr "Letzter Beitrag" - -#: mod/admin.php:1371 mod/settings.php:43 -msgid "Account" -msgstr "Nutzerkonto" - -#: mod/admin.php:1380 -msgid "Add User" -msgstr "Nutzer hinzufügen" - -#: mod/admin.php:1381 -msgid "select all" -msgstr "Alle auswählen" - -#: mod/admin.php:1382 -msgid "User registrations waiting for confirm" -msgstr "Neuanmeldungen, die auf Deine Bestätigung warten" - -#: mod/admin.php:1383 -msgid "User waiting for permanent deletion" -msgstr "Nutzer wartet auf permanente Löschung" - -#: mod/admin.php:1384 -msgid "Request date" -msgstr "Anfragedatum" - -#: mod/admin.php:1385 -msgid "No registrations." -msgstr "Keine Neuanmeldungen." - -#: mod/admin.php:1386 mod/notifications.php:139 mod/notifications.php:225 -msgid "Approve" -msgstr "Genehmigen" - -#: mod/admin.php:1387 -msgid "Deny" -msgstr "Verwehren" - -#: mod/admin.php:1389 mod/contacts.php:605 mod/contacts.php:803 -#: mod/contacts.php:997 -msgid "Block" -msgstr "Sperren" - -#: mod/admin.php:1390 mod/contacts.php:605 mod/contacts.php:803 -#: mod/contacts.php:997 -msgid "Unblock" -msgstr "Entsperren" - -#: mod/admin.php:1391 -msgid "Site admin" -msgstr "Seitenadministrator" - -#: mod/admin.php:1392 -msgid "Account expired" -msgstr "Account ist abgelaufen" - -#: mod/admin.php:1395 -msgid "New User" -msgstr "Neuer Nutzer" - -#: mod/admin.php:1396 -msgid "Deleted since" -msgstr "Gelöscht seit" - -#: mod/admin.php:1401 -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:1402 -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:1412 -msgid "Name of the new user." -msgstr "Name des neuen Nutzers" - -#: mod/admin.php:1413 -msgid "Nickname" -msgstr "Spitzname" - -#: mod/admin.php:1413 -msgid "Nickname of the new user." -msgstr "Spitznamen für den neuen Nutzer" - -#: mod/admin.php:1414 -msgid "Email address of the new user." -msgstr "Email Adresse des neuen Nutzers" - -#: mod/admin.php:1457 -#, php-format -msgid "Plugin %s disabled." -msgstr "Plugin %s deaktiviert." - -#: mod/admin.php:1461 -#, php-format -msgid "Plugin %s enabled." -msgstr "Plugin %s aktiviert." - -#: mod/admin.php:1472 mod/admin.php:1708 -msgid "Disable" -msgstr "Ausschalten" - -#: mod/admin.php:1474 mod/admin.php:1710 -msgid "Enable" -msgstr "Einschalten" - -#: mod/admin.php:1497 mod/admin.php:1755 -msgid "Toggle" -msgstr "Umschalten" - -#: mod/admin.php:1505 mod/admin.php:1764 -msgid "Author: " -msgstr "Autor:" - -#: mod/admin.php:1506 mod/admin.php:1765 -msgid "Maintainer: " -msgstr "Betreuer:" - -#: mod/admin.php:1558 -msgid "Reload active plugins" -msgstr "Aktive Plugins neu laden" - -#: mod/admin.php:1563 -#, 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:1668 -msgid "No themes found." -msgstr "Keine Themen gefunden." - -#: mod/admin.php:1746 -msgid "Screenshot" -msgstr "Bildschirmfoto" - -#: mod/admin.php:1806 -msgid "Reload active themes" -msgstr "Aktives Theme neu laden" - -#: mod/admin.php:1811 -#, 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:1812 -msgid "[Experimental]" -msgstr "[Experimentell]" - -#: mod/admin.php:1813 -msgid "[Unsupported]" -msgstr "[Nicht unterstützt]" - -#: mod/admin.php:1837 -msgid "Log settings updated." -msgstr "Protokolleinstellungen aktualisiert." - -#: mod/admin.php:1874 -msgid "Clear" -msgstr "löschen" - -#: mod/admin.php:1879 -msgid "Enable Debugging" -msgstr "Protokoll führen" - -#: mod/admin.php:1880 -msgid "Log file" -msgstr "Protokolldatei" - -#: mod/admin.php:1880 -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:1881 -msgid "Log level" -msgstr "Protokoll-Level" - -#: mod/admin.php:1884 -msgid "PHP logging" -msgstr "PHP Protokollieren" - -#: mod/admin.php:1885 -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/admin.php:2011 mod/admin.php:2012 mod/settings.php:763 -msgid "Off" -msgstr "Aus" - -#: mod/admin.php:2011 mod/admin.php:2012 mod/settings.php:763 -msgid "On" -msgstr "An" - -#: mod/admin.php:2012 -#, php-format -msgid "Lock feature %s" -msgstr "Feature festlegen: %s" - -#: mod/admin.php:2020 -msgid "Manage Additional Features" -msgstr "Zusätzliche Features Verwalten" - #: mod/wall_attach.php:94 msgid "Sorry, maybe your upload is bigger than the PHP configuration allows" msgstr "Entschuldige, die Datei scheint größer zu sein als es die PHP Konfiguration erlaubt." @@ -5084,6 +3611,18 @@ msgstr "Keine Kontakte zum Anzeigen." msgid "Access to this profile has been restricted." msgstr "Der Zugriff zu diesem Profil wurde eingeschränkt." +#: mod/cal.php:279 mod/events.php:380 +msgid "View" +msgstr "Ansehen" + +#: mod/cal.php:280 mod/events.php:382 +msgid "Previous" +msgstr "Vorherige" + +#: mod/cal.php:281 mod/install.php:231 mod/events.php:383 +msgid "Next" +msgstr "Nächste" + #: mod/cal.php:301 msgid "User not found" msgstr "Nutzer nicht gefunden" @@ -5147,34 +3686,6 @@ msgstr "Hinzufügen" msgid "No entries." msgstr "Keine Einträge." -#: mod/videos.php:123 -msgid "Do you really want to delete this video?" -msgstr "Möchtest Du dieses Video wirklich löschen?" - -#: mod/videos.php:128 -msgid "Delete Video" -msgstr "Video Löschen" - -#: mod/videos.php:207 -msgid "No videos selected" -msgstr "Keine Videos ausgewählt" - -#: mod/videos.php:308 mod/photos.php:1075 -msgid "Access to this item is restricted." -msgstr "Zugriff zu diesem Eintrag wurde eingeschränkt." - -#: mod/videos.php:390 mod/photos.php:1878 -msgid "View Album" -msgstr "Album betrachten" - -#: mod/videos.php:399 -msgid "Recent Videos" -msgstr "Neueste Videos" - -#: mod/videos.php:401 -msgid "Upload New Videos" -msgstr "Neues Video hochladen" - #: mod/credits.php:16 msgid "Credits" msgstr "Credits" @@ -5190,26 +3701,6 @@ msgstr "Friendica ist ein Gemeinschaftsprojekt, das nicht ohne die Hilfe vieler msgid "- select -" msgstr "- auswählen -" -#: mod/poke.php:192 -msgid "Poke/Prod" -msgstr "Anstupsen" - -#: mod/poke.php:193 -msgid "poke, prod or do other things to somebody" -msgstr "Stupse Leute an oder mache anderes mit ihnen" - -#: mod/poke.php:194 -msgid "Recipient" -msgstr "Empfänger" - -#: mod/poke.php:195 -msgid "Choose what you wish to do to recipient" -msgstr "Was willst Du mit dem Empfänger machen:" - -#: mod/poke.php:198 -msgid "Make this post private" -msgstr "Diesen Beitrag privat machen" - #: mod/install.php:139 msgid "Friendica Communications Server - Setup" msgstr "Friendica-Server für soziale Netzwerke – Setup" @@ -5597,13 +4088,13 @@ msgstr "Bitte beantworte folgendes:" msgid "Does %s know you?" msgstr "Kennt %s Dich?" -#: mod/follow.php:110 mod/register.php:239 mod/settings.php:1113 -#: mod/settings.php:1119 mod/settings.php:1127 mod/settings.php:1131 -#: mod/settings.php:1136 mod/settings.php:1142 mod/settings.php:1148 -#: mod/settings.php:1154 mod/settings.php:1180 mod/settings.php:1181 -#: mod/settings.php:1182 mod/settings.php:1183 mod/settings.php:1184 -#: mod/api.php:106 mod/dfrn_request.php:861 mod/profiles.php:642 -#: mod/profiles.php:646 mod/profiles.php:671 +#: mod/follow.php:110 mod/api.php:106 mod/dfrn_request.php:861 +#: mod/profiles.php:641 mod/profiles.php:645 mod/profiles.php:670 +#: mod/register.php:239 mod/settings.php:1113 mod/settings.php:1119 +#: mod/settings.php:1127 mod/settings.php:1131 mod/settings.php:1136 +#: mod/settings.php:1142 mod/settings.php:1148 mod/settings.php:1154 +#: mod/settings.php:1180 mod/settings.php:1181 mod/settings.php:1182 +#: mod/settings.php:1183 mod/settings.php:1184 msgid "No" msgstr "Nein" @@ -5615,7 +4106,7 @@ msgstr "Eine persönliche Notiz beifügen:" msgid "Your Identity Address:" msgstr "Adresse Deines Profils:" -#: mod/follow.php:126 mod/contacts.php:624 mod/notifications.php:219 +#: mod/follow.php:126 mod/notifications.php:219 mod/contacts.php:624 msgid "Profile URL" msgstr "Profil URL" @@ -5715,7 +4206,7 @@ msgid "" "potential friends know exactly how to find you." msgstr "Überprüfe die restlichen Einstellungen, insbesondere die Einstellungen zur Privatsphäre. Wenn Du Dein Profil nicht veröffentlichst, ist das als wenn Du Deine Telefonnummer nicht ins Telefonbuch einträgst. Im Allgemeinen solltest Du es veröffentlichen - außer all Deine Kontakte und potentiellen Kontakte wissen genau, wie sie Dich finden können." -#: mod/newmember.php:36 mod/profile_photo.php:250 mod/profiles.php:701 +#: mod/newmember.php:36 mod/profile_photo.php:250 mod/profiles.php:700 msgid "Upload Profile Photo" msgstr "Profilbild hochladen" @@ -5848,14 +4339,6 @@ msgstr "Dein Konto wird endgültig gelöscht. Es gibt keine Möglichkeit, es wie msgid "Please enter your password for verification:" msgstr "Bitte gib Dein Passwort zur Verifikation ein:" -#: mod/mood.php:133 -msgid "Mood" -msgstr "Stimmung" - -#: mod/mood.php:134 -msgid "Set your current mood and tell your friends" -msgstr "Wähle Deine aktuelle Stimmung und erzähle sie Deinen Kontakten" - #: mod/editpost.php:17 mod/editpost.php:27 msgid "Item not found" msgstr "Beitrag nicht gefunden" @@ -5913,7 +4396,7 @@ msgstr "Neueste Beiträge" msgid "Sort by Post Date" msgstr "Nach Beitragsdatum sortieren" -#: mod/network.php:844 mod/profiles.php:697 mod/notifications.php:539 +#: mod/network.php:844 mod/notifications.php:539 mod/profiles.php:696 msgid "Personal" msgstr "Persönlich" @@ -6026,6 +4509,2888 @@ msgstr "Mitglieder" msgid "All Contacts" msgstr "Alle Kontakte" +#: mod/wallmessage.php:42 mod/wallmessage.php:112 +#, php-format +msgid "Number of daily wall messages for %s exceeded. Message failed." +msgstr "Maximale Anzahl der täglichen Pinnwand Nachrichten für %s ist überschritten. Zustellung fehlgeschlagen." + +#: mod/wallmessage.php:56 mod/message.php:71 +msgid "No recipient selected." +msgstr "Kein Empfänger gewählt." + +#: mod/wallmessage.php:59 +msgid "Unable to check your home location." +msgstr "Konnte Deinen Heimatort nicht bestimmen." + +#: mod/wallmessage.php:62 mod/message.php:78 +msgid "Message could not be sent." +msgstr "Nachricht konnte nicht gesendet werden." + +#: mod/wallmessage.php:65 mod/message.php:81 +msgid "Message collection failure." +msgstr "Konnte Nachrichten nicht abrufen." + +#: mod/wallmessage.php:68 mod/message.php:84 +msgid "Message sent." +msgstr "Nachricht gesendet." + +#: mod/wallmessage.php:86 mod/wallmessage.php:95 +msgid "No recipient." +msgstr "Kein Empfänger." + +#: mod/wallmessage.php:142 mod/message.php:341 +msgid "Send Private Message" +msgstr "Private Nachricht senden" + +#: mod/wallmessage.php:143 +#, php-format +msgid "" +"If you wish for %s to respond, please check that the privacy settings on " +"your site allow private mail from unknown senders." +msgstr "Wenn Du möchtest, dass %s Dir antworten kann, überprüfe Deine Privatsphären-Einstellungen und erlaube private Nachrichten von unbekannten Absendern." + +#: mod/wallmessage.php:144 mod/message.php:342 mod/message.php:536 +msgid "To:" +msgstr "An:" + +#: mod/wallmessage.php:145 mod/message.php:347 mod/message.php:538 +msgid "Subject:" +msgstr "Betreff:" + +#: mod/share.php:38 +msgid "link" +msgstr "Link" + +#: mod/api.php:76 mod/api.php:102 +msgid "Authorize application connection" +msgstr "Verbindung der Applikation autorisieren" + +#: mod/api.php:77 +msgid "Return to your app and insert this Securty Code:" +msgstr "Gehe zu Deiner Anwendung zurück und trage dort folgenden Sicherheitscode ein:" + +#: mod/api.php:89 +msgid "Please login to continue." +msgstr "Bitte melde Dich an um fortzufahren." + +#: mod/api.php:104 +msgid "" +"Do you want to authorize this application to access your posts and contacts," +" and/or create new posts for you?" +msgstr "Möchtest Du dieser Anwendung den Zugriff auf Deine Beiträge und Kontakte, sowie das Erstellen neuer Beiträge in Deinem Namen gestatten?" + +#: mod/babel.php:17 +msgid "Source (bbcode) text:" +msgstr "Quelle (bbcode) Text:" + +#: mod/babel.php:23 +msgid "Source (Diaspora) text to convert to BBcode:" +msgstr "Eingabe (Diaspora) nach BBCode zu konvertierender Text:" + +#: mod/babel.php:31 +msgid "Source input: " +msgstr "Originaltext:" + +#: mod/babel.php:35 +msgid "bb2html (raw HTML): " +msgstr "bb2html (reines HTML): " + +#: mod/babel.php:39 +msgid "bb2html: " +msgstr "bb2html: " + +#: mod/babel.php:43 +msgid "bb2html2bb: " +msgstr "bb2html2bb: " + +#: mod/babel.php:47 +msgid "bb2md: " +msgstr "bb2md: " + +#: mod/babel.php:51 +msgid "bb2md2html: " +msgstr "bb2md2html: " + +#: mod/babel.php:55 +msgid "bb2dia2bb: " +msgstr "bb2dia2bb: " + +#: mod/babel.php:59 +msgid "bb2md2html2bb: " +msgstr "bb2md2html2bb: " + +#: mod/babel.php:69 +msgid "Source input (Diaspora format): " +msgstr "Originaltext (Diaspora Format): " + +#: mod/babel.php:74 +msgid "diaspora2bb: " +msgstr "diaspora2bb: " + +#: mod/ostatus_subscribe.php:14 +msgid "Subscribing to OStatus contacts" +msgstr "OStatus Kontakten folgen" + +#: mod/ostatus_subscribe.php:25 +msgid "No contact provided." +msgstr "Keine Kontakte gefunden." + +#: mod/ostatus_subscribe.php:30 +msgid "Couldn't fetch information for contact." +msgstr "Konnte die Kontaktinformationen nicht einholen." + +#: mod/ostatus_subscribe.php:38 +msgid "Couldn't fetch friends for contact." +msgstr "Konnte die Kontaktliste des Kontakts nicht abfragen." + +#: mod/ostatus_subscribe.php:65 +msgid "success" +msgstr "Erfolg" + +#: mod/ostatus_subscribe.php:67 +msgid "failed" +msgstr "Fehlgeschlagen" + +#: mod/ostatus_subscribe.php:69 mod/content.php:792 object/Item.php:245 +msgid "ignored" +msgstr "Ignoriert" + +#: mod/dfrn_poll.php:104 mod/dfrn_poll.php:537 +#, php-format +msgid "%1$s welcomes %2$s" +msgstr "%1$s heißt %2$s herzlich willkommen" + +#: mod/profile.php:179 +msgid "Tips for New Members" +msgstr "Tipps für neue Nutzer" + +#: mod/message.php:75 +msgid "Unable to locate contact information." +msgstr "Konnte die Kontaktinformationen nicht finden." + +#: mod/message.php:215 +msgid "Do you really want to delete this message?" +msgstr "Möchtest Du wirklich diese Nachricht löschen?" + +#: mod/message.php:235 +msgid "Message deleted." +msgstr "Nachricht gelöscht." + +#: mod/message.php:266 +msgid "Conversation removed." +msgstr "Unterhaltung gelöscht." + +#: mod/message.php:383 +msgid "No messages." +msgstr "Keine Nachrichten." + +#: mod/message.php:426 +msgid "Message not available." +msgstr "Nachricht nicht verfügbar." + +#: mod/message.php:503 +msgid "Delete message" +msgstr "Nachricht löschen" + +#: mod/message.php:529 mod/message.php:609 +msgid "Delete conversation" +msgstr "Unterhaltung löschen" + +#: mod/message.php:531 +msgid "" +"No secure communications available. You may be able to " +"respond from the sender's profile page." +msgstr "Sichere Kommunikation ist nicht verfügbar. Eventuell kannst Du auf der Profilseite des Absenders antworten." + +#: mod/message.php:535 +msgid "Send Reply" +msgstr "Antwort senden" + +#: mod/message.php:579 +#, php-format +msgid "Unknown sender - %s" +msgstr "'Unbekannter Absender - %s" + +#: mod/message.php:581 +#, php-format +msgid "You and %s" +msgstr "Du und %s" + +#: mod/message.php:583 +#, php-format +msgid "%s and You" +msgstr "%s und Du" + +#: mod/message.php:612 +msgid "D, d M Y - g:i A" +msgstr "D, d. M Y - g:i A" + +#: mod/message.php:615 +#, php-format +msgid "%d message" +msgid_plural "%d messages" +msgstr[0] "%d Nachricht" +msgstr[1] "%d Nachrichten" + +#: mod/manage.php:139 +msgid "Manage Identities and/or Pages" +msgstr "Verwalte Identitäten und/oder Seiten" + +#: mod/manage.php:140 +msgid "" +"Toggle between different identities or community/group pages which share " +"your account details or which you have been granted \"manage\" permissions" +msgstr "Zwischen verschiedenen Identitäten oder Gemeinschafts-/Gruppenseiten wechseln, die Deine Kontoinformationen teilen oder zu denen Du „Verwalten“-Befugnisse bekommen hast." + +#: mod/manage.php:141 +msgid "Select an identity to manage: " +msgstr "Wähle eine Identität zum Verwalten aus: " + +#: mod/crepair.php:87 +msgid "Contact settings applied." +msgstr "Einstellungen zum Kontakt angewandt." + +#: mod/crepair.php:89 +msgid "Contact update failed." +msgstr "Konnte den Kontakt nicht aktualisieren." + +#: mod/crepair.php:114 mod/dfrn_confirm.php:122 mod/fsuggest.php:20 +#: mod/fsuggest.php:92 +msgid "Contact not found." +msgstr "Kontakt nicht gefunden." + +#: mod/crepair.php:120 +msgid "" +"WARNING: This is highly advanced and if you enter incorrect" +" information your communications with this contact may stop working." +msgstr "ACHTUNG: Das sind Experten-Einstellungen! Wenn Du etwas Falsches eingibst, funktioniert die Kommunikation mit diesem Kontakt evtl. nicht mehr." + +#: mod/crepair.php:121 +msgid "" +"Please use your browser 'Back' button now if you are " +"uncertain what to do on this page." +msgstr "Bitte nutze den Zurück-Button Deines Browsers jetzt, wenn Du Dir unsicher bist, was Du tun willst." + +#: mod/crepair.php:134 mod/crepair.php:136 +msgid "No mirroring" +msgstr "Kein Spiegeln" + +#: mod/crepair.php:134 +msgid "Mirror as forwarded posting" +msgstr "Spiegeln als weitergeleitete Beiträge" + +#: mod/crepair.php:134 mod/crepair.php:136 +msgid "Mirror as my own posting" +msgstr "Spiegeln als meine eigenen Beiträge" + +#: mod/crepair.php:150 +msgid "Return to contact editor" +msgstr "Zurück zum Kontakteditor" + +#: mod/crepair.php:152 +msgid "Refetch contact data" +msgstr "Kontaktdaten neu laden" + +#: mod/crepair.php:156 +msgid "Remote Self" +msgstr "Entfernte Konten" + +#: mod/crepair.php:159 +msgid "Mirror postings from this contact" +msgstr "Spiegle Beiträge dieses Kontakts" + +#: mod/crepair.php:161 +msgid "" +"Mark this contact as remote_self, this will cause friendica to repost new " +"entries from this contact." +msgstr "Markiere diesen Kontakt als remote_self (entferntes Konto), dies veranlasst Friendica alle Top-Level Beiträge dieses Kontakts an all Deine Kontakte zu senden." + +#: mod/crepair.php:165 mod/admin.php:1374 mod/admin.php:1387 +#: mod/admin.php:1399 mod/admin.php:1415 mod/settings.php:665 +#: mod/settings.php:691 +msgid "Name" +msgstr "Name" + +#: mod/crepair.php:166 +msgid "Account Nickname" +msgstr "Konto-Spitzname" + +#: mod/crepair.php:167 +msgid "@Tagname - overrides Name/Nickname" +msgstr "@Tagname - überschreibt Name/Spitzname" + +#: mod/crepair.php:168 +msgid "Account URL" +msgstr "Konto-URL" + +#: mod/crepair.php:169 +msgid "Friend Request URL" +msgstr "URL für Kontaktschaftsanfragen" + +#: mod/crepair.php:170 +msgid "Friend Confirm URL" +msgstr "URL für Bestätigungen von Kontaktanfragen" + +#: mod/crepair.php:171 +msgid "Notification Endpoint URL" +msgstr "URL-Endpunkt für Benachrichtigungen" + +#: mod/crepair.php:172 +msgid "Poll/Feed URL" +msgstr "Pull/Feed-URL" + +#: mod/crepair.php:173 +msgid "New photo from this URL" +msgstr "Neues Foto von dieser URL" + +#: mod/dfrn_request.php:100 +msgid "This introduction has already been accepted." +msgstr "Diese Kontaktanfrage wurde bereits akzeptiert." + +#: mod/dfrn_request.php:123 mod/dfrn_request.php:518 +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:128 mod/dfrn_request.php:523 +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:130 mod/dfrn_request.php:525 +msgid "Warning: profile location has no profile photo." +msgstr "Warnung: Es gibt kein Profilbild bei der angegebenen Profiladresse." + +#: mod/dfrn_request.php:133 mod/dfrn_request.php:528 +#, 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:178 +msgid "Introduction complete." +msgstr "Kontaktanfrage abgeschlossen." + +#: mod/dfrn_request.php:220 +msgid "Unrecoverable protocol error." +msgstr "Nicht behebbarer Protokollfehler." + +#: mod/dfrn_request.php:248 +msgid "Profile unavailable." +msgstr "Profil nicht verfügbar." + +#: mod/dfrn_request.php:273 +#, php-format +msgid "%s has received too many connection requests today." +msgstr "%s hat heute zu viele Kontaktanfragen erhalten." + +#: mod/dfrn_request.php:274 +msgid "Spam protection measures have been invoked." +msgstr "Maßnahmen zum Spamschutz wurden ergriffen." + +#: mod/dfrn_request.php:275 +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:337 +msgid "Invalid locator" +msgstr "Ungültiger Locator" + +#: mod/dfrn_request.php:346 +msgid "Invalid email address." +msgstr "Ungültige E-Mail-Adresse." + +#: mod/dfrn_request.php:373 +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:476 +msgid "You have already introduced yourself here." +msgstr "Du hast Dich hier bereits vorgestellt." + +#: mod/dfrn_request.php:480 +#, php-format +msgid "Apparently you are already friends with %s." +msgstr "Es scheint so, als ob Du bereits mit %s in Kontakt stehst." + +#: mod/dfrn_request.php:501 +msgid "Invalid profile URL." +msgstr "Ungültige Profil-URL." + +#: mod/dfrn_request.php:579 mod/contacts.php:208 +msgid "Failed to update contact record." +msgstr "Aktualisierung der Kontaktdaten fehlgeschlagen." + +#: mod/dfrn_request.php:600 +msgid "Your introduction has been sent." +msgstr "Deine Kontaktanfrage wurde gesendet." + +#: mod/dfrn_request.php:640 +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:663 +msgid "Please login to confirm introduction." +msgstr "Bitte melde Dich an, um die Kontaktanfrage zu bestätigen." + +#: mod/dfrn_request.php:673 +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:687 mod/dfrn_request.php:704 +msgid "Confirm" +msgstr "Bestätigen" + +#: mod/dfrn_request.php:699 +msgid "Hide this contact" +msgstr "Verberge diesen Kontakt" + +#: mod/dfrn_request.php:702 +#, php-format +msgid "Welcome home %s." +msgstr "Willkommen zurück %s." + +#: mod/dfrn_request.php:703 +#, php-format +msgid "Please confirm your introduction/connection request to %s." +msgstr "Bitte bestätige Deine Kontaktanfrage bei %s." + +#: mod/dfrn_request.php:832 +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:853 +#, php-format +msgid "" +"If you are not yet a member of the free social web, follow this link to find a public Friendica site and " +"join us today." +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:858 +msgid "Friend/Connection Request" +msgstr "Kontaktanfrage" + +#: mod/dfrn_request.php:859 +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:868 +msgid "StatusNet/Federated Social Web" +msgstr "StatusNet/Federated Social Web" + +#: mod/dfrn_request.php:870 +#, php-format +msgid "" +" - please do not use this form. Instead, enter %s into your Diaspora search" +" bar." +msgstr " - bitte verwende dieses Formular nicht. Stattdessen suche nach %s in Deiner Diaspora Suchleiste." + +#: mod/content.php:325 object/Item.php:95 +msgid "This entry was edited" +msgstr "Dieser Beitrag wurde bearbeitet." + +#: mod/content.php:621 object/Item.php:429 +#, php-format +msgid "%d comment" +msgid_plural "%d comments" +msgstr[0] "%d Kommentar" +msgstr[1] "%d Kommentare" + +#: mod/content.php:638 mod/photos.php:1406 object/Item.php:117 +msgid "Private Message" +msgstr "Private Nachricht" + +#: mod/content.php:702 mod/photos.php:1595 object/Item.php:263 +msgid "I like this (toggle)" +msgstr "Ich mag das (toggle)" + +#: mod/content.php:702 object/Item.php:263 +msgid "like" +msgstr "mag ich" + +#: mod/content.php:703 mod/photos.php:1596 object/Item.php:264 +msgid "I don't like this (toggle)" +msgstr "Ich mag das nicht (toggle)" + +#: mod/content.php:703 object/Item.php:264 +msgid "dislike" +msgstr "mag ich nicht" + +#: mod/content.php:705 object/Item.php:266 +msgid "Share this" +msgstr "Weitersagen" + +#: mod/content.php:705 object/Item.php:266 +msgid "share" +msgstr "Teilen" + +#: mod/content.php:725 mod/photos.php:1615 mod/photos.php:1663 +#: mod/photos.php:1751 object/Item.php:717 +msgid "This is you" +msgstr "Das bist Du" + +#: mod/content.php:727 mod/content.php:945 mod/photos.php:1617 +#: mod/photos.php:1665 mod/photos.php:1753 object/Item.php:403 +#: object/Item.php:719 boot.php:899 +msgid "Comment" +msgstr "Kommentar" + +#: mod/content.php:729 object/Item.php:721 +msgid "Bold" +msgstr "Fett" + +#: mod/content.php:730 object/Item.php:722 +msgid "Italic" +msgstr "Kursiv" + +#: mod/content.php:731 object/Item.php:723 +msgid "Underline" +msgstr "Unterstrichen" + +#: mod/content.php:732 object/Item.php:724 +msgid "Quote" +msgstr "Zitat" + +#: mod/content.php:733 object/Item.php:725 +msgid "Code" +msgstr "Code" + +#: mod/content.php:734 object/Item.php:726 +msgid "Image" +msgstr "Bild" + +#: mod/content.php:735 object/Item.php:727 +msgid "Link" +msgstr "Link" + +#: mod/content.php:736 object/Item.php:728 +msgid "Video" +msgstr "Video" + +#: mod/content.php:746 mod/settings.php:725 object/Item.php:122 +#: object/Item.php:124 +msgid "Edit" +msgstr "Bearbeiten" + +#: mod/content.php:771 object/Item.php:227 +msgid "add star" +msgstr "markieren" + +#: mod/content.php:772 object/Item.php:228 +msgid "remove star" +msgstr "Markierung entfernen" + +#: mod/content.php:773 object/Item.php:229 +msgid "toggle star status" +msgstr "Markierung umschalten" + +#: mod/content.php:776 object/Item.php:232 +msgid "starred" +msgstr "markiert" + +#: mod/content.php:777 mod/content.php:798 object/Item.php:252 +msgid "add tag" +msgstr "Tag hinzufügen" + +#: mod/content.php:787 object/Item.php:240 +msgid "ignore thread" +msgstr "Thread ignorieren" + +#: mod/content.php:788 object/Item.php:241 +msgid "unignore thread" +msgstr "Thread nicht mehr ignorieren" + +#: mod/content.php:789 object/Item.php:242 +msgid "toggle ignore status" +msgstr "Ignoriert-Status ein-/ausschalten" + +#: mod/content.php:803 object/Item.php:137 +msgid "save to folder" +msgstr "In Ordner speichern" + +#: mod/content.php:848 object/Item.php:201 +msgid "I will attend" +msgstr "Ich werde teilnehmen" + +#: mod/content.php:848 object/Item.php:201 +msgid "I will not attend" +msgstr "Ich werde nicht teilnehmen" + +#: mod/content.php:848 object/Item.php:201 +msgid "I might attend" +msgstr "Ich werde eventuell teilnehmen" + +#: mod/content.php:912 object/Item.php:369 +msgid "to" +msgstr "zu" + +#: mod/content.php:913 object/Item.php:371 +msgid "Wall-to-Wall" +msgstr "Wall-to-Wall" + +#: mod/content.php:914 object/Item.php:372 +msgid "via Wall-To-Wall:" +msgstr "via Wall-To-Wall:" + +#: mod/notifications.php:29 +msgid "Invalid request identifier." +msgstr "Invalid request identifier." + +#: mod/notifications.php:38 mod/notifications.php:143 +#: mod/notifications.php:228 +msgid "Discard" +msgstr "Verwerfen" + +#: mod/notifications.php:54 mod/notifications.php:142 +#: mod/notifications.php:227 mod/contacts.php:606 mod/contacts.php:804 +#: mod/contacts.php:1005 +msgid "Ignore" +msgstr "Ignorieren" + +#: mod/notifications.php:91 +msgid "Show Ignored Requests" +msgstr "Zeige ignorierte Anfragen" + +#: mod/notifications.php:91 +msgid "Hide Ignored Requests" +msgstr "Verberge ignorierte Anfragen" + +#: mod/notifications.php:127 mod/notifications.php:198 +msgid "Notification type: " +msgstr "Benachrichtigungstyp: " + +#: mod/notifications.php:128 +msgid "Friend Suggestion" +msgstr "Kontaktvorschlag" + +#: mod/notifications.php:130 +#, php-format +msgid "suggested by %s" +msgstr "vorgeschlagen von %s" + +#: mod/notifications.php:135 mod/notifications.php:215 mod/contacts.php:613 +msgid "Hide this contact from others" +msgstr "Verbirg diesen Kontakt vor andere" + +#: mod/notifications.php:136 mod/notifications.php:216 +msgid "Post a new friend activity" +msgstr "Neue-Kontakt Nachricht senden" + +#: mod/notifications.php:136 mod/notifications.php:216 +msgid "if applicable" +msgstr "falls anwendbar" + +#: mod/notifications.php:139 mod/notifications.php:225 mod/admin.php:1389 +msgid "Approve" +msgstr "Genehmigen" + +#: mod/notifications.php:159 +msgid "Claims to be known to you: " +msgstr "Behauptet Dich zu kennen: " + +#: mod/notifications.php:160 +msgid "yes" +msgstr "ja" + +#: mod/notifications.php:160 +msgid "no" +msgstr "nein" + +#: mod/notifications.php:161 +msgid "" +"Shall your connection be bidirectional or not? \"Friend\" implies that you " +"allow to read and you subscribe to their posts. \"Fan/Admirer\" means that " +"you allow to read but you do not want to read theirs. Approve as: " +msgstr "Soll Deine Beziehung beidseitig sein oder nicht? \"Kontakt\" bedeutet, ihr könnt gegenseitig die Beiträge des Anderen lesen dürft. \"Fan/Verehrer\", dass du das lesen deiner Beiträge erlaubst aber nicht die Beiträge der anderen Seite lesen möchtest. Genehmigen als:" + +#: mod/notifications.php:164 +msgid "" +"Shall your connection be bidirectional or not? \"Friend\" implies that you " +"allow to read and you subscribe to their posts. \"Sharer\" means that you " +"allow to read but you do not want to read theirs. Approve as: " +msgstr "Soll Deine Beziehung beidseitig sein oder nicht? \"Freund\" bedeutet, ihr gegenseitig die Beiträge des Anderen lesen dürft. \"Teilenden\", das du das lesen deiner Beiträge erlaubst aber nicht die Beiträge der anderen Seite lesen möchtest. Genehmigen als:" + +#: mod/notifications.php:172 +msgid "Friend" +msgstr "Kontakt" + +#: mod/notifications.php:173 +msgid "Sharer" +msgstr "Teilenden" + +#: mod/notifications.php:173 +msgid "Fan/Admirer" +msgstr "Fan/Verehrer" + +#: mod/notifications.php:199 +msgid "Friend/Connect Request" +msgstr "Kontakt-/Freundschaftsanfrage" + +#: mod/notifications.php:199 +msgid "New Follower" +msgstr "Neuer Bewunderer" + +#: mod/notifications.php:234 +msgid "No introductions." +msgstr "Keine Kontaktanfragen." + +#: mod/notifications.php:238 +msgid "Network Notifications" +msgstr "Netzwerk Benachrichtigungen" + +#: mod/notifications.php:265 mod/notifications.php:382 +#: mod/notifications.php:461 +#, php-format +msgid "%s liked %s's post" +msgstr "%s mag %ss Beitrag" + +#: mod/notifications.php:275 mod/notifications.php:392 +#: mod/notifications.php:471 +#, php-format +msgid "%s disliked %s's post" +msgstr "%s mag %ss Beitrag nicht" + +#: mod/notifications.php:290 mod/notifications.php:407 +#: mod/notifications.php:486 +#, php-format +msgid "%s is now friends with %s" +msgstr "%s ist jetzt mit %s befreundet" + +#: mod/notifications.php:297 mod/notifications.php:414 +#, php-format +msgid "%s created a new post" +msgstr "%s hat einen neuen Beitrag erstellt" + +#: mod/notifications.php:298 mod/notifications.php:415 +#: mod/notifications.php:496 +#, php-format +msgid "%s commented on %s's post" +msgstr "%s hat %ss Beitrag kommentiert" + +#: mod/notifications.php:313 +msgid "No more network notifications." +msgstr "Keine weiteren Netzwerk-Benachrichtigungen." + +#: mod/notifications.php:343 +msgid "Personal Notifications" +msgstr "Persönliche Benachrichtigungen" + +#: mod/notifications.php:430 +msgid "No more personal notifications." +msgstr "Keine weiteren persönlichen Benachrichtigungen" + +#: mod/notifications.php:435 +msgid "Home Notifications" +msgstr "Pinnwand Benachrichtigungen" + +#: mod/notifications.php:503 +msgid "No more home notifications." +msgstr "Keine weiteren Pinnwand-Benachrichtigungen" + +#: mod/notifications.php:527 +msgid "System" +msgstr "System" + +#: mod/admin.php:92 +msgid "Theme settings updated." +msgstr "Themeneinstellungen aktualisiert." + +#: mod/admin.php:156 mod/admin.php:925 +msgid "Site" +msgstr "Seite" + +#: mod/admin.php:157 mod/admin.php:869 mod/admin.php:1382 mod/admin.php:1397 +msgid "Users" +msgstr "Nutzer" + +#: mod/admin.php:158 mod/admin.php:1499 mod/admin.php:1559 mod/settings.php:74 +msgid "Plugins" +msgstr "Plugins" + +#: mod/admin.php:159 mod/admin.php:1757 mod/admin.php:1807 +msgid "Themes" +msgstr "Themen" + +#: mod/admin.php:160 mod/settings.php:52 +msgid "Additional features" +msgstr "Zusätzliche Features" + +#: mod/admin.php:161 +msgid "DB updates" +msgstr "DB Updates" + +#: mod/admin.php:162 mod/admin.php:397 +msgid "Inspect Queue" +msgstr "Warteschlange Inspizieren" + +#: mod/admin.php:163 mod/admin.php:363 +msgid "Federation Statistics" +msgstr "Federation Statistik" + +#: mod/admin.php:177 mod/admin.php:188 mod/admin.php:1875 +msgid "Logs" +msgstr "Protokolle" + +#: mod/admin.php:178 mod/admin.php:1942 +msgid "View Logs" +msgstr "Protokolle anzeigen" + +#: mod/admin.php:179 +msgid "probe address" +msgstr "Adresse untersuchen" + +#: mod/admin.php:180 +msgid "check webfinger" +msgstr "Webfinger überprüfen" + +#: mod/admin.php:187 +msgid "Plugin Features" +msgstr "Plugin Features" + +#: mod/admin.php:189 +msgid "diagnostics" +msgstr "Diagnose" + +#: mod/admin.php:190 +msgid "User registrations waiting for confirmation" +msgstr "Nutzeranmeldungen die auf Bestätigung warten" + +#: mod/admin.php:356 +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:357 +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:362 mod/admin.php:396 mod/admin.php:460 mod/admin.php:924 +#: mod/admin.php:1381 mod/admin.php:1498 mod/admin.php:1558 mod/admin.php:1756 +#: mod/admin.php:1806 mod/admin.php:1874 mod/admin.php:1941 +msgid "Administration" +msgstr "Administration" + +#: mod/admin.php:369 +#, php-format +msgid "Currently this node is aware of %d nodes from the following platforms:" +msgstr "Momentan kennt dieser Knoten %d andere Knoten der folgenden Plattformen:" + +#: mod/admin.php:399 +msgid "ID" +msgstr "ID" + +#: mod/admin.php:400 +msgid "Recipient Name" +msgstr "Empfänger Name" + +#: mod/admin.php:401 +msgid "Recipient Profile" +msgstr "Empfänger Profil" + +#: mod/admin.php:403 +msgid "Created" +msgstr "Erstellt" + +#: mod/admin.php:404 +msgid "Last Tried" +msgstr "Zuletzt versucht" + +#: mod/admin.php:405 +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:424 mod/admin.php:1330 +msgid "Normal Account" +msgstr "Normales Konto" + +#: mod/admin.php:425 mod/admin.php:1331 +msgid "Soapbox Account" +msgstr "Marktschreier-Konto" + +#: mod/admin.php:426 mod/admin.php:1332 +msgid "Community/Celebrity Account" +msgstr "Forum/Promi-Konto" + +#: mod/admin.php:427 mod/admin.php:1333 +msgid "Automatic Friend Account" +msgstr "Automatisches Freundekonto" + +#: mod/admin.php:428 +msgid "Blog Account" +msgstr "Blog-Konto" + +#: mod/admin.php:429 +msgid "Private Forum" +msgstr "Privates Forum" + +#: mod/admin.php:455 +msgid "Message queues" +msgstr "Nachrichten-Warteschlangen" + +#: mod/admin.php:461 +msgid "Summary" +msgstr "Zusammenfassung" + +#: mod/admin.php:463 +msgid "Registered users" +msgstr "Registrierte Nutzer" + +#: mod/admin.php:465 +msgid "Pending registrations" +msgstr "Anstehende Anmeldungen" + +#: mod/admin.php:466 +msgid "Version" +msgstr "Version" + +#: mod/admin.php:471 +msgid "Active plugins" +msgstr "Aktive Plugins" + +#: mod/admin.php:494 +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:797 +msgid "RINO2 needs mcrypt php extension to work." +msgstr "RINO2 benötigt die PHP Extension mcrypt." + +#: mod/admin.php:805 +msgid "Site settings updated." +msgstr "Seiteneinstellungen aktualisiert." + +#: mod/admin.php:833 mod/settings.php:919 +msgid "No special theme for mobile devices" +msgstr "Kein spezielles Theme für mobile Geräte verwenden." + +#: mod/admin.php:852 +msgid "No community page" +msgstr "Keine Gemeinschaftsseite" + +#: mod/admin.php:853 +msgid "Public postings from users of this site" +msgstr "Öffentliche Beiträge von Nutzer_innen dieser Seite" + +#: mod/admin.php:854 +msgid "Global community page" +msgstr "Globale Gemeinschaftsseite" + +#: mod/admin.php:859 mod/contacts.php:530 +msgid "Never" +msgstr "Niemals" + +#: mod/admin.php:860 +msgid "At post arrival" +msgstr "Beim Empfang von Nachrichten" + +#: mod/admin.php:868 mod/contacts.php:557 +msgid "Disabled" +msgstr "Deaktiviert" + +#: mod/admin.php:870 +msgid "Users, Global Contacts" +msgstr "Nutzer, globale Kontakte" + +#: mod/admin.php:871 +msgid "Users, Global Contacts/fallback" +msgstr "Nutzer, globale Kontakte / Fallback" + +#: mod/admin.php:875 +msgid "One month" +msgstr "ein Monat" + +#: mod/admin.php:876 +msgid "Three months" +msgstr "drei Monate" + +#: mod/admin.php:877 +msgid "Half a year" +msgstr "ein halbes Jahr" + +#: mod/admin.php:878 +msgid "One year" +msgstr "ein Jahr" + +#: mod/admin.php:883 +msgid "Multi user instance" +msgstr "Mehrbenutzer Instanz" + +#: mod/admin.php:906 +msgid "Closed" +msgstr "Geschlossen" + +#: mod/admin.php:907 +msgid "Requires approval" +msgstr "Bedarf der Zustimmung" + +#: mod/admin.php:908 +msgid "Open" +msgstr "Offen" + +#: mod/admin.php:912 +msgid "No SSL policy, links will track page SSL state" +msgstr "Keine SSL Richtlinie, Links werden das verwendete Protokoll beibehalten" + +#: mod/admin.php:913 +msgid "Force all links to use SSL" +msgstr "SSL für alle Links erzwingen" + +#: mod/admin.php:914 +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:926 mod/admin.php:1560 mod/admin.php:1808 mod/admin.php:1876 +#: mod/admin.php:2025 mod/settings.php:663 mod/settings.php:773 +#: mod/settings.php:820 mod/settings.php:889 mod/settings.php:976 +#: mod/settings.php:1214 +msgid "Save Settings" +msgstr "Einstellungen speichern" + +#: mod/admin.php:927 mod/register.php:263 +msgid "Registration" +msgstr "Registrierung" + +#: mod/admin.php:928 +msgid "File upload" +msgstr "Datei hochladen" + +#: mod/admin.php:929 +msgid "Policies" +msgstr "Regeln" + +#: mod/admin.php:931 +msgid "Auto Discovered Contact Directory" +msgstr "Automatisch ein Kontaktverzeichnis erstellen" + +#: mod/admin.php:932 +msgid "Performance" +msgstr "Performance" + +#: mod/admin.php:933 +msgid "Worker" +msgstr "Worker" + +#: mod/admin.php:934 +msgid "" +"Relocate - WARNING: advanced function. Could make this server unreachable." +msgstr "Umsiedeln - WARNUNG: Könnte diesen Server unerreichbar machen." + +#: mod/admin.php:937 +msgid "Site name" +msgstr "Seitenname" + +#: mod/admin.php:938 +msgid "Host name" +msgstr "Host Name" + +#: mod/admin.php:939 +msgid "Sender Email" +msgstr "Absender für Emails" + +#: mod/admin.php:939 +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:940 +msgid "Banner/Logo" +msgstr "Banner/Logo" + +#: mod/admin.php:941 +msgid "Shortcut icon" +msgstr "Shortcut Icon" + +#: mod/admin.php:941 +msgid "Link to an icon that will be used for browsers." +msgstr "Link zu einem Icon, das Browser verwenden werden." + +#: mod/admin.php:942 +msgid "Touch icon" +msgstr "Touch Icon" + +#: mod/admin.php:942 +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:943 +msgid "Additional Info" +msgstr "Zusätzliche Informationen" + +#: mod/admin.php:943 +#, 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:944 +msgid "System language" +msgstr "Systemsprache" + +#: mod/admin.php:945 +msgid "System theme" +msgstr "Systemweites Theme" + +#: mod/admin.php:945 +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:946 +msgid "Mobile system theme" +msgstr "Systemweites mobiles Theme" + +#: mod/admin.php:946 +msgid "Theme for mobile devices" +msgstr "Thema für mobile Geräte" + +#: mod/admin.php:947 +msgid "SSL link policy" +msgstr "Regeln für SSL Links" + +#: mod/admin.php:947 +msgid "Determines whether generated links should be forced to use SSL" +msgstr "Bestimmt, ob generierte Links SSL verwenden müssen" + +#: mod/admin.php:948 +msgid "Force SSL" +msgstr "Erzwinge SSL" + +#: mod/admin.php:948 +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:949 +msgid "Old style 'Share'" +msgstr "Altes \"Teilen\" Element" + +#: mod/admin.php:949 +msgid "Deactivates the bbcode element 'share' for repeating items." +msgstr "Deaktiviert das BBCode Element \"share\" beim Wiederholen von Beiträgen." + +#: mod/admin.php:950 +msgid "Hide help entry from navigation menu" +msgstr "Verberge den Menüeintrag für die Hilfe im Navigationsmenü" + +#: mod/admin.php:950 +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:951 +msgid "Single user instance" +msgstr "Ein-Nutzer Instanz" + +#: mod/admin.php:951 +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:952 +msgid "Maximum image size" +msgstr "Maximale Bildgröße" + +#: mod/admin.php:952 +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:953 +msgid "Maximum image length" +msgstr "Maximale Bildlänge" + +#: mod/admin.php:953 +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:954 +msgid "JPEG image quality" +msgstr "Qualität des JPEG Bildes" + +#: mod/admin.php:954 +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:956 +msgid "Register policy" +msgstr "Registrierungsmethode" + +#: mod/admin.php:957 +msgid "Maximum Daily Registrations" +msgstr "Maximum täglicher Registrierungen" + +#: mod/admin.php:957 +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:958 +msgid "Register text" +msgstr "Registrierungstext" + +#: mod/admin.php:958 +msgid "Will be displayed prominently on the registration page." +msgstr "Wird gut sichtbar auf der Registrierungsseite angezeigt." + +#: mod/admin.php:959 +msgid "Accounts abandoned after x days" +msgstr "Nutzerkonten gelten nach x Tagen als unbenutzt" + +#: mod/admin.php:959 +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:960 +msgid "Allowed friend domains" +msgstr "Erlaubte Domains für Kontakte" + +#: mod/admin.php:960 +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 Kontakte erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben." + +#: mod/admin.php:961 +msgid "Allowed email domains" +msgstr "Erlaubte Domains für E-Mails" + +#: mod/admin.php:961 +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:962 +msgid "Block public" +msgstr "Öffentlichen Zugriff blockieren" + +#: mod/admin.php:962 +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:963 +msgid "Force publish" +msgstr "Erzwinge Veröffentlichung" + +#: mod/admin.php:963 +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:964 +msgid "Global directory URL" +msgstr "URL des weltweiten Verzeichnisses" + +#: mod/admin.php:964 +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:965 +msgid "Allow threaded items" +msgstr "Erlaube Threads in Diskussionen" + +#: mod/admin.php:965 +msgid "Allow infinite level threading for items on this site." +msgstr "Erlaube ein unendliches Level für Threads auf dieser Seite." + +#: mod/admin.php:966 +msgid "Private posts by default for new users" +msgstr "Private Beiträge als Standard für neue Nutzer" + +#: mod/admin.php:966 +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:967 +msgid "Don't include post content in email notifications" +msgstr "Inhalte von Beiträgen nicht in E-Mail-Benachrichtigungen versenden" + +#: mod/admin.php:967 +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:968 +msgid "Disallow public access to addons listed in the apps menu." +msgstr "Öffentlichen Zugriff auf Addons im Apps Menü verbieten." + +#: mod/admin.php:968 +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:969 +msgid "Don't embed private images in posts" +msgstr "Private Bilder nicht in Beiträgen einbetten." + +#: mod/admin.php:969 +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 " +"photos will have to authenticate and load each image, which may take a " +"while." +msgstr "Ersetze lokal gehostete private Fotos in Beiträgen nicht mit einer eingebetteten Kopie des Bildes. Dies bedeutet, dass Kontakte, die Beiträge mit privaten Fotos erhalten sich zunächst auf den jeweiligen Servern authentifizieren müssen bevor die Bilder geladen und angezeigt werden, was eine gewisse Zeit dauert." + +#: mod/admin.php:970 +msgid "Allow Users to set remote_self" +msgstr "Nutzern erlauben das remote_self Flag zu setzen" + +#: mod/admin.php:970 +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:971 +msgid "Block multiple registrations" +msgstr "Unterbinde Mehrfachregistrierung" + +#: mod/admin.php:971 +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:972 +msgid "OpenID support" +msgstr "OpenID Unterstützung" + +#: mod/admin.php:972 +msgid "OpenID support for registration and logins." +msgstr "OpenID-Unterstützung für Registrierung und Login." + +#: mod/admin.php:973 +msgid "Fullname check" +msgstr "Namen auf Vollständigkeit überprüfen" + +#: mod/admin.php:973 +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:974 +msgid "UTF-8 Regular expressions" +msgstr "UTF-8 Reguläre Ausdrücke" + +#: mod/admin.php:974 +msgid "Use PHP UTF8 regular expressions" +msgstr "PHP UTF8 Ausdrücke verwenden" + +#: mod/admin.php:975 +msgid "Community Page Style" +msgstr "Art der Gemeinschaftsseite" + +#: mod/admin.php:975 +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:976 +msgid "Posts per user on community page" +msgstr "Anzahl der Beiträge pro Benutzer auf der Gemeinschaftsseite" + +#: mod/admin.php:976 +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:977 +msgid "Enable OStatus support" +msgstr "OStatus Unterstützung aktivieren" + +#: mod/admin.php:977 +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:978 +msgid "OStatus conversation completion interval" +msgstr "Intervall zum Vervollständigen von OStatus Unterhaltungen" + +#: mod/admin.php:978 +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:979 +msgid "Only import OStatus threads from our contacts" +msgstr "Nur OStatus Konversationen unserer Kontakte importieren" + +#: mod/admin.php:979 +msgid "" +"Normally we import every content from our OStatus contacts. With this option" +" we only store threads that are started by a contact that is known on our " +"system." +msgstr "Normalerweise werden alle Inhalte von OStatus Kontakten importiert. Mit dieser Option werden nur solche Konversationen gespeichert, die von Kontakten der Nutzer dieses Knotens gestartet wurden." + +#: mod/admin.php:980 +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:982 +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:983 +msgid "Enable Diaspora support" +msgstr "Diaspora Unterstützung aktivieren" + +#: mod/admin.php:983 +msgid "Provide built-in Diaspora network compatibility." +msgstr "Verwende die eingebaute Diaspora-Verknüpfung." + +#: mod/admin.php:984 +msgid "Only allow Friendica contacts" +msgstr "Nur Friendica-Kontakte erlauben" + +#: mod/admin.php:984 +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:985 +msgid "Verify SSL" +msgstr "SSL Überprüfen" + +#: mod/admin.php:985 +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:986 +msgid "Proxy user" +msgstr "Proxy Nutzer" + +#: mod/admin.php:987 +msgid "Proxy URL" +msgstr "Proxy URL" + +#: mod/admin.php:988 +msgid "Network timeout" +msgstr "Netzwerk Wartezeit" + +#: mod/admin.php:988 +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:989 +msgid "Delivery interval" +msgstr "Zustellungsintervall" + +#: mod/admin.php:989 +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:990 +msgid "Poll interval" +msgstr "Abfrageintervall" + +#: mod/admin.php:990 +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:991 +msgid "Maximum Load Average" +msgstr "Maximum Load Average" + +#: mod/admin.php:991 +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:992 +msgid "Maximum Load Average (Frontend)" +msgstr "Maximum Load Average (Frontend)" + +#: mod/admin.php:992 +msgid "Maximum system load before the frontend quits service - default 50." +msgstr "Maximale Systemlast bevor Vordergrundprozesse pausiert werden - Standard 50." + +#: mod/admin.php:993 +msgid "Maximum table size for optimization" +msgstr "Maximale Tabellengröße zur Optimierung" + +#: mod/admin.php:993 +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:994 +msgid "Minimum level of fragmentation" +msgstr "Minimaler Fragmentationsgrad" + +#: mod/admin.php:994 +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:996 +msgid "Periodical check of global contacts" +msgstr "Regelmäßig globale Kontakte überprüfen" + +#: mod/admin.php:996 +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:997 +msgid "Days between requery" +msgstr "Tage zwischen erneuten Abfragen" + +#: mod/admin.php:997 +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:998 +msgid "Discover contacts from other servers" +msgstr "Neue Kontakte auf anderen Servern entdecken" + +#: mod/admin.php:998 +msgid "" +"Periodically query other servers for contacts. You can choose between " +"'users': the users on the remote system, 'Global Contacts': active contacts " +"that are known on the system. The fallback is meant for Redmatrix servers " +"and older friendica servers, where global contacts weren't available. The " +"fallback increases the server load, so the recommened setting is 'Users, " +"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:999 +msgid "Timeframe for fetching global contacts" +msgstr "Zeitfenster für globale Kontakte" + +#: mod/admin.php:999 +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:1000 +msgid "Search the local directory" +msgstr "Lokales Verzeichnis durchsuchen" + +#: mod/admin.php:1000 +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:1002 +msgid "Publish server information" +msgstr "Server Informationen veröffentlichen" + +#: mod/admin.php:1002 +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 " +"profiles, number of posts and the activated protocols and connectors. See 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:1004 +msgid "Use MySQL full text engine" +msgstr "Nutze MySQL full text engine" + +#: mod/admin.php:1004 +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:1005 +msgid "Suppress Language" +msgstr "Sprachinformation unterdrücken" + +#: mod/admin.php:1005 +msgid "Suppress language information in meta information about a posting." +msgstr "Verhindert das Erzeugen der Meta-Information zur Spracherkennung eines Beitrags." + +#: mod/admin.php:1006 +msgid "Suppress Tags" +msgstr "Tags Unterdrücken" + +#: mod/admin.php:1006 +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:1007 +msgid "Path to item cache" +msgstr "Pfad zum Eintrag Cache" + +#: mod/admin.php:1007 +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:1008 +msgid "Cache duration in seconds" +msgstr "Cache-Dauer in Sekunden" + +#: mod/admin.php:1008 +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:1009 +msgid "Maximum numbers of comments per post" +msgstr "Maximale Anzahl von Kommentaren pro Beitrag" + +#: mod/admin.php:1009 +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:1010 +msgid "Path for lock file" +msgstr "Pfad für die Sperrdatei" + +#: mod/admin.php:1010 +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:1011 +msgid "Temp path" +msgstr "Temp Pfad" + +#: mod/admin.php:1011 +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:1012 +msgid "Base path to installation" +msgstr "Basis-Pfad zur Installation" + +#: mod/admin.php:1012 +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:1013 +msgid "Disable picture proxy" +msgstr "Bilder Proxy deaktivieren" + +#: mod/admin.php:1013 +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:1014 +msgid "Enable old style pager" +msgstr "Den Old-Style Pager aktiviren" + +#: mod/admin.php:1014 +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:1015 +msgid "Only search in tags" +msgstr "Nur in Tags suchen" + +#: mod/admin.php:1015 +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:1017 +msgid "New base url" +msgstr "Neue Basis-URL" + +#: mod/admin.php:1017 +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:1019 +msgid "RINO Encryption" +msgstr "RINO Verschlüsselung" + +#: mod/admin.php:1019 +msgid "Encryption layer between nodes." +msgstr "Verschlüsselung zwischen Friendica Instanzen" + +#: mod/admin.php:1020 +msgid "Embedly API key" +msgstr "Embedly API Schlüssel" + +#: mod/admin.php:1020 +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:1022 +msgid "Enable 'worker' background processing" +msgstr "Aktiviere die 'Worker' Hintergrundprozesse" + +#: mod/admin.php:1022 +msgid "" +"The worker background processing limits the number of parallel background " +"jobs to a maximum number and respects the system load." +msgstr "Der 'background worker' Prozess begrenzt die Zahl der Prozesse, die im Hintergrund parallel laufen und beachtet dabei die Systemlast." + +#: mod/admin.php:1023 +msgid "Maximum number of parallel workers" +msgstr "Maximale Anzahl parallel laufender Worker" + +#: mod/admin.php:1023 +msgid "" +"On shared hosters set this to 2. On larger systems, values of 10 are great. " +"Default value is 4." +msgstr "Wenn dein Knoten bei einem Shared Hoster ist, setzte diesen Wert auf 2. Auf größeren Systemen funktioniert ein Wert von 10 recht gut. Standardeinstellung sind 4." + +#: mod/admin.php:1024 +msgid "Don't use 'proc_open' with the worker" +msgstr "'proc_open' nicht mit den Workern verwenden" + +#: mod/admin.php:1024 +msgid "" +"Enable this if your system doesn't allow the use of 'proc_open'. This can " +"happen on shared hosters. If this is enabled you should increase the " +"frequency of poller calls in your crontab." +msgstr "Aktiviere diese Option, wenn dein System die Verwendung von 'proc_open' verhindert. Dies könnte auf Shared Hostern der Fall sein. Wenn du diese Option aktivierst, solltest du die Frequenz der poller Aufrufe in deiner crontab erhöhen." + +#: mod/admin.php:1025 +msgid "Enable fastlane" +msgstr "Aktiviere Fastlane" + +#: mod/admin.php:1025 +msgid "" +"When enabed, the fastlane mechanism starts an additional worker if processes" +" with higher priority are blocked by processes of lower priority." +msgstr "Wenn aktiviert, wird der Fastlane-Mechanismus einen weiteren Worker-Prozeß starten wenn Prozesse mit höherer Priorität von Prozessen mit niedrigerer Priorität blockiert werden." + +#: mod/admin.php:1054 +msgid "Update has been marked successful" +msgstr "Update wurde als erfolgreich markiert" + +#: mod/admin.php:1062 +#, php-format +msgid "Database structure update %s was successfully applied." +msgstr "Das Update %s der Struktur der Datenbank wurde erfolgreich angewandt." + +#: mod/admin.php:1065 +#, 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:1077 +#, php-format +msgid "Executing %s failed with error: %s" +msgstr "Die Ausführung von %s schlug fehl. Fehlermeldung: %s" + +#: mod/admin.php:1080 +#, php-format +msgid "Update %s was successfully applied." +msgstr "Update %s war erfolgreich." + +#: mod/admin.php:1084 +#, 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:1086 +#, 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:1105 +msgid "No failed updates." +msgstr "Keine fehlgeschlagenen Updates." + +#: mod/admin.php:1106 +msgid "Check database structure" +msgstr "Datenbank Struktur überprüfen" + +#: mod/admin.php:1111 +msgid "Failed Updates" +msgstr "Fehlgeschlagene Updates" + +#: mod/admin.php:1112 +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:1113 +msgid "Mark success (if update was manually applied)" +msgstr "Als erfolgreich markieren (falls das Update manuell installiert wurde)" + +#: mod/admin.php:1114 +msgid "Attempt to execute this update step automatically" +msgstr "Versuchen, diesen Schritt automatisch auszuführen" + +#: mod/admin.php:1146 +#, php-format +msgid "" +"\n" +"\t\t\tDear %1$s,\n" +"\t\t\t\tthe administrator of %2$s has set up an account for you." +msgstr "\nHallo %1$s,\n\nauf %2$s wurde ein Account für Dich angelegt." + +#: mod/admin.php:1149 +#, php-format +msgid "" +"\n" +"\t\t\tThe login details are as follows:\n" +"\n" +"\t\t\tSite Location:\t%1$s\n" +"\t\t\tLogin Name:\t\t%2$s\n" +"\t\t\tPassword:\t\t%3$s\n" +"\n" +"\t\t\tYou may change your password from your account \"Settings\" page after logging\n" +"\t\t\tin.\n" +"\n" +"\t\t\tPlease take a few moments to review the other account settings on that page.\n" +"\n" +"\t\t\tYou may also wish to add some basic information to your default profile\n" +"\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n" +"\n" +"\t\t\tWe recommend setting your full name, adding a profile photo,\n" +"\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n" +"\t\t\tperhaps what country you live in; if you do not wish to be more specific\n" +"\t\t\tthan that.\n" +"\n" +"\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n" +"\t\t\tIf you are new and do not know anybody here, they may help\n" +"\t\t\tyou to make some new and interesting friends.\n" +"\n" +"\t\t\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:1193 +#, 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:1200 +#, 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:1247 +#, php-format +msgid "User '%s' deleted" +msgstr "Nutzer '%s' gelöscht" + +#: mod/admin.php:1255 +#, php-format +msgid "User '%s' unblocked" +msgstr "Nutzer '%s' entsperrt" + +#: mod/admin.php:1255 +#, php-format +msgid "User '%s' blocked" +msgstr "Nutzer '%s' gesperrt" + +#: mod/admin.php:1374 mod/admin.php:1399 +msgid "Register date" +msgstr "Anmeldedatum" + +#: mod/admin.php:1374 mod/admin.php:1399 +msgid "Last login" +msgstr "Letzte Anmeldung" + +#: mod/admin.php:1374 mod/admin.php:1399 +msgid "Last item" +msgstr "Letzter Beitrag" + +#: mod/admin.php:1374 mod/settings.php:43 +msgid "Account" +msgstr "Nutzerkonto" + +#: mod/admin.php:1383 +msgid "Add User" +msgstr "Nutzer hinzufügen" + +#: mod/admin.php:1384 +msgid "select all" +msgstr "Alle auswählen" + +#: mod/admin.php:1385 +msgid "User registrations waiting for confirm" +msgstr "Neuanmeldungen, die auf Deine Bestätigung warten" + +#: mod/admin.php:1386 +msgid "User waiting for permanent deletion" +msgstr "Nutzer wartet auf permanente Löschung" + +#: mod/admin.php:1387 +msgid "Request date" +msgstr "Anfragedatum" + +#: mod/admin.php:1388 +msgid "No registrations." +msgstr "Keine Neuanmeldungen." + +#: mod/admin.php:1390 +msgid "Deny" +msgstr "Verwehren" + +#: mod/admin.php:1392 mod/contacts.php:605 mod/contacts.php:803 +#: mod/contacts.php:997 +msgid "Block" +msgstr "Sperren" + +#: mod/admin.php:1393 mod/contacts.php:605 mod/contacts.php:803 +#: mod/contacts.php:997 +msgid "Unblock" +msgstr "Entsperren" + +#: mod/admin.php:1394 +msgid "Site admin" +msgstr "Seitenadministrator" + +#: mod/admin.php:1395 +msgid "Account expired" +msgstr "Account ist abgelaufen" + +#: mod/admin.php:1398 +msgid "New User" +msgstr "Neuer Nutzer" + +#: mod/admin.php:1399 +msgid "Deleted since" +msgstr "Gelöscht seit" + +#: mod/admin.php:1404 +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:1405 +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:1415 +msgid "Name of the new user." +msgstr "Name des neuen Nutzers" + +#: mod/admin.php:1416 +msgid "Nickname" +msgstr "Spitzname" + +#: mod/admin.php:1416 +msgid "Nickname of the new user." +msgstr "Spitznamen für den neuen Nutzer" + +#: mod/admin.php:1417 +msgid "Email address of the new user." +msgstr "Email Adresse des neuen Nutzers" + +#: mod/admin.php:1460 +#, php-format +msgid "Plugin %s disabled." +msgstr "Plugin %s deaktiviert." + +#: mod/admin.php:1464 +#, php-format +msgid "Plugin %s enabled." +msgstr "Plugin %s aktiviert." + +#: mod/admin.php:1475 mod/admin.php:1711 +msgid "Disable" +msgstr "Ausschalten" + +#: mod/admin.php:1477 mod/admin.php:1713 +msgid "Enable" +msgstr "Einschalten" + +#: mod/admin.php:1500 mod/admin.php:1758 +msgid "Toggle" +msgstr "Umschalten" + +#: mod/admin.php:1508 mod/admin.php:1767 +msgid "Author: " +msgstr "Autor:" + +#: mod/admin.php:1509 mod/admin.php:1768 +msgid "Maintainer: " +msgstr "Betreuer:" + +#: mod/admin.php:1561 +msgid "Reload active plugins" +msgstr "Aktive Plugins neu laden" + +#: mod/admin.php:1566 +#, 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:1671 +msgid "No themes found." +msgstr "Keine Themen gefunden." + +#: mod/admin.php:1749 +msgid "Screenshot" +msgstr "Bildschirmfoto" + +#: mod/admin.php:1809 +msgid "Reload active themes" +msgstr "Aktives Theme neu laden" + +#: mod/admin.php:1814 +#, 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:1815 +msgid "[Experimental]" +msgstr "[Experimentell]" + +#: mod/admin.php:1816 +msgid "[Unsupported]" +msgstr "[Nicht unterstützt]" + +#: mod/admin.php:1840 +msgid "Log settings updated." +msgstr "Protokolleinstellungen aktualisiert." + +#: mod/admin.php:1877 +msgid "Clear" +msgstr "löschen" + +#: mod/admin.php:1882 +msgid "Enable Debugging" +msgstr "Protokoll führen" + +#: mod/admin.php:1883 +msgid "Log file" +msgstr "Protokolldatei" + +#: mod/admin.php:1883 +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:1884 +msgid "Log level" +msgstr "Protokoll-Level" + +#: mod/admin.php:1887 +msgid "PHP logging" +msgstr "PHP Protokollieren" + +#: mod/admin.php:1888 +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/admin.php:2014 mod/admin.php:2015 mod/settings.php:763 +msgid "Off" +msgstr "Aus" + +#: mod/admin.php:2014 mod/admin.php:2015 mod/settings.php:763 +msgid "On" +msgstr "An" + +#: mod/admin.php:2015 +#, php-format +msgid "Lock feature %s" +msgstr "Feature festlegen: %s" + +#: mod/admin.php:2023 +msgid "Manage Additional Features" +msgstr "Zusätzliche Features Verwalten" + +#: mod/contacts.php:128 +#, php-format +msgid "%d contact edited." +msgid_plural "%d contacts edited." +msgstr[0] "%d Kontakt bearbeitet." +msgstr[1] "%d Kontakte bearbeitet." + +#: mod/contacts.php:159 mod/contacts.php:368 +msgid "Could not access contact record." +msgstr "Konnte nicht auf die Kontaktdaten zugreifen." + +#: mod/contacts.php:173 +msgid "Could not locate selected profile." +msgstr "Konnte das ausgewählte Profil nicht finden." + +#: mod/contacts.php:206 +msgid "Contact updated." +msgstr "Kontakt aktualisiert." + +#: mod/contacts.php:389 +msgid "Contact has been blocked" +msgstr "Kontakt wurde blockiert" + +#: mod/contacts.php:389 +msgid "Contact has been unblocked" +msgstr "Kontakt wurde wieder freigegeben" + +#: mod/contacts.php:400 +msgid "Contact has been ignored" +msgstr "Kontakt wurde ignoriert" + +#: mod/contacts.php:400 +msgid "Contact has been unignored" +msgstr "Kontakt wird nicht mehr ignoriert" + +#: mod/contacts.php:412 +msgid "Contact has been archived" +msgstr "Kontakt wurde archiviert" + +#: mod/contacts.php:412 +msgid "Contact has been unarchived" +msgstr "Kontakt wurde aus dem Archiv geholt" + +#: mod/contacts.php:437 +msgid "Drop contact" +msgstr "Kontakt löschen" + +#: mod/contacts.php:440 mod/contacts.php:799 +msgid "Do you really want to delete this contact?" +msgstr "Möchtest Du wirklich diesen Kontakt löschen?" + +#: mod/contacts.php:457 +msgid "Contact has been removed." +msgstr "Kontakt wurde entfernt." + +#: mod/contacts.php:498 +#, php-format +msgid "You are mutual friends with %s" +msgstr "Du hast mit %s eine beidseitige Freundschaft" + +#: mod/contacts.php:502 +#, php-format +msgid "You are sharing with %s" +msgstr "Du teilst mit %s" + +#: mod/contacts.php:507 +#, php-format +msgid "%s is sharing with you" +msgstr "%s teilt mit Dir" + +#: mod/contacts.php:527 +msgid "Private communications are not available for this contact." +msgstr "Private Kommunikation ist für diesen Kontakt nicht verfügbar." + +#: mod/contacts.php:534 +msgid "(Update was successful)" +msgstr "(Aktualisierung war erfolgreich)" + +#: mod/contacts.php:534 +msgid "(Update was not successful)" +msgstr "(Aktualisierung war nicht erfolgreich)" + +#: mod/contacts.php:536 mod/contacts.php:978 +msgid "Suggest friends" +msgstr "Kontakte vorschlagen" + +#: mod/contacts.php:540 +#, php-format +msgid "Network type: %s" +msgstr "Netzwerktyp: %s" + +#: mod/contacts.php:553 +msgid "Communications lost with this contact!" +msgstr "Verbindungen mit diesem Kontakt verloren!" + +#: mod/contacts.php:556 +msgid "Fetch further information for feeds" +msgstr "Weitere Informationen zu Feeds holen" + +#: mod/contacts.php:557 +msgid "Fetch information" +msgstr "Beziehe Information" + +#: mod/contacts.php:557 +msgid "Fetch information and keywords" +msgstr "Beziehe Information und Schlüsselworte" + +#: mod/contacts.php:575 +msgid "Contact" +msgstr "Kontakt: " + +#: mod/contacts.php:578 +msgid "Profile Visibility" +msgstr "Profil-Sichtbarkeit" + +#: mod/contacts.php:579 +#, php-format +msgid "" +"Please choose the profile you would like to display to %s when viewing your " +"profile securely." +msgstr "Bitte wähle eines Deiner Profile das angezeigt werden soll, wenn %s Dein Profil aufruft." + +#: mod/contacts.php:580 +msgid "Contact Information / Notes" +msgstr "Kontakt Informationen / Notizen" + +#: mod/contacts.php:581 +msgid "Edit contact notes" +msgstr "Notizen zum Kontakt bearbeiten" + +#: mod/contacts.php:587 +msgid "Block/Unblock contact" +msgstr "Kontakt blockieren/freischalten" + +#: mod/contacts.php:588 +msgid "Ignore contact" +msgstr "Ignoriere den Kontakt" + +#: mod/contacts.php:589 +msgid "Repair URL settings" +msgstr "URL Einstellungen reparieren" + +#: mod/contacts.php:590 +msgid "View conversations" +msgstr "Unterhaltungen anzeigen" + +#: mod/contacts.php:596 +msgid "Last update:" +msgstr "Letzte Aktualisierung: " + +#: mod/contacts.php:598 +msgid "Update public posts" +msgstr "Öffentliche Beiträge aktualisieren" + +#: mod/contacts.php:600 mod/contacts.php:988 +msgid "Update now" +msgstr "Jetzt aktualisieren" + +#: mod/contacts.php:606 mod/contacts.php:804 mod/contacts.php:1005 +msgid "Unignore" +msgstr "Ignorieren aufheben" + +#: mod/contacts.php:610 +msgid "Currently blocked" +msgstr "Derzeit geblockt" + +#: mod/contacts.php:611 +msgid "Currently ignored" +msgstr "Derzeit ignoriert" + +#: mod/contacts.php:612 +msgid "Currently archived" +msgstr "Momentan archiviert" + +#: mod/contacts.php:613 +msgid "" +"Replies/likes to your public posts may still be visible" +msgstr "Antworten/Likes auf deine öffentlichen Beiträge könnten weiterhin sichtbar sein" + +#: mod/contacts.php:614 +msgid "Notification for new posts" +msgstr "Benachrichtigung bei neuen Beiträgen" + +#: mod/contacts.php:614 +msgid "Send a notification of every new post of this contact" +msgstr "Sende eine Benachrichtigung, wann immer dieser Kontakt einen neuen Beitrag schreibt." + +#: mod/contacts.php:617 +msgid "Blacklisted keywords" +msgstr "Blacklistete Schlüsselworte " + +#: mod/contacts.php:617 +msgid "" +"Comma separated list of keywords that should not be converted to hashtags, " +"when \"Fetch information and keywords\" is selected" +msgstr "Komma-Separierte Liste mit Schlüsselworten, die nicht in Hashtags konvertiert werden, wenn \"Beziehe Information und Schlüsselworte\" aktiviert wurde" + +#: mod/contacts.php:633 +msgid "Actions" +msgstr "Aktionen" + +#: mod/contacts.php:636 +msgid "Contact Settings" +msgstr "Kontakteinstellungen" + +#: mod/contacts.php:682 +msgid "Suggestions" +msgstr "Kontaktvorschläge" + +#: mod/contacts.php:685 +msgid "Suggest potential friends" +msgstr "Kontakte vorschlagen" + +#: mod/contacts.php:693 +msgid "Show all contacts" +msgstr "Alle Kontakte anzeigen" + +#: mod/contacts.php:698 +msgid "Unblocked" +msgstr "Ungeblockt" + +#: mod/contacts.php:701 +msgid "Only show unblocked contacts" +msgstr "Nur nicht-blockierte Kontakte anzeigen" + +#: mod/contacts.php:707 +msgid "Blocked" +msgstr "Geblockt" + +#: mod/contacts.php:710 +msgid "Only show blocked contacts" +msgstr "Nur blockierte Kontakte anzeigen" + +#: mod/contacts.php:716 +msgid "Ignored" +msgstr "Ignoriert" + +#: mod/contacts.php:719 +msgid "Only show ignored contacts" +msgstr "Nur ignorierte Kontakte anzeigen" + +#: mod/contacts.php:725 +msgid "Archived" +msgstr "Archiviert" + +#: mod/contacts.php:728 +msgid "Only show archived contacts" +msgstr "Nur archivierte Kontakte anzeigen" + +#: mod/contacts.php:734 +msgid "Hidden" +msgstr "Verborgen" + +#: mod/contacts.php:737 +msgid "Only show hidden contacts" +msgstr "Nur verborgene Kontakte anzeigen" + +#: mod/contacts.php:794 +msgid "Search your contacts" +msgstr "Suche in deinen Kontakten" + +#: mod/contacts.php:802 mod/settings.php:158 mod/settings.php:689 +msgid "Update" +msgstr "Aktualisierungen" + +#: mod/contacts.php:805 mod/contacts.php:1013 +msgid "Archive" +msgstr "Archivieren" + +#: mod/contacts.php:805 mod/contacts.php:1013 +msgid "Unarchive" +msgstr "Aus Archiv zurückholen" + +#: mod/contacts.php:808 +msgid "Batch Actions" +msgstr "Stapelverarbeitung" + +#: mod/contacts.php:854 +msgid "View all contacts" +msgstr "Alle Kontakte anzeigen" + +#: mod/contacts.php:864 +msgid "View all common friends" +msgstr "Alle Kontakte anzeigen" + +#: mod/contacts.php:871 +msgid "Advanced Contact Settings" +msgstr "Fortgeschrittene Kontakteinstellungen" + +#: mod/contacts.php:916 +msgid "Mutual Friendship" +msgstr "Beidseitige Freundschaft" + +#: mod/contacts.php:920 +msgid "is a fan of yours" +msgstr "ist ein Fan von dir" + +#: mod/contacts.php:924 +msgid "you are a fan of" +msgstr "Du bist Fan von" + +#: mod/contacts.php:999 +msgid "Toggle Blocked status" +msgstr "Geblockt-Status ein-/ausschalten" + +#: mod/contacts.php:1007 +msgid "Toggle Ignored status" +msgstr "Ignoriert-Status ein-/ausschalten" + +#: mod/contacts.php:1015 +msgid "Toggle Archive status" +msgstr "Archiviert-Status ein-/ausschalten" + +#: mod/contacts.php:1023 +msgid "Delete contact" +msgstr "Lösche den Kontakt" + +#: mod/dfrn_confirm.php:66 mod/profiles.php:19 mod/profiles.php:134 +#: mod/profiles.php:180 mod/profiles.php:610 +msgid "Profile not found." +msgstr "Profil nicht gefunden." + +#: mod/dfrn_confirm.php:123 +msgid "" +"This may occasionally happen if contact was requested by both persons and it" +" has already been approved." +msgstr "Das kann passieren, wenn sich zwei Kontakte gegenseitig eingeladen haben und bereits einer angenommen wurde." + +#: mod/dfrn_confirm.php:242 +msgid "Response from remote site was not understood." +msgstr "Antwort der Gegenstelle unverständlich." + +#: mod/dfrn_confirm.php:251 mod/dfrn_confirm.php:256 +msgid "Unexpected response from remote site: " +msgstr "Unerwartete Antwort der Gegenstelle: " + +#: mod/dfrn_confirm.php:265 +msgid "Confirmation completed successfully." +msgstr "Bestätigung erfolgreich abgeschlossen." + +#: mod/dfrn_confirm.php:267 mod/dfrn_confirm.php:281 mod/dfrn_confirm.php:288 +msgid "Remote site reported: " +msgstr "Gegenstelle meldet: " + +#: mod/dfrn_confirm.php:279 +msgid "Temporary failure. Please wait and try again." +msgstr "Zeitweiser Fehler. Bitte warte einige Momente und versuche es dann noch einmal." + +#: mod/dfrn_confirm.php:286 +msgid "Introduction failed or was revoked." +msgstr "Kontaktanfrage schlug fehl oder wurde zurückgezogen." + +#: mod/dfrn_confirm.php:415 +msgid "Unable to set contact photo." +msgstr "Konnte das Bild des Kontakts nicht speichern." + +#: mod/dfrn_confirm.php:553 +#, php-format +msgid "No user record found for '%s' " +msgstr "Für '%s' wurde kein Nutzer gefunden" + +#: mod/dfrn_confirm.php:563 +msgid "Our site encryption key is apparently messed up." +msgstr "Der Verschlüsselungsschlüssel unserer Seite ist anscheinend nicht in Ordnung." + +#: mod/dfrn_confirm.php:574 +msgid "Empty site URL was provided or URL could not be decrypted by us." +msgstr "Leere URL für die Seite erhalten oder die URL konnte nicht entschlüsselt werden." + +#: mod/dfrn_confirm.php:595 +msgid "Contact record was not found for you on our site." +msgstr "Für diesen Kontakt wurde auf unserer Seite kein Eintrag gefunden." + +#: mod/dfrn_confirm.php:609 +#, php-format +msgid "Site public key not available in contact record for URL %s." +msgstr "Die Kontaktdaten für URL %s enthalten keinen Public Key für den Server." + +#: mod/dfrn_confirm.php:629 +msgid "" +"The ID provided by your system is a duplicate on our system. It should work " +"if you try again." +msgstr "Die ID, die uns Dein System angeboten hat, ist hier bereits vergeben. Bitte versuche es noch einmal." + +#: mod/dfrn_confirm.php:640 +msgid "Unable to set your contact credentials on our system." +msgstr "Deine Kontaktreferenzen konnten nicht in unserem System gespeichert werden." + +#: mod/dfrn_confirm.php:699 +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:771 +#, php-format +msgid "%1$s has joined %2$s" +msgstr "%1$s ist %2$s beigetreten" + +#: mod/dirfind.php:36 +#, php-format +msgid "People Search - %s" +msgstr "Personensuche - %s" + +#: mod/dirfind.php:47 +#, php-format +msgid "Forum Search - %s" +msgstr "Forensuche - %s" + +#: mod/events.php:95 mod/events.php:97 +msgid "Event can not end before it has started." +msgstr "Die Veranstaltung kann nicht enden bevor sie beginnt." + +#: mod/events.php:104 mod/events.php:106 +msgid "Event title and start time are required." +msgstr "Der Veranstaltungstitel und die Anfangszeit müssen angegeben werden." + +#: mod/events.php:381 +msgid "Create New Event" +msgstr "Neue Veranstaltung erstellen" + +#: mod/events.php:483 +msgid "Event details" +msgstr "Veranstaltungsdetails" + +#: mod/events.php:484 +msgid "Starting date and Title are required." +msgstr "Anfangszeitpunkt und Titel werden benötigt" + +#: mod/events.php:485 mod/events.php:486 +msgid "Event Starts:" +msgstr "Veranstaltungsbeginn:" + +#: mod/events.php:485 mod/events.php:497 mod/profiles.php:709 +msgid "Required" +msgstr "Benötigt" + +#: mod/events.php:487 mod/events.php:503 +msgid "Finish date/time is not known or not relevant" +msgstr "Enddatum/-zeit ist nicht bekannt oder nicht relevant" + +#: mod/events.php:489 mod/events.php:490 +msgid "Event Finishes:" +msgstr "Veranstaltungsende:" + +#: mod/events.php:491 mod/events.php:504 +msgid "Adjust for viewer timezone" +msgstr "An Zeitzone des Betrachters anpassen" + +#: mod/events.php:493 +msgid "Description:" +msgstr "Beschreibung" + +#: mod/events.php:497 mod/events.php:499 +msgid "Title:" +msgstr "Titel:" + +#: mod/events.php:500 mod/events.php:501 +msgid "Share this event" +msgstr "Veranstaltung teilen" + +#: mod/fsuggest.php:63 +msgid "Friend suggestion sent." +msgstr "Kontaktvorschlag gesendet." + +#: mod/fsuggest.php:97 +msgid "Suggest Friends" +msgstr "Kontakte vorschlagen" + +#: mod/fsuggest.php:99 +#, php-format +msgid "Suggest a friend for %s" +msgstr "Schlage %s einen Kontakt vor" + +#: mod/item.php:116 +msgid "Unable to locate original post." +msgstr "Konnte den Originalbeitrag nicht finden." + +#: mod/item.php:334 +msgid "Empty post discarded." +msgstr "Leerer Beitrag wurde verworfen." + +#: mod/item.php:867 +msgid "System error. Post not saved." +msgstr "Systemfehler. Beitrag konnte nicht gespeichert werden." + +#: mod/item.php:993 +#, 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:995 +#, php-format +msgid "You may visit them online at %s" +msgstr "Du kannst sie online unter %s besuchen" + +#: mod/item.php:996 +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:1000 +#, php-format +msgid "%s posted an update." +msgstr "%s hat ein Update veröffentlicht." + +#: mod/mood.php:133 +msgid "Mood" +msgstr "Stimmung" + +#: mod/mood.php:134 +msgid "Set your current mood and tell your friends" +msgstr "Wähle Deine aktuelle Stimmung und erzähle sie Deinen Kontakten" + +#: mod/photos.php:101 mod/photos.php:1887 +msgid "Recent Photos" +msgstr "Neueste Fotos" + +#: mod/photos.php:104 mod/photos.php:1308 mod/photos.php:1889 +msgid "Upload New Photos" +msgstr "Neue Fotos hochladen" + +#: mod/photos.php:118 mod/settings.php:36 +msgid "everybody" +msgstr "jeder" + +#: mod/photos.php:182 +msgid "Contact information unavailable" +msgstr "Kontaktinformationen nicht verfügbar" + +#: mod/photos.php:203 +msgid "Album not found." +msgstr "Album nicht gefunden." + +#: mod/photos.php:233 mod/photos.php:245 mod/photos.php:1250 +msgid "Delete Album" +msgstr "Album löschen" + +#: mod/photos.php:243 +msgid "Do you really want to delete this photo album and all its photos?" +msgstr "Möchtest Du wirklich dieses Foto-Album und all seine Foto löschen?" + +#: mod/photos.php:323 mod/photos.php:334 mod/photos.php:1568 +msgid "Delete Photo" +msgstr "Foto löschen" + +#: mod/photos.php:332 +msgid "Do you really want to delete this photo?" +msgstr "Möchtest Du wirklich dieses Foto löschen?" + +#: mod/photos.php:707 +#, php-format +msgid "%1$s was tagged in %2$s by %3$s" +msgstr "%1$s wurde von %3$s in %2$s getaggt" + +#: mod/photos.php:707 +msgid "a photo" +msgstr "einem Foto" + +#: mod/photos.php:814 +msgid "Image file is empty." +msgstr "Bilddatei ist leer." + +#: mod/photos.php:974 +msgid "No photos selected" +msgstr "Keine Bilder ausgewählt" + +#: mod/photos.php:1075 mod/videos.php:308 +msgid "Access to this item is restricted." +msgstr "Zugriff zu diesem Eintrag wurde eingeschränkt." + +#: mod/photos.php:1135 +#, php-format +msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." +msgstr "Du verwendest %1$.2f Mbyte von %2$.2f Mbyte des Foto-Speichers." + +#: mod/photos.php:1170 +msgid "Upload Photos" +msgstr "Bilder hochladen" + +#: mod/photos.php:1174 mod/photos.php:1245 +msgid "New album name: " +msgstr "Name des neuen Albums: " + +#: mod/photos.php:1175 +msgid "or existing album name: " +msgstr "oder existierender Albumname: " + +#: mod/photos.php:1176 +msgid "Do not show a status post for this upload" +msgstr "Keine Status-Mitteilung für diesen Beitrag anzeigen" + +#: mod/photos.php:1187 mod/photos.php:1572 mod/settings.php:1250 +msgid "Show to Groups" +msgstr "Zeige den Gruppen" + +#: mod/photos.php:1188 mod/photos.php:1573 mod/settings.php:1251 +msgid "Show to Contacts" +msgstr "Zeige den Kontakten" + +#: mod/photos.php:1189 +msgid "Private Photo" +msgstr "Privates Foto" + +#: mod/photos.php:1190 +msgid "Public Photo" +msgstr "Öffentliches Foto" + +#: mod/photos.php:1258 +msgid "Edit Album" +msgstr "Album bearbeiten" + +#: mod/photos.php:1264 +msgid "Show Newest First" +msgstr "Zeige neueste zuerst" + +#: mod/photos.php:1266 +msgid "Show Oldest First" +msgstr "Zeige älteste zuerst" + +#: mod/photos.php:1294 mod/photos.php:1872 +msgid "View Photo" +msgstr "Foto betrachten" + +#: mod/photos.php:1341 +msgid "Permission denied. Access to this item may be restricted." +msgstr "Zugriff verweigert. Zugriff zu diesem Eintrag könnte eingeschränkt sein." + +#: mod/photos.php:1343 +msgid "Photo not available" +msgstr "Foto nicht verfügbar" + +#: mod/photos.php:1399 +msgid "View photo" +msgstr "Fotos ansehen" + +#: mod/photos.php:1399 +msgid "Edit photo" +msgstr "Foto bearbeiten" + +#: mod/photos.php:1400 +msgid "Use as profile photo" +msgstr "Als Profilbild verwenden" + +#: mod/photos.php:1425 +msgid "View Full Size" +msgstr "Betrachte Originalgröße" + +#: mod/photos.php:1511 +msgid "Tags: " +msgstr "Tags: " + +#: mod/photos.php:1514 +msgid "[Remove any tag]" +msgstr "[Tag entfernen]" + +#: mod/photos.php:1554 +msgid "New album name" +msgstr "Name des neuen Albums" + +#: mod/photos.php:1555 +msgid "Caption" +msgstr "Bildunterschrift" + +#: mod/photos.php:1556 +msgid "Add a Tag" +msgstr "Tag hinzufügen" + +#: mod/photos.php:1556 +msgid "" +"Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" +msgstr "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" + +#: mod/photos.php:1557 +msgid "Do not rotate" +msgstr "Nicht rotieren" + +#: mod/photos.php:1558 +msgid "Rotate CW (right)" +msgstr "Drehen US (rechts)" + +#: mod/photos.php:1559 +msgid "Rotate CCW (left)" +msgstr "Drehen EUS (links)" + +#: mod/photos.php:1574 +msgid "Private photo" +msgstr "Privates Foto" + +#: mod/photos.php:1575 +msgid "Public photo" +msgstr "Öffentliches Foto" + +#: mod/photos.php:1801 +msgid "Map" +msgstr "Karte" + +#: mod/photos.php:1878 mod/videos.php:390 +msgid "View Album" +msgstr "Album betrachten" + +#: mod/poke.php:192 +msgid "Poke/Prod" +msgstr "Anstupsen" + +#: mod/poke.php:193 +msgid "poke, prod or do other things to somebody" +msgstr "Stupse Leute an oder mache anderes mit ihnen" + +#: mod/poke.php:194 +msgid "Recipient" +msgstr "Empfänger" + +#: mod/poke.php:195 +msgid "Choose what you wish to do to recipient" +msgstr "Was willst Du mit dem Empfänger machen:" + +#: mod/poke.php:198 +msgid "Make this post private" +msgstr "Diesen Beitrag privat machen" + #: mod/profile_photo.php:44 msgid "Image uploaded but image cropping failed." msgstr "Bild hochgeladen, aber das Zuschneiden schlug fehl." @@ -6086,6 +7451,291 @@ msgstr "Bearbeitung abgeschlossen" msgid "Image uploaded successfully." msgstr "Bild erfolgreich hochgeladen." +#: mod/profiles.php:38 +msgid "Profile deleted." +msgstr "Profil gelöscht." + +#: mod/profiles.php:56 mod/profiles.php:90 +msgid "Profile-" +msgstr "Profil-" + +#: mod/profiles.php:75 mod/profiles.php:118 +msgid "New profile created." +msgstr "Neues Profil angelegt." + +#: mod/profiles.php:96 +msgid "Profile unavailable to clone." +msgstr "Profil nicht zum Duplizieren verfügbar." + +#: mod/profiles.php:190 +msgid "Profile Name is required." +msgstr "Profilname ist erforderlich." + +#: mod/profiles.php:337 +msgid "Marital Status" +msgstr "Familienstand" + +#: mod/profiles.php:341 +msgid "Romantic Partner" +msgstr "Romanze" + +#: mod/profiles.php:353 +msgid "Work/Employment" +msgstr "Arbeit / Beschäftigung" + +#: mod/profiles.php:356 +msgid "Religion" +msgstr "Religion" + +#: mod/profiles.php:360 +msgid "Political Views" +msgstr "Politische Ansichten" + +#: mod/profiles.php:364 +msgid "Gender" +msgstr "Geschlecht" + +#: mod/profiles.php:368 +msgid "Sexual Preference" +msgstr "Sexuelle Vorlieben" + +#: mod/profiles.php:372 +msgid "Homepage" +msgstr "Webseite" + +#: mod/profiles.php:376 mod/profiles.php:695 +msgid "Interests" +msgstr "Interessen" + +#: mod/profiles.php:380 +msgid "Address" +msgstr "Adresse" + +#: mod/profiles.php:387 mod/profiles.php:691 +msgid "Location" +msgstr "Wohnort" + +#: mod/profiles.php:470 +msgid "Profile updated." +msgstr "Profil aktualisiert." + +#: mod/profiles.php:557 +msgid " and " +msgstr " und " + +#: mod/profiles.php:565 +msgid "public profile" +msgstr "öffentliches Profil" + +#: mod/profiles.php:568 +#, php-format +msgid "%1$s changed %2$s to “%3$s”" +msgstr "%1$s hat %2$s geändert auf “%3$s”" + +#: mod/profiles.php:569 +#, php-format +msgid " - Visit %1$s's %2$s" +msgstr " – %1$ss %2$s besuchen" + +#: mod/profiles.php:572 +#, php-format +msgid "%1$s has an updated %2$s, changing %3$s." +msgstr "%1$s hat folgendes aktualisiert %2$s, verändert wurde %3$s." + +#: mod/profiles.php:638 +msgid "Hide contacts and friends:" +msgstr "Kontakte und Freunde verbergen" + +#: mod/profiles.php:643 +msgid "Hide your contact/friend list from viewers of this profile?" +msgstr "Liste der Kontakte vor Betrachtern dieses Profils verbergen?" + +#: mod/profiles.php:667 +msgid "Show more profile fields:" +msgstr "Zeige mehr Profil-Felder:" + +#: mod/profiles.php:679 +msgid "Profile Actions" +msgstr "Profilaktionen" + +#: mod/profiles.php:680 +msgid "Edit Profile Details" +msgstr "Profil bearbeiten" + +#: mod/profiles.php:682 +msgid "Change Profile Photo" +msgstr "Profilbild ändern" + +#: mod/profiles.php:683 +msgid "View this profile" +msgstr "Dieses Profil anzeigen" + +#: mod/profiles.php:685 +msgid "Create a new profile using these settings" +msgstr "Neues Profil anlegen und diese Einstellungen verwenden" + +#: mod/profiles.php:686 +msgid "Clone this profile" +msgstr "Dieses Profil duplizieren" + +#: mod/profiles.php:687 +msgid "Delete this profile" +msgstr "Dieses Profil löschen" + +#: mod/profiles.php:689 +msgid "Basic information" +msgstr "Grundinformationen" + +#: mod/profiles.php:690 +msgid "Profile picture" +msgstr "Profilbild" + +#: mod/profiles.php:692 +msgid "Preferences" +msgstr "Vorlieben" + +#: mod/profiles.php:693 +msgid "Status information" +msgstr "Status Informationen" + +#: mod/profiles.php:694 +msgid "Additional information" +msgstr "Zusätzliche Informationen" + +#: mod/profiles.php:697 +msgid "Relation" +msgstr "Beziehung" + +#: mod/profiles.php:701 +msgid "Your Gender:" +msgstr "Dein Geschlecht:" + +#: mod/profiles.php:702 +msgid "♥ Marital Status:" +msgstr "♥ Beziehungsstatus:" + +#: mod/profiles.php:704 +msgid "Example: fishing photography software" +msgstr "Beispiel: Fischen Fotografie Software" + +#: mod/profiles.php:709 +msgid "Profile Name:" +msgstr "Profilname:" + +#: mod/profiles.php:711 +msgid "" +"This is your public profile.
It may " +"be visible to anybody using the internet." +msgstr "Dies ist Dein öffentliches Profil.
Es könnte für jeden Nutzer des Internets sichtbar sein." + +#: mod/profiles.php:712 +msgid "Your Full Name:" +msgstr "Dein kompletter Name:" + +#: mod/profiles.php:713 +msgid "Title/Description:" +msgstr "Titel/Beschreibung:" + +#: mod/profiles.php:716 +msgid "Street Address:" +msgstr "Adresse:" + +#: mod/profiles.php:717 +msgid "Locality/City:" +msgstr "Wohnort:" + +#: mod/profiles.php:718 +msgid "Region/State:" +msgstr "Region/Bundesstaat:" + +#: mod/profiles.php:719 +msgid "Postal/Zip Code:" +msgstr "Postleitzahl:" + +#: mod/profiles.php:720 +msgid "Country:" +msgstr "Land:" + +#: mod/profiles.php:724 +msgid "Who: (if applicable)" +msgstr "Wer: (falls anwendbar)" + +#: mod/profiles.php:724 +msgid "Examples: cathy123, Cathy Williams, cathy@example.com" +msgstr "Beispiele: cathy123, Cathy Williams, cathy@example.com" + +#: mod/profiles.php:725 +msgid "Since [date]:" +msgstr "Seit [Datum]:" + +#: mod/profiles.php:727 +msgid "Tell us about yourself..." +msgstr "Erzähle uns ein bisschen von Dir …" + +#: mod/profiles.php:728 +msgid "Homepage URL:" +msgstr "Adresse der Homepage:" + +#: mod/profiles.php:731 +msgid "Religious Views:" +msgstr "Religiöse Ansichten:" + +#: mod/profiles.php:732 +msgid "Public Keywords:" +msgstr "Öffentliche Schlüsselwörter:" + +#: mod/profiles.php:732 +msgid "(Used for suggesting potential friends, can be seen by others)" +msgstr "(Wird verwendet, um potentielle Kontakte zu finden, kann von Kontakten eingesehen werden)" + +#: mod/profiles.php:733 +msgid "Private Keywords:" +msgstr "Private Schlüsselwörter:" + +#: mod/profiles.php:733 +msgid "(Used for searching profiles, never shown to others)" +msgstr "(Wird für die Suche nach Profilen verwendet und niemals veröffentlicht)" + +#: mod/profiles.php:736 +msgid "Musical interests" +msgstr "Musikalische Interessen" + +#: mod/profiles.php:737 +msgid "Books, literature" +msgstr "Bücher, Literatur" + +#: mod/profiles.php:738 +msgid "Television" +msgstr "Fernsehen" + +#: mod/profiles.php:739 +msgid "Film/dance/culture/entertainment" +msgstr "Filme/Tänze/Kultur/Unterhaltung" + +#: mod/profiles.php:740 +msgid "Hobbies/Interests" +msgstr "Hobbies/Interessen" + +#: mod/profiles.php:741 +msgid "Love/romance" +msgstr "Liebe/Romantik" + +#: mod/profiles.php:742 +msgid "Work/employment" +msgstr "Arbeit/Anstellung" + +#: mod/profiles.php:743 +msgid "School/education" +msgstr "Schule/Ausbildung" + +#: mod/profiles.php:744 +msgid "Contact information and Social Networks" +msgstr "Kontaktinformationen und Soziale Netzwerke" + +#: mod/profiles.php:786 +msgid "Edit/Manage Profiles" +msgstr "Bearbeite/Verwalte Profile" + #: mod/register.php:92 msgid "" "Registration successful. Please check your email for further instructions." @@ -6173,9 +7823,18 @@ msgstr "Spitznamen wählen: " msgid "Import your profile to this friendica instance" msgstr "Importiere Dein Profil auf diese Friendica Instanz" -#: mod/settings.php:36 mod/photos.php:118 -msgid "everybody" -msgstr "jeder" +#: mod/regmod.php:55 +msgid "Account approved." +msgstr "Konto freigegeben." + +#: mod/regmod.php:92 +#, php-format +msgid "Registration revoked for %s" +msgstr "Registrierung für %s wurde zurückgezogen" + +#: mod/regmod.php:104 +msgid "Please login." +msgstr "Bitte melde Dich an." #: mod/settings.php:60 msgid "Display" @@ -6197,10 +7856,6 @@ msgstr "Konto löschen" msgid "Missing some important data!" msgstr "Wichtige Daten fehlen!" -#: mod/settings.php:158 mod/settings.php:689 mod/contacts.php:802 -msgid "Update" -msgstr "Aktualisierungen" - #: mod/settings.php:269 msgid "Failed to connect with email account using the settings provided." msgstr "Verbindung zum E-Mail-Konto mit den angegebenen Einstellungen nicht möglich." @@ -6293,11 +7948,6 @@ msgstr "Du kannst dieses Programm nicht bearbeiten." msgid "Connected Apps" msgstr "Verbundene Programme" -#: mod/settings.php:725 mod/content.php:746 object/Item.php:122 -#: object/Item.php:124 -msgid "Edit" -msgstr "Bearbeiten" - #: mod/settings.php:727 msgid "Client key starts with" msgstr "Anwenderschlüssel beginnt mit" @@ -6731,14 +8381,6 @@ msgstr "Standard-Zugriffsrechte für Beiträge" msgid "(click to open/close)" msgstr "(klicke zum öffnen/schließen)" -#: mod/settings.php:1250 mod/photos.php:1187 mod/photos.php:1572 -msgid "Show to Groups" -msgstr "Zeige den Gruppen" - -#: mod/settings.php:1251 mod/photos.php:1188 mod/photos.php:1573 -msgid "Show to Contacts" -msgstr "Zeige den Kontakten" - #: mod/settings.php:1252 msgid "Default Private Post" msgstr "Privater Standardbeitrag" @@ -6849,1655 +8491,25 @@ 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/wallmessage.php:42 mod/wallmessage.php:112 -#, php-format -msgid "Number of daily wall messages for %s exceeded. Message failed." -msgstr "Maximale Anzahl der täglichen Pinnwand Nachrichten für %s ist überschritten. Zustellung fehlgeschlagen." +#: mod/videos.php:123 +msgid "Do you really want to delete this video?" +msgstr "Möchtest Du dieses Video wirklich löschen?" -#: mod/wallmessage.php:56 mod/message.php:71 -msgid "No recipient selected." -msgstr "Kein Empfänger gewählt." +#: mod/videos.php:128 +msgid "Delete Video" +msgstr "Video Löschen" -#: mod/wallmessage.php:59 -msgid "Unable to check your home location." -msgstr "Konnte Deinen Heimatort nicht bestimmen." +#: mod/videos.php:207 +msgid "No videos selected" +msgstr "Keine Videos ausgewählt" -#: mod/wallmessage.php:62 mod/message.php:78 -msgid "Message could not be sent." -msgstr "Nachricht konnte nicht gesendet werden." +#: mod/videos.php:399 +msgid "Recent Videos" +msgstr "Neueste Videos" -#: mod/wallmessage.php:65 mod/message.php:81 -msgid "Message collection failure." -msgstr "Konnte Nachrichten nicht abrufen." - -#: mod/wallmessage.php:68 mod/message.php:84 -msgid "Message sent." -msgstr "Nachricht gesendet." - -#: mod/wallmessage.php:86 mod/wallmessage.php:95 -msgid "No recipient." -msgstr "Kein Empfänger." - -#: mod/wallmessage.php:142 mod/message.php:341 -msgid "Send Private Message" -msgstr "Private Nachricht senden" - -#: mod/wallmessage.php:143 -#, php-format -msgid "" -"If you wish for %s to respond, please check that the privacy settings on " -"your site allow private mail from unknown senders." -msgstr "Wenn Du möchtest, dass %s Dir antworten kann, überprüfe Deine Privatsphären-Einstellungen und erlaube private Nachrichten von unbekannten Absendern." - -#: mod/wallmessage.php:144 mod/message.php:342 mod/message.php:536 -msgid "To:" -msgstr "An:" - -#: mod/wallmessage.php:145 mod/message.php:347 mod/message.php:538 -msgid "Subject:" -msgstr "Betreff:" - -#: mod/share.php:38 -msgid "link" -msgstr "Link" - -#: mod/api.php:76 mod/api.php:102 -msgid "Authorize application connection" -msgstr "Verbindung der Applikation autorisieren" - -#: mod/api.php:77 -msgid "Return to your app and insert this Securty Code:" -msgstr "Gehe zu Deiner Anwendung zurück und trage dort folgenden Sicherheitscode ein:" - -#: mod/api.php:89 -msgid "Please login to continue." -msgstr "Bitte melde Dich an um fortzufahren." - -#: mod/api.php:104 -msgid "" -"Do you want to authorize this application to access your posts and contacts," -" and/or create new posts for you?" -msgstr "Möchtest Du dieser Anwendung den Zugriff auf Deine Beiträge und Kontakte, sowie das Erstellen neuer Beiträge in Deinem Namen gestatten?" - -#: mod/babel.php:17 -msgid "Source (bbcode) text:" -msgstr "Quelle (bbcode) Text:" - -#: mod/babel.php:23 -msgid "Source (Diaspora) text to convert to BBcode:" -msgstr "Eingabe (Diaspora) nach BBCode zu konvertierender Text:" - -#: mod/babel.php:31 -msgid "Source input: " -msgstr "Originaltext:" - -#: mod/babel.php:35 -msgid "bb2html (raw HTML): " -msgstr "bb2html (reines HTML): " - -#: mod/babel.php:39 -msgid "bb2html: " -msgstr "bb2html: " - -#: mod/babel.php:43 -msgid "bb2html2bb: " -msgstr "bb2html2bb: " - -#: mod/babel.php:47 -msgid "bb2md: " -msgstr "bb2md: " - -#: mod/babel.php:51 -msgid "bb2md2html: " -msgstr "bb2md2html: " - -#: mod/babel.php:55 -msgid "bb2dia2bb: " -msgstr "bb2dia2bb: " - -#: mod/babel.php:59 -msgid "bb2md2html2bb: " -msgstr "bb2md2html2bb: " - -#: mod/babel.php:69 -msgid "Source input (Diaspora format): " -msgstr "Originaltext (Diaspora Format): " - -#: mod/babel.php:74 -msgid "diaspora2bb: " -msgstr "diaspora2bb: " - -#: mod/item.php:116 -msgid "Unable to locate original post." -msgstr "Konnte den Originalbeitrag nicht finden." - -#: mod/item.php:334 -msgid "Empty post discarded." -msgstr "Leerer Beitrag wurde verworfen." - -#: mod/item.php:867 -msgid "System error. Post not saved." -msgstr "Systemfehler. Beitrag konnte nicht gespeichert werden." - -#: mod/item.php:993 -#, 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:995 -#, php-format -msgid "You may visit them online at %s" -msgstr "Du kannst sie online unter %s besuchen" - -#: mod/item.php:996 -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:1000 -#, php-format -msgid "%s posted an update." -msgstr "%s hat ein Update veröffentlicht." - -#: mod/ostatus_subscribe.php:14 -msgid "Subscribing to OStatus contacts" -msgstr "OStatus Kontakten folgen" - -#: mod/ostatus_subscribe.php:25 -msgid "No contact provided." -msgstr "Keine Kontakte gefunden." - -#: mod/ostatus_subscribe.php:30 -msgid "Couldn't fetch information for contact." -msgstr "Konnte die Kontaktinformationen nicht einholen." - -#: mod/ostatus_subscribe.php:38 -msgid "Couldn't fetch friends for contact." -msgstr "Konnte die Kontaktliste des Kontakts nicht abfragen." - -#: mod/ostatus_subscribe.php:65 -msgid "success" -msgstr "Erfolg" - -#: mod/ostatus_subscribe.php:67 -msgid "failed" -msgstr "Fehlgeschlagen" - -#: mod/ostatus_subscribe.php:69 mod/content.php:792 object/Item.php:245 -msgid "ignored" -msgstr "Ignoriert" - -#: mod/dfrn_poll.php:104 mod/dfrn_poll.php:537 -#, php-format -msgid "%1$s welcomes %2$s" -msgstr "%1$s heißt %2$s herzlich willkommen" - -#: mod/profile.php:179 -msgid "Tips for New Members" -msgstr "Tipps für neue Nutzer" - -#: mod/message.php:75 -msgid "Unable to locate contact information." -msgstr "Konnte die Kontaktinformationen nicht finden." - -#: mod/message.php:215 -msgid "Do you really want to delete this message?" -msgstr "Möchtest Du wirklich diese Nachricht löschen?" - -#: mod/message.php:235 -msgid "Message deleted." -msgstr "Nachricht gelöscht." - -#: mod/message.php:266 -msgid "Conversation removed." -msgstr "Unterhaltung gelöscht." - -#: mod/message.php:383 -msgid "No messages." -msgstr "Keine Nachrichten." - -#: mod/message.php:426 -msgid "Message not available." -msgstr "Nachricht nicht verfügbar." - -#: mod/message.php:503 -msgid "Delete message" -msgstr "Nachricht löschen" - -#: mod/message.php:529 mod/message.php:609 -msgid "Delete conversation" -msgstr "Unterhaltung löschen" - -#: mod/message.php:531 -msgid "" -"No secure communications available. You may be able to " -"respond from the sender's profile page." -msgstr "Sichere Kommunikation ist nicht verfügbar. Eventuell kannst Du auf der Profilseite des Absenders antworten." - -#: mod/message.php:535 -msgid "Send Reply" -msgstr "Antwort senden" - -#: mod/message.php:579 -#, php-format -msgid "Unknown sender - %s" -msgstr "'Unbekannter Absender - %s" - -#: mod/message.php:581 -#, php-format -msgid "You and %s" -msgstr "Du und %s" - -#: mod/message.php:583 -#, php-format -msgid "%s and You" -msgstr "%s und Du" - -#: mod/message.php:612 -msgid "D, d M Y - g:i A" -msgstr "D, d. M Y - g:i A" - -#: mod/message.php:615 -#, php-format -msgid "%d message" -msgid_plural "%d messages" -msgstr[0] "%d Nachricht" -msgstr[1] "%d Nachrichten" - -#: mod/manage.php:139 -msgid "Manage Identities and/or Pages" -msgstr "Verwalte Identitäten und/oder Seiten" - -#: mod/manage.php:140 -msgid "" -"Toggle between different identities or community/group pages which share " -"your account details or which you have been granted \"manage\" permissions" -msgstr "Zwischen verschiedenen Identitäten oder Gemeinschafts-/Gruppenseiten wechseln, die Deine Kontoinformationen teilen oder zu denen Du „Verwalten“-Befugnisse bekommen hast." - -#: mod/manage.php:141 -msgid "Select an identity to manage: " -msgstr "Wähle eine Identität zum Verwalten aus: " - -#: mod/contacts.php:128 -#, php-format -msgid "%d contact edited." -msgid_plural "%d contacts edited." -msgstr[0] "%d Kontakt bearbeitet." -msgstr[1] "%d Kontakte bearbeitet." - -#: mod/contacts.php:159 mod/contacts.php:368 -msgid "Could not access contact record." -msgstr "Konnte nicht auf die Kontaktdaten zugreifen." - -#: mod/contacts.php:173 -msgid "Could not locate selected profile." -msgstr "Konnte das ausgewählte Profil nicht finden." - -#: mod/contacts.php:206 -msgid "Contact updated." -msgstr "Kontakt aktualisiert." - -#: mod/contacts.php:208 mod/dfrn_request.php:579 -msgid "Failed to update contact record." -msgstr "Aktualisierung der Kontaktdaten fehlgeschlagen." - -#: mod/contacts.php:389 -msgid "Contact has been blocked" -msgstr "Kontakt wurde blockiert" - -#: mod/contacts.php:389 -msgid "Contact has been unblocked" -msgstr "Kontakt wurde wieder freigegeben" - -#: mod/contacts.php:400 -msgid "Contact has been ignored" -msgstr "Kontakt wurde ignoriert" - -#: mod/contacts.php:400 -msgid "Contact has been unignored" -msgstr "Kontakt wird nicht mehr ignoriert" - -#: mod/contacts.php:412 -msgid "Contact has been archived" -msgstr "Kontakt wurde archiviert" - -#: mod/contacts.php:412 -msgid "Contact has been unarchived" -msgstr "Kontakt wurde aus dem Archiv geholt" - -#: mod/contacts.php:437 -msgid "Drop contact" -msgstr "Kontakt löschen" - -#: mod/contacts.php:440 mod/contacts.php:799 -msgid "Do you really want to delete this contact?" -msgstr "Möchtest Du wirklich diesen Kontakt löschen?" - -#: mod/contacts.php:457 -msgid "Contact has been removed." -msgstr "Kontakt wurde entfernt." - -#: mod/contacts.php:498 -#, php-format -msgid "You are mutual friends with %s" -msgstr "Du hast mit %s eine beidseitige Freundschaft" - -#: mod/contacts.php:502 -#, php-format -msgid "You are sharing with %s" -msgstr "Du teilst mit %s" - -#: mod/contacts.php:507 -#, php-format -msgid "%s is sharing with you" -msgstr "%s teilt mit Dir" - -#: mod/contacts.php:527 -msgid "Private communications are not available for this contact." -msgstr "Private Kommunikation ist für diesen Kontakt nicht verfügbar." - -#: mod/contacts.php:534 -msgid "(Update was successful)" -msgstr "(Aktualisierung war erfolgreich)" - -#: mod/contacts.php:534 -msgid "(Update was not successful)" -msgstr "(Aktualisierung war nicht erfolgreich)" - -#: mod/contacts.php:536 mod/contacts.php:978 -msgid "Suggest friends" -msgstr "Kontakte vorschlagen" - -#: mod/contacts.php:540 -#, php-format -msgid "Network type: %s" -msgstr "Netzwerktyp: %s" - -#: mod/contacts.php:553 -msgid "Communications lost with this contact!" -msgstr "Verbindungen mit diesem Kontakt verloren!" - -#: mod/contacts.php:556 -msgid "Fetch further information for feeds" -msgstr "Weitere Informationen zu Feeds holen" - -#: mod/contacts.php:557 -msgid "Fetch information" -msgstr "Beziehe Information" - -#: mod/contacts.php:557 -msgid "Fetch information and keywords" -msgstr "Beziehe Information und Schlüsselworte" - -#: mod/contacts.php:575 -msgid "Contact" -msgstr "Kontakt: " - -#: mod/contacts.php:578 -msgid "Profile Visibility" -msgstr "Profil-Sichtbarkeit" - -#: mod/contacts.php:579 -#, php-format -msgid "" -"Please choose the profile you would like to display to %s when viewing your " -"profile securely." -msgstr "Bitte wähle eines Deiner Profile das angezeigt werden soll, wenn %s Dein Profil aufruft." - -#: mod/contacts.php:580 -msgid "Contact Information / Notes" -msgstr "Kontakt Informationen / Notizen" - -#: mod/contacts.php:581 -msgid "Edit contact notes" -msgstr "Notizen zum Kontakt bearbeiten" - -#: mod/contacts.php:587 -msgid "Block/Unblock contact" -msgstr "Kontakt blockieren/freischalten" - -#: mod/contacts.php:588 -msgid "Ignore contact" -msgstr "Ignoriere den Kontakt" - -#: mod/contacts.php:589 -msgid "Repair URL settings" -msgstr "URL Einstellungen reparieren" - -#: mod/contacts.php:590 -msgid "View conversations" -msgstr "Unterhaltungen anzeigen" - -#: mod/contacts.php:596 -msgid "Last update:" -msgstr "Letzte Aktualisierung: " - -#: mod/contacts.php:598 -msgid "Update public posts" -msgstr "Öffentliche Beiträge aktualisieren" - -#: mod/contacts.php:600 mod/contacts.php:988 -msgid "Update now" -msgstr "Jetzt aktualisieren" - -#: mod/contacts.php:606 mod/contacts.php:804 mod/contacts.php:1005 -msgid "Unignore" -msgstr "Ignorieren aufheben" - -#: mod/contacts.php:606 mod/contacts.php:804 mod/contacts.php:1005 -#: mod/notifications.php:54 mod/notifications.php:142 -#: mod/notifications.php:227 -msgid "Ignore" -msgstr "Ignorieren" - -#: mod/contacts.php:610 -msgid "Currently blocked" -msgstr "Derzeit geblockt" - -#: mod/contacts.php:611 -msgid "Currently ignored" -msgstr "Derzeit ignoriert" - -#: mod/contacts.php:612 -msgid "Currently archived" -msgstr "Momentan archiviert" - -#: mod/contacts.php:613 mod/notifications.php:135 mod/notifications.php:215 -msgid "Hide this contact from others" -msgstr "Verbirg diesen Kontakt vor andere" - -#: mod/contacts.php:613 -msgid "" -"Replies/likes to your public posts may still be visible" -msgstr "Antworten/Likes auf deine öffentlichen Beiträge könnten weiterhin sichtbar sein" - -#: mod/contacts.php:614 -msgid "Notification for new posts" -msgstr "Benachrichtigung bei neuen Beiträgen" - -#: mod/contacts.php:614 -msgid "Send a notification of every new post of this contact" -msgstr "Sende eine Benachrichtigung, wann immer dieser Kontakt einen neuen Beitrag schreibt." - -#: mod/contacts.php:617 -msgid "Blacklisted keywords" -msgstr "Blacklistete Schlüsselworte " - -#: mod/contacts.php:617 -msgid "" -"Comma separated list of keywords that should not be converted to hashtags, " -"when \"Fetch information and keywords\" is selected" -msgstr "Komma-Separierte Liste mit Schlüsselworten, die nicht in Hashtags konvertiert werden, wenn \"Beziehe Information und Schlüsselworte\" aktiviert wurde" - -#: mod/contacts.php:633 -msgid "Actions" -msgstr "Aktionen" - -#: mod/contacts.php:636 -msgid "Contact Settings" -msgstr "Kontakteinstellungen" - -#: mod/contacts.php:682 -msgid "Suggestions" -msgstr "Kontaktvorschläge" - -#: mod/contacts.php:685 -msgid "Suggest potential friends" -msgstr "Kontakte vorschlagen" - -#: mod/contacts.php:693 -msgid "Show all contacts" -msgstr "Alle Kontakte anzeigen" - -#: mod/contacts.php:698 -msgid "Unblocked" -msgstr "Ungeblockt" - -#: mod/contacts.php:701 -msgid "Only show unblocked contacts" -msgstr "Nur nicht-blockierte Kontakte anzeigen" - -#: mod/contacts.php:707 -msgid "Blocked" -msgstr "Geblockt" - -#: mod/contacts.php:710 -msgid "Only show blocked contacts" -msgstr "Nur blockierte Kontakte anzeigen" - -#: mod/contacts.php:716 -msgid "Ignored" -msgstr "Ignoriert" - -#: mod/contacts.php:719 -msgid "Only show ignored contacts" -msgstr "Nur ignorierte Kontakte anzeigen" - -#: mod/contacts.php:725 -msgid "Archived" -msgstr "Archiviert" - -#: mod/contacts.php:728 -msgid "Only show archived contacts" -msgstr "Nur archivierte Kontakte anzeigen" - -#: mod/contacts.php:734 -msgid "Hidden" -msgstr "Verborgen" - -#: mod/contacts.php:737 -msgid "Only show hidden contacts" -msgstr "Nur verborgene Kontakte anzeigen" - -#: mod/contacts.php:794 -msgid "Search your contacts" -msgstr "Suche in deinen Kontakten" - -#: mod/contacts.php:805 mod/contacts.php:1013 -msgid "Archive" -msgstr "Archivieren" - -#: mod/contacts.php:805 mod/contacts.php:1013 -msgid "Unarchive" -msgstr "Aus Archiv zurückholen" - -#: mod/contacts.php:808 -msgid "Batch Actions" -msgstr "Stapelverarbeitung" - -#: mod/contacts.php:854 -msgid "View all contacts" -msgstr "Alle Kontakte anzeigen" - -#: mod/contacts.php:864 -msgid "View all common friends" -msgstr "Alle Kontakte anzeigen" - -#: mod/contacts.php:871 -msgid "Advanced Contact Settings" -msgstr "Fortgeschrittene Kontakteinstellungen" - -#: mod/contacts.php:916 -msgid "Mutual Friendship" -msgstr "Beidseitige Freundschaft" - -#: mod/contacts.php:920 -msgid "is a fan of yours" -msgstr "ist ein Fan von dir" - -#: mod/contacts.php:924 -msgid "you are a fan of" -msgstr "Du bist Fan von" - -#: mod/contacts.php:999 -msgid "Toggle Blocked status" -msgstr "Geblockt-Status ein-/ausschalten" - -#: mod/contacts.php:1007 -msgid "Toggle Ignored status" -msgstr "Ignoriert-Status ein-/ausschalten" - -#: mod/contacts.php:1015 -msgid "Toggle Archive status" -msgstr "Archiviert-Status ein-/ausschalten" - -#: mod/contacts.php:1023 -msgid "Delete contact" -msgstr "Lösche den Kontakt" - -#: mod/crepair.php:87 -msgid "Contact settings applied." -msgstr "Einstellungen zum Kontakt angewandt." - -#: mod/crepair.php:89 -msgid "Contact update failed." -msgstr "Konnte den Kontakt nicht aktualisieren." - -#: mod/crepair.php:120 -msgid "" -"WARNING: This is highly advanced and if you enter incorrect" -" information your communications with this contact may stop working." -msgstr "ACHTUNG: Das sind Experten-Einstellungen! Wenn Du etwas Falsches eingibst, funktioniert die Kommunikation mit diesem Kontakt evtl. nicht mehr." - -#: mod/crepair.php:121 -msgid "" -"Please use your browser 'Back' button now if you are " -"uncertain what to do on this page." -msgstr "Bitte nutze den Zurück-Button Deines Browsers jetzt, wenn Du Dir unsicher bist, was Du tun willst." - -#: mod/crepair.php:134 mod/crepair.php:136 -msgid "No mirroring" -msgstr "Kein Spiegeln" - -#: mod/crepair.php:134 -msgid "Mirror as forwarded posting" -msgstr "Spiegeln als weitergeleitete Beiträge" - -#: mod/crepair.php:134 mod/crepair.php:136 -msgid "Mirror as my own posting" -msgstr "Spiegeln als meine eigenen Beiträge" - -#: mod/crepair.php:150 -msgid "Return to contact editor" -msgstr "Zurück zum Kontakteditor" - -#: mod/crepair.php:152 -msgid "Refetch contact data" -msgstr "Kontaktdaten neu laden" - -#: mod/crepair.php:156 -msgid "Remote Self" -msgstr "Entfernte Konten" - -#: mod/crepair.php:159 -msgid "Mirror postings from this contact" -msgstr "Spiegle Beiträge dieses Kontakts" - -#: mod/crepair.php:161 -msgid "" -"Mark this contact as remote_self, this will cause friendica to repost new " -"entries from this contact." -msgstr "Markiere diesen Kontakt als remote_self (entferntes Konto), dies veranlasst Friendica alle Top-Level Beiträge dieses Kontakts an all Deine Kontakte zu senden." - -#: mod/crepair.php:166 -msgid "Account Nickname" -msgstr "Konto-Spitzname" - -#: mod/crepair.php:167 -msgid "@Tagname - overrides Name/Nickname" -msgstr "@Tagname - überschreibt Name/Spitzname" - -#: mod/crepair.php:168 -msgid "Account URL" -msgstr "Konto-URL" - -#: mod/crepair.php:169 -msgid "Friend Request URL" -msgstr "URL für Kontaktschaftsanfragen" - -#: mod/crepair.php:170 -msgid "Friend Confirm URL" -msgstr "URL für Bestätigungen von Kontaktanfragen" - -#: mod/crepair.php:171 -msgid "Notification Endpoint URL" -msgstr "URL-Endpunkt für Benachrichtigungen" - -#: mod/crepair.php:172 -msgid "Poll/Feed URL" -msgstr "Pull/Feed-URL" - -#: mod/crepair.php:173 -msgid "New photo from this URL" -msgstr "Neues Foto von dieser URL" - -#: mod/dfrn_confirm.php:66 mod/profiles.php:19 mod/profiles.php:134 -#: mod/profiles.php:180 mod/profiles.php:611 -msgid "Profile not found." -msgstr "Profil nicht gefunden." - -#: mod/dfrn_confirm.php:123 -msgid "" -"This may occasionally happen if contact was requested by both persons and it" -" has already been approved." -msgstr "Das kann passieren, wenn sich zwei Kontakte gegenseitig eingeladen haben und bereits einer angenommen wurde." - -#: mod/dfrn_confirm.php:242 -msgid "Response from remote site was not understood." -msgstr "Antwort der Gegenstelle unverständlich." - -#: mod/dfrn_confirm.php:251 mod/dfrn_confirm.php:256 -msgid "Unexpected response from remote site: " -msgstr "Unerwartete Antwort der Gegenstelle: " - -#: mod/dfrn_confirm.php:265 -msgid "Confirmation completed successfully." -msgstr "Bestätigung erfolgreich abgeschlossen." - -#: mod/dfrn_confirm.php:267 mod/dfrn_confirm.php:281 mod/dfrn_confirm.php:288 -msgid "Remote site reported: " -msgstr "Gegenstelle meldet: " - -#: mod/dfrn_confirm.php:279 -msgid "Temporary failure. Please wait and try again." -msgstr "Zeitweiser Fehler. Bitte warte einige Momente und versuche es dann noch einmal." - -#: mod/dfrn_confirm.php:286 -msgid "Introduction failed or was revoked." -msgstr "Kontaktanfrage schlug fehl oder wurde zurückgezogen." - -#: mod/dfrn_confirm.php:415 -msgid "Unable to set contact photo." -msgstr "Konnte das Bild des Kontakts nicht speichern." - -#: mod/dfrn_confirm.php:553 -#, php-format -msgid "No user record found for '%s' " -msgstr "Für '%s' wurde kein Nutzer gefunden" - -#: mod/dfrn_confirm.php:563 -msgid "Our site encryption key is apparently messed up." -msgstr "Der Verschlüsselungsschlüssel unserer Seite ist anscheinend nicht in Ordnung." - -#: mod/dfrn_confirm.php:574 -msgid "Empty site URL was provided or URL could not be decrypted by us." -msgstr "Leere URL für die Seite erhalten oder die URL konnte nicht entschlüsselt werden." - -#: mod/dfrn_confirm.php:595 -msgid "Contact record was not found for you on our site." -msgstr "Für diesen Kontakt wurde auf unserer Seite kein Eintrag gefunden." - -#: mod/dfrn_confirm.php:609 -#, php-format -msgid "Site public key not available in contact record for URL %s." -msgstr "Die Kontaktdaten für URL %s enthalten keinen Public Key für den Server." - -#: mod/dfrn_confirm.php:629 -msgid "" -"The ID provided by your system is a duplicate on our system. It should work " -"if you try again." -msgstr "Die ID, die uns Dein System angeboten hat, ist hier bereits vergeben. Bitte versuche es noch einmal." - -#: mod/dfrn_confirm.php:640 -msgid "Unable to set your contact credentials on our system." -msgstr "Deine Kontaktreferenzen konnten nicht in unserem System gespeichert werden." - -#: mod/dfrn_confirm.php:699 -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:771 -#, php-format -msgid "%1$s has joined %2$s" -msgstr "%1$s ist %2$s beigetreten" - -#: mod/dfrn_request.php:100 -msgid "This introduction has already been accepted." -msgstr "Diese Kontaktanfrage wurde bereits akzeptiert." - -#: mod/dfrn_request.php:123 mod/dfrn_request.php:518 -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:128 mod/dfrn_request.php:523 -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:130 mod/dfrn_request.php:525 -msgid "Warning: profile location has no profile photo." -msgstr "Warnung: Es gibt kein Profilbild bei der angegebenen Profiladresse." - -#: mod/dfrn_request.php:133 mod/dfrn_request.php:528 -#, 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:178 -msgid "Introduction complete." -msgstr "Kontaktanfrage abgeschlossen." - -#: mod/dfrn_request.php:220 -msgid "Unrecoverable protocol error." -msgstr "Nicht behebbarer Protokollfehler." - -#: mod/dfrn_request.php:248 -msgid "Profile unavailable." -msgstr "Profil nicht verfügbar." - -#: mod/dfrn_request.php:273 -#, php-format -msgid "%s has received too many connection requests today." -msgstr "%s hat heute zu viele Kontaktanfragen erhalten." - -#: mod/dfrn_request.php:274 -msgid "Spam protection measures have been invoked." -msgstr "Maßnahmen zum Spamschutz wurden ergriffen." - -#: mod/dfrn_request.php:275 -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:337 -msgid "Invalid locator" -msgstr "Ungültiger Locator" - -#: mod/dfrn_request.php:346 -msgid "Invalid email address." -msgstr "Ungültige E-Mail-Adresse." - -#: mod/dfrn_request.php:373 -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:476 -msgid "You have already introduced yourself here." -msgstr "Du hast Dich hier bereits vorgestellt." - -#: mod/dfrn_request.php:480 -#, php-format -msgid "Apparently you are already friends with %s." -msgstr "Es scheint so, als ob Du bereits mit %s in Kontakt stehst." - -#: mod/dfrn_request.php:501 -msgid "Invalid profile URL." -msgstr "Ungültige Profil-URL." - -#: mod/dfrn_request.php:600 -msgid "Your introduction has been sent." -msgstr "Deine Kontaktanfrage wurde gesendet." - -#: mod/dfrn_request.php:640 -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:663 -msgid "Please login to confirm introduction." -msgstr "Bitte melde Dich an, um die Kontaktanfrage zu bestätigen." - -#: mod/dfrn_request.php:673 -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:687 mod/dfrn_request.php:704 -msgid "Confirm" -msgstr "Bestätigen" - -#: mod/dfrn_request.php:699 -msgid "Hide this contact" -msgstr "Verberge diesen Kontakt" - -#: mod/dfrn_request.php:702 -#, php-format -msgid "Welcome home %s." -msgstr "Willkommen zurück %s." - -#: mod/dfrn_request.php:703 -#, php-format -msgid "Please confirm your introduction/connection request to %s." -msgstr "Bitte bestätige Deine Kontaktanfrage bei %s." - -#: mod/dfrn_request.php:832 -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:853 -#, php-format -msgid "" -"If you are not yet a member of the free social web, follow this link to find a public Friendica site and " -"join us today." -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:858 -msgid "Friend/Connection Request" -msgstr "Kontaktanfrage" - -#: mod/dfrn_request.php:859 -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:868 -msgid "StatusNet/Federated Social Web" -msgstr "StatusNet/Federated Social Web" - -#: mod/dfrn_request.php:870 -#, php-format -msgid "" -" - please do not use this form. Instead, enter %s into your Diaspora search" -" bar." -msgstr " - bitte verwende dieses Formular nicht. Stattdessen suche nach %s in Deiner Diaspora Suchleiste." - -#: mod/photos.php:101 mod/photos.php:1887 -msgid "Recent Photos" -msgstr "Neueste Fotos" - -#: mod/photos.php:104 mod/photos.php:1308 mod/photos.php:1889 -msgid "Upload New Photos" -msgstr "Neue Fotos hochladen" - -#: mod/photos.php:182 -msgid "Contact information unavailable" -msgstr "Kontaktinformationen nicht verfügbar" - -#: mod/photos.php:203 -msgid "Album not found." -msgstr "Album nicht gefunden." - -#: mod/photos.php:233 mod/photos.php:245 mod/photos.php:1250 -msgid "Delete Album" -msgstr "Album löschen" - -#: mod/photos.php:243 -msgid "Do you really want to delete this photo album and all its photos?" -msgstr "Möchtest Du wirklich dieses Foto-Album und all seine Foto löschen?" - -#: mod/photos.php:323 mod/photos.php:334 mod/photos.php:1568 -msgid "Delete Photo" -msgstr "Foto löschen" - -#: mod/photos.php:332 -msgid "Do you really want to delete this photo?" -msgstr "Möchtest Du wirklich dieses Foto löschen?" - -#: mod/photos.php:707 -#, php-format -msgid "%1$s was tagged in %2$s by %3$s" -msgstr "%1$s wurde von %3$s in %2$s getaggt" - -#: mod/photos.php:707 -msgid "a photo" -msgstr "einem Foto" - -#: mod/photos.php:814 -msgid "Image file is empty." -msgstr "Bilddatei ist leer." - -#: mod/photos.php:974 -msgid "No photos selected" -msgstr "Keine Bilder ausgewählt" - -#: mod/photos.php:1135 -#, php-format -msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." -msgstr "Du verwendest %1$.2f Mbyte von %2$.2f Mbyte des Foto-Speichers." - -#: mod/photos.php:1170 -msgid "Upload Photos" -msgstr "Bilder hochladen" - -#: mod/photos.php:1174 mod/photos.php:1245 -msgid "New album name: " -msgstr "Name des neuen Albums: " - -#: mod/photos.php:1175 -msgid "or existing album name: " -msgstr "oder existierender Albumname: " - -#: mod/photos.php:1176 -msgid "Do not show a status post for this upload" -msgstr "Keine Status-Mitteilung für diesen Beitrag anzeigen" - -#: mod/photos.php:1189 -msgid "Private Photo" -msgstr "Privates Foto" - -#: mod/photos.php:1190 -msgid "Public Photo" -msgstr "Öffentliches Foto" - -#: mod/photos.php:1258 -msgid "Edit Album" -msgstr "Album bearbeiten" - -#: mod/photos.php:1264 -msgid "Show Newest First" -msgstr "Zeige neueste zuerst" - -#: mod/photos.php:1266 -msgid "Show Oldest First" -msgstr "Zeige älteste zuerst" - -#: mod/photos.php:1294 mod/photos.php:1872 -msgid "View Photo" -msgstr "Foto betrachten" - -#: mod/photos.php:1341 -msgid "Permission denied. Access to this item may be restricted." -msgstr "Zugriff verweigert. Zugriff zu diesem Eintrag könnte eingeschränkt sein." - -#: mod/photos.php:1343 -msgid "Photo not available" -msgstr "Foto nicht verfügbar" - -#: mod/photos.php:1399 -msgid "View photo" -msgstr "Fotos ansehen" - -#: mod/photos.php:1399 -msgid "Edit photo" -msgstr "Foto bearbeiten" - -#: mod/photos.php:1400 -msgid "Use as profile photo" -msgstr "Als Profilbild verwenden" - -#: mod/photos.php:1406 mod/content.php:638 object/Item.php:117 -msgid "Private Message" -msgstr "Private Nachricht" - -#: mod/photos.php:1425 -msgid "View Full Size" -msgstr "Betrachte Originalgröße" - -#: mod/photos.php:1511 -msgid "Tags: " -msgstr "Tags: " - -#: mod/photos.php:1514 -msgid "[Remove any tag]" -msgstr "[Tag entfernen]" - -#: mod/photos.php:1554 -msgid "New album name" -msgstr "Name des neuen Albums" - -#: mod/photos.php:1555 -msgid "Caption" -msgstr "Bildunterschrift" - -#: mod/photos.php:1556 -msgid "Add a Tag" -msgstr "Tag hinzufügen" - -#: mod/photos.php:1556 -msgid "" -"Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" -msgstr "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" - -#: mod/photos.php:1557 -msgid "Do not rotate" -msgstr "Nicht rotieren" - -#: mod/photos.php:1558 -msgid "Rotate CW (right)" -msgstr "Drehen US (rechts)" - -#: mod/photos.php:1559 -msgid "Rotate CCW (left)" -msgstr "Drehen EUS (links)" - -#: mod/photos.php:1574 -msgid "Private photo" -msgstr "Privates Foto" - -#: mod/photos.php:1575 -msgid "Public photo" -msgstr "Öffentliches Foto" - -#: mod/photos.php:1595 mod/content.php:702 object/Item.php:263 -msgid "I like this (toggle)" -msgstr "Ich mag das (toggle)" - -#: mod/photos.php:1596 mod/content.php:703 object/Item.php:264 -msgid "I don't like this (toggle)" -msgstr "Ich mag das nicht (toggle)" - -#: mod/photos.php:1615 mod/photos.php:1663 mod/photos.php:1751 -#: mod/content.php:725 object/Item.php:717 -msgid "This is you" -msgstr "Das bist Du" - -#: mod/photos.php:1617 mod/photos.php:1665 mod/photos.php:1753 -#: mod/content.php:727 mod/content.php:945 object/Item.php:403 -#: object/Item.php:719 boot.php:888 -msgid "Comment" -msgstr "Kommentar" - -#: mod/photos.php:1801 -msgid "Map" -msgstr "Karte" - -#: mod/profiles.php:38 -msgid "Profile deleted." -msgstr "Profil gelöscht." - -#: mod/profiles.php:56 mod/profiles.php:90 -msgid "Profile-" -msgstr "Profil-" - -#: mod/profiles.php:75 mod/profiles.php:118 -msgid "New profile created." -msgstr "Neues Profil angelegt." - -#: mod/profiles.php:96 -msgid "Profile unavailable to clone." -msgstr "Profil nicht zum Duplizieren verfügbar." - -#: mod/profiles.php:190 -msgid "Profile Name is required." -msgstr "Profilname ist erforderlich." - -#: mod/profiles.php:337 -msgid "Marital Status" -msgstr "Familienstand" - -#: mod/profiles.php:341 -msgid "Romantic Partner" -msgstr "Romanze" - -#: mod/profiles.php:353 -msgid "Work/Employment" -msgstr "Arbeit / Beschäftigung" - -#: mod/profiles.php:356 -msgid "Religion" -msgstr "Religion" - -#: mod/profiles.php:360 -msgid "Political Views" -msgstr "Politische Ansichten" - -#: mod/profiles.php:364 -msgid "Gender" -msgstr "Geschlecht" - -#: mod/profiles.php:368 -msgid "Sexual Preference" -msgstr "Sexuelle Vorlieben" - -#: mod/profiles.php:372 -msgid "Homepage" -msgstr "Webseite" - -#: mod/profiles.php:376 mod/profiles.php:696 -msgid "Interests" -msgstr "Interessen" - -#: mod/profiles.php:380 -msgid "Address" -msgstr "Adresse" - -#: mod/profiles.php:387 mod/profiles.php:692 -msgid "Location" -msgstr "Wohnort" - -#: mod/profiles.php:470 -msgid "Profile updated." -msgstr "Profil aktualisiert." - -#: mod/profiles.php:557 -msgid " and " -msgstr " und " - -#: mod/profiles.php:565 -msgid "public profile" -msgstr "öffentliches Profil" - -#: mod/profiles.php:568 -#, php-format -msgid "%1$s changed %2$s to “%3$s”" -msgstr "%1$s hat %2$s geändert auf “%3$s”" - -#: mod/profiles.php:569 -#, php-format -msgid " - Visit %1$s's %2$s" -msgstr " – %1$ss %2$s besuchen" - -#: mod/profiles.php:572 -#, php-format -msgid "%1$s has an updated %2$s, changing %3$s." -msgstr "%1$s hat folgendes aktualisiert %2$s, verändert wurde %3$s." - -#: mod/profiles.php:639 -msgid "Hide contacts and friends:" -msgstr "Kontakte und Freunde verbergen" - -#: mod/profiles.php:644 -msgid "Hide your contact/friend list from viewers of this profile?" -msgstr "Liste der Kontakte vor Betrachtern dieses Profils verbergen?" - -#: mod/profiles.php:668 -msgid "Show more profile fields:" -msgstr "Zeige mehr Profil-Felder:" - -#: mod/profiles.php:680 -msgid "Profile Actions" -msgstr "Profilaktionen" - -#: mod/profiles.php:681 -msgid "Edit Profile Details" -msgstr "Profil bearbeiten" - -#: mod/profiles.php:683 -msgid "Change Profile Photo" -msgstr "Profilbild ändern" - -#: mod/profiles.php:684 -msgid "View this profile" -msgstr "Dieses Profil anzeigen" - -#: mod/profiles.php:686 -msgid "Create a new profile using these settings" -msgstr "Neues Profil anlegen und diese Einstellungen verwenden" - -#: mod/profiles.php:687 -msgid "Clone this profile" -msgstr "Dieses Profil duplizieren" - -#: mod/profiles.php:688 -msgid "Delete this profile" -msgstr "Dieses Profil löschen" - -#: mod/profiles.php:690 -msgid "Basic information" -msgstr "Grundinformationen" - -#: mod/profiles.php:691 -msgid "Profile picture" -msgstr "Profilbild" - -#: mod/profiles.php:693 -msgid "Preferences" -msgstr "Vorlieben" - -#: mod/profiles.php:694 -msgid "Status information" -msgstr "Status Informationen" - -#: mod/profiles.php:695 -msgid "Additional information" -msgstr "Zusätzliche Informationen" - -#: mod/profiles.php:698 -msgid "Relation" -msgstr "Beziehung" - -#: mod/profiles.php:702 -msgid "Your Gender:" -msgstr "Dein Geschlecht:" - -#: mod/profiles.php:703 -msgid "♥ Marital Status:" -msgstr "♥ Beziehungsstatus:" - -#: mod/profiles.php:705 -msgid "Example: fishing photography software" -msgstr "Beispiel: Fischen Fotografie Software" - -#: mod/profiles.php:710 -msgid "Profile Name:" -msgstr "Profilname:" - -#: mod/profiles.php:712 -msgid "" -"This is your public profile.
It may " -"be visible to anybody using the internet." -msgstr "Dies ist Dein öffentliches Profil.
Es könnte für jeden Nutzer des Internets sichtbar sein." - -#: mod/profiles.php:713 -msgid "Your Full Name:" -msgstr "Dein kompletter Name:" - -#: mod/profiles.php:714 -msgid "Title/Description:" -msgstr "Titel/Beschreibung:" - -#: mod/profiles.php:717 -msgid "Street Address:" -msgstr "Adresse:" - -#: mod/profiles.php:718 -msgid "Locality/City:" -msgstr "Wohnort:" - -#: mod/profiles.php:719 -msgid "Region/State:" -msgstr "Region/Bundesstaat:" - -#: mod/profiles.php:720 -msgid "Postal/Zip Code:" -msgstr "Postleitzahl:" - -#: mod/profiles.php:721 -msgid "Country:" -msgstr "Land:" - -#: mod/profiles.php:725 -msgid "Who: (if applicable)" -msgstr "Wer: (falls anwendbar)" - -#: mod/profiles.php:725 -msgid "Examples: cathy123, Cathy Williams, cathy@example.com" -msgstr "Beispiele: cathy123, Cathy Williams, cathy@example.com" - -#: mod/profiles.php:726 -msgid "Since [date]:" -msgstr "Seit [Datum]:" - -#: mod/profiles.php:728 -msgid "Tell us about yourself..." -msgstr "Erzähle uns ein bisschen von Dir …" - -#: mod/profiles.php:729 -msgid "Homepage URL:" -msgstr "Adresse der Homepage:" - -#: mod/profiles.php:732 -msgid "Religious Views:" -msgstr "Religiöse Ansichten:" - -#: mod/profiles.php:733 -msgid "Public Keywords:" -msgstr "Öffentliche Schlüsselwörter:" - -#: mod/profiles.php:733 -msgid "(Used for suggesting potential friends, can be seen by others)" -msgstr "(Wird verwendet, um potentielle Kontakte zu finden, kann von Kontakten eingesehen werden)" - -#: mod/profiles.php:734 -msgid "Private Keywords:" -msgstr "Private Schlüsselwörter:" - -#: mod/profiles.php:734 -msgid "(Used for searching profiles, never shown to others)" -msgstr "(Wird für die Suche nach Profilen verwendet und niemals veröffentlicht)" - -#: mod/profiles.php:737 -msgid "Musical interests" -msgstr "Musikalische Interessen" - -#: mod/profiles.php:738 -msgid "Books, literature" -msgstr "Bücher, Literatur" - -#: mod/profiles.php:739 -msgid "Television" -msgstr "Fernsehen" - -#: mod/profiles.php:740 -msgid "Film/dance/culture/entertainment" -msgstr "Filme/Tänze/Kultur/Unterhaltung" - -#: mod/profiles.php:741 -msgid "Hobbies/Interests" -msgstr "Hobbies/Interessen" - -#: mod/profiles.php:742 -msgid "Love/romance" -msgstr "Liebe/Romantik" - -#: mod/profiles.php:743 -msgid "Work/employment" -msgstr "Arbeit/Anstellung" - -#: mod/profiles.php:744 -msgid "School/education" -msgstr "Schule/Ausbildung" - -#: mod/profiles.php:745 -msgid "Contact information and Social Networks" -msgstr "Kontaktinformationen und Soziale Netzwerke" - -#: mod/profiles.php:787 -msgid "Edit/Manage Profiles" -msgstr "Bearbeite/Verwalte Profile" - -#: mod/content.php:325 object/Item.php:95 -msgid "This entry was edited" -msgstr "Dieser Beitrag wurde bearbeitet." - -#: mod/content.php:621 object/Item.php:429 -#, php-format -msgid "%d comment" -msgid_plural "%d comments" -msgstr[0] "%d Kommentar" -msgstr[1] "%d Kommentare" - -#: mod/content.php:702 object/Item.php:263 -msgid "like" -msgstr "mag ich" - -#: mod/content.php:703 object/Item.php:264 -msgid "dislike" -msgstr "mag ich nicht" - -#: mod/content.php:705 object/Item.php:266 -msgid "Share this" -msgstr "Weitersagen" - -#: mod/content.php:705 object/Item.php:266 -msgid "share" -msgstr "Teilen" - -#: mod/content.php:729 object/Item.php:721 -msgid "Bold" -msgstr "Fett" - -#: mod/content.php:730 object/Item.php:722 -msgid "Italic" -msgstr "Kursiv" - -#: mod/content.php:731 object/Item.php:723 -msgid "Underline" -msgstr "Unterstrichen" - -#: mod/content.php:732 object/Item.php:724 -msgid "Quote" -msgstr "Zitat" - -#: mod/content.php:733 object/Item.php:725 -msgid "Code" -msgstr "Code" - -#: mod/content.php:734 object/Item.php:726 -msgid "Image" -msgstr "Bild" - -#: mod/content.php:735 object/Item.php:727 -msgid "Link" -msgstr "Link" - -#: mod/content.php:736 object/Item.php:728 -msgid "Video" -msgstr "Video" - -#: mod/content.php:771 object/Item.php:227 -msgid "add star" -msgstr "markieren" - -#: mod/content.php:772 object/Item.php:228 -msgid "remove star" -msgstr "Markierung entfernen" - -#: mod/content.php:773 object/Item.php:229 -msgid "toggle star status" -msgstr "Markierung umschalten" - -#: mod/content.php:776 object/Item.php:232 -msgid "starred" -msgstr "markiert" - -#: mod/content.php:777 mod/content.php:798 object/Item.php:252 -msgid "add tag" -msgstr "Tag hinzufügen" - -#: mod/content.php:787 object/Item.php:240 -msgid "ignore thread" -msgstr "Thread ignorieren" - -#: mod/content.php:788 object/Item.php:241 -msgid "unignore thread" -msgstr "Thread nicht mehr ignorieren" - -#: mod/content.php:789 object/Item.php:242 -msgid "toggle ignore status" -msgstr "Ignoriert-Status ein-/ausschalten" - -#: mod/content.php:803 object/Item.php:137 -msgid "save to folder" -msgstr "In Ordner speichern" - -#: mod/content.php:848 object/Item.php:201 -msgid "I will attend" -msgstr "Ich werde teilnehmen" - -#: mod/content.php:848 object/Item.php:201 -msgid "I will not attend" -msgstr "Ich werde nicht teilnehmen" - -#: mod/content.php:848 object/Item.php:201 -msgid "I might attend" -msgstr "Ich werde eventuell teilnehmen" - -#: mod/content.php:912 object/Item.php:369 -msgid "to" -msgstr "zu" - -#: mod/content.php:913 object/Item.php:371 -msgid "Wall-to-Wall" -msgstr "Wall-to-Wall" - -#: mod/content.php:914 object/Item.php:372 -msgid "via Wall-To-Wall:" -msgstr "via Wall-To-Wall:" - -#: mod/notifications.php:29 -msgid "Invalid request identifier." -msgstr "Invalid request identifier." - -#: mod/notifications.php:38 mod/notifications.php:143 -#: mod/notifications.php:228 -msgid "Discard" -msgstr "Verwerfen" - -#: mod/notifications.php:91 -msgid "Show Ignored Requests" -msgstr "Zeige ignorierte Anfragen" - -#: mod/notifications.php:91 -msgid "Hide Ignored Requests" -msgstr "Verberge ignorierte Anfragen" - -#: mod/notifications.php:127 mod/notifications.php:198 -msgid "Notification type: " -msgstr "Benachrichtigungstyp: " - -#: mod/notifications.php:128 -msgid "Friend Suggestion" -msgstr "Kontaktvorschlag" - -#: mod/notifications.php:130 -#, php-format -msgid "suggested by %s" -msgstr "vorgeschlagen von %s" - -#: mod/notifications.php:136 mod/notifications.php:216 -msgid "Post a new friend activity" -msgstr "Neue-Kontakt Nachricht senden" - -#: mod/notifications.php:136 mod/notifications.php:216 -msgid "if applicable" -msgstr "falls anwendbar" - -#: mod/notifications.php:159 -msgid "Claims to be known to you: " -msgstr "Behauptet Dich zu kennen: " - -#: mod/notifications.php:160 -msgid "yes" -msgstr "ja" - -#: mod/notifications.php:160 -msgid "no" -msgstr "nein" - -#: mod/notifications.php:161 -msgid "" -"Shall your connection be bidirectional or not? \"Friend\" implies that you " -"allow to read and you subscribe to their posts. \"Fan/Admirer\" means that " -"you allow to read but you do not want to read theirs. Approve as: " -msgstr "Soll Deine Beziehung beidseitig sein oder nicht? \"Kontakt\" bedeutet, ihr könnt gegenseitig die Beiträge des Anderen lesen dürft. \"Fan/Verehrer\", dass du das lesen deiner Beiträge erlaubst aber nicht die Beiträge der anderen Seite lesen möchtest. Genehmigen als:" - -#: mod/notifications.php:164 -msgid "" -"Shall your connection be bidirectional or not? \"Friend\" implies that you " -"allow to read and you subscribe to their posts. \"Sharer\" means that you " -"allow to read but you do not want to read theirs. Approve as: " -msgstr "Soll Deine Beziehung beidseitig sein oder nicht? \"Freund\" bedeutet, ihr gegenseitig die Beiträge des Anderen lesen dürft. \"Teilenden\", das du das lesen deiner Beiträge erlaubst aber nicht die Beiträge der anderen Seite lesen möchtest. Genehmigen als:" - -#: mod/notifications.php:172 -msgid "Friend" -msgstr "Kontakt" - -#: mod/notifications.php:173 -msgid "Sharer" -msgstr "Teilenden" - -#: mod/notifications.php:173 -msgid "Fan/Admirer" -msgstr "Fan/Verehrer" - -#: mod/notifications.php:199 -msgid "Friend/Connect Request" -msgstr "Kontakt-/Freundschaftsanfrage" - -#: mod/notifications.php:199 -msgid "New Follower" -msgstr "Neuer Bewunderer" - -#: mod/notifications.php:234 -msgid "No introductions." -msgstr "Keine Kontaktanfragen." - -#: mod/notifications.php:238 -msgid "Network Notifications" -msgstr "Netzwerk Benachrichtigungen" - -#: mod/notifications.php:265 mod/notifications.php:382 -#: mod/notifications.php:461 -#, php-format -msgid "%s liked %s's post" -msgstr "%s mag %ss Beitrag" - -#: mod/notifications.php:275 mod/notifications.php:392 -#: mod/notifications.php:471 -#, php-format -msgid "%s disliked %s's post" -msgstr "%s mag %ss Beitrag nicht" - -#: mod/notifications.php:290 mod/notifications.php:407 -#: mod/notifications.php:486 -#, php-format -msgid "%s is now friends with %s" -msgstr "%s ist jetzt mit %s befreundet" - -#: mod/notifications.php:297 mod/notifications.php:414 -#, php-format -msgid "%s created a new post" -msgstr "%s hat einen neuen Beitrag erstellt" - -#: mod/notifications.php:298 mod/notifications.php:415 -#: mod/notifications.php:496 -#, php-format -msgid "%s commented on %s's post" -msgstr "%s hat %ss Beitrag kommentiert" - -#: mod/notifications.php:313 -msgid "No more network notifications." -msgstr "Keine weiteren Netzwerk-Benachrichtigungen." - -#: mod/notifications.php:343 -msgid "Personal Notifications" -msgstr "Persönliche Benachrichtigungen" - -#: mod/notifications.php:430 -msgid "No more personal notifications." -msgstr "Keine weiteren persönlichen Benachrichtigungen" - -#: mod/notifications.php:435 -msgid "Home Notifications" -msgstr "Pinnwand Benachrichtigungen" - -#: mod/notifications.php:503 -msgid "No more home notifications." -msgstr "Keine weiteren Pinnwand-Benachrichtigungen" - -#: mod/notifications.php:527 -msgid "System" -msgstr "System" +#: mod/videos.php:401 +msgid "Upload New Videos" +msgstr "Neues Video hochladen" #: object/Item.php:370 msgid "via" @@ -8762,51 +8774,51 @@ msgstr "Variationen" msgid "toggle mobile" msgstr "auf/von Mobile Ansicht wechseln" -#: boot.php:887 +#: boot.php:898 msgid "Delete this item?" msgstr "Diesen Beitrag löschen?" -#: boot.php:890 +#: boot.php:901 msgid "show fewer" msgstr "weniger anzeigen" -#: boot.php:1483 +#: boot.php:1515 #, php-format msgid "Update %s failed. See error logs." msgstr "Update %s fehlgeschlagen. Bitte Fehlerprotokoll überprüfen." -#: boot.php:1595 +#: boot.php:1627 msgid "Create a New Account" msgstr "Neues Konto erstellen" -#: boot.php:1624 +#: boot.php:1656 msgid "Password: " msgstr "Passwort: " -#: boot.php:1625 +#: boot.php:1657 msgid "Remember me" msgstr "Anmeldedaten merken" -#: boot.php:1628 +#: boot.php:1660 msgid "Or login using OpenID: " msgstr "Oder melde Dich mit Deiner OpenID an: " -#: boot.php:1634 +#: boot.php:1666 msgid "Forgot your password?" msgstr "Passwort vergessen?" -#: boot.php:1637 +#: boot.php:1669 msgid "Website Terms of Service" msgstr "Website Nutzungsbedingungen" -#: boot.php:1638 +#: boot.php:1670 msgid "terms of service" msgstr "Nutzungsbedingungen" -#: boot.php:1640 +#: boot.php:1672 msgid "Website Privacy Policy" msgstr "Website Datenschutzerklärung" -#: boot.php:1641 +#: boot.php:1673 msgid "privacy policy" msgstr "Datenschutzerklärung" diff --git a/view/de/strings.php b/view/de/strings.php index 1fb71df9e9..9de3af7982 100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -117,18 +117,6 @@ $a->strings["Full Name:\t%1\$s\\nSite Location:\t%2\$s\\nLogin Name:\t%3\$s (%4\ $a->strings["Please visit %s to approve or reject the request."] = "Bitte besuche %s um die Anfrage zu bearbeiten."; $a->strings["Forums"] = "Foren"; $a->strings["External link to forum"] = "Externer Link zum Forum"; -$a->strings["%s\\'s birthday"] = "%ss Geburtstag"; -$a->strings["Error decoding account file"] = "Fehler beim Verarbeiten der Account Datei"; -$a->strings["Error! No version data in file! This is not a Friendica account file?"] = "Fehler! Keine Versionsdaten in der Datei! Ist das wirklich eine Friendica Account Datei?"; -$a->strings["Error! Cannot check nickname"] = "Fehler! Konnte den Nickname nicht überprüfen."; -$a->strings["User '%s' already exists on this server!"] = "Nutzer '%s' existiert bereits auf diesem Server!"; -$a->strings["User creation error"] = "Fehler beim Anlegen des Nutzeraccounts aufgetreten"; -$a->strings["User profile creation error"] = "Fehler beim Anlegen des Nutzerkontos"; -$a->strings["%d contact not imported"] = array( - 0 => "%d Kontakt nicht importiert", - 1 => "%d Kontakte nicht importiert", -); -$a->strings["Done. You can now login with your username and password"] = "Erledigt. Du kannst Dich jetzt mit Deinem Nutzernamen und Passwort anmelden"; $a->strings["Cannot locate DNS info for database server '%s'"] = "Kann die DNS Informationen für den Datenbankserver '%s' nicht ermitteln."; $a->strings["l F d, Y \\@ g:i A"] = "l, d. F Y\\, H:i"; $a->strings["Starts:"] = "Beginnt:"; @@ -243,153 +231,6 @@ $a->strings["Uncertain"] = "Unsicher"; $a->strings["It's complicated"] = "Ist kompliziert"; $a->strings["Don't care"] = "Ist mir nicht wichtig"; $a->strings["Ask me"] = "Frag mich"; -$a->strings["[Name Withheld]"] = "[Name unterdrückt]"; -$a->strings["Item not found."] = "Beitrag nicht gefunden."; -$a->strings["Do you really want to delete this item?"] = "Möchtest Du wirklich dieses Item löschen?"; -$a->strings["Yes"] = "Ja"; -$a->strings["Cancel"] = "Abbrechen"; -$a->strings["Permission denied."] = "Zugriff verweigert."; -$a->strings["Archives"] = "Archiv"; -$a->strings["newer"] = "neuer"; -$a->strings["older"] = "älter"; -$a->strings["prev"] = "vorige"; -$a->strings["first"] = "erste"; -$a->strings["last"] = "letzte"; -$a->strings["next"] = "nächste"; -$a->strings["Loading more entries..."] = "lade weitere Einträge..."; -$a->strings["The end"] = "Das Ende"; -$a->strings["No contacts"] = "Keine Kontakte"; -$a->strings["%d Contact"] = array( - 0 => "%d Kontakt", - 1 => "%d Kontakte", -); -$a->strings["View Contacts"] = "Kontakte anzeigen"; -$a->strings["Search"] = "Suche"; -$a->strings["Save"] = "Speichern"; -$a->strings["@name, !forum, #tags, content"] = "@name, !forum, #tags, content"; -$a->strings["Full Text"] = "Volltext"; -$a->strings["Tags"] = "Tags"; -$a->strings["Contacts"] = "Kontakte"; -$a->strings["poke"] = "anstupsen"; -$a->strings["poked"] = "stupste"; -$a->strings["ping"] = "anpingen"; -$a->strings["pinged"] = "pingte"; -$a->strings["prod"] = "knuffen"; -$a->strings["prodded"] = "knuffte"; -$a->strings["slap"] = "ohrfeigen"; -$a->strings["slapped"] = "ohrfeigte"; -$a->strings["finger"] = "befummeln"; -$a->strings["fingered"] = "befummelte"; -$a->strings["rebuff"] = "eine Abfuhr erteilen"; -$a->strings["rebuffed"] = "abfuhrerteilte"; -$a->strings["happy"] = "glücklich"; -$a->strings["sad"] = "traurig"; -$a->strings["mellow"] = "sanft"; -$a->strings["tired"] = "müde"; -$a->strings["perky"] = "frech"; -$a->strings["angry"] = "sauer"; -$a->strings["stupified"] = "verblüfft"; -$a->strings["puzzled"] = "verwirrt"; -$a->strings["interested"] = "interessiert"; -$a->strings["bitter"] = "verbittert"; -$a->strings["cheerful"] = "fröhlich"; -$a->strings["alive"] = "lebendig"; -$a->strings["annoyed"] = "verärgert"; -$a->strings["anxious"] = "unruhig"; -$a->strings["cranky"] = "schrullig"; -$a->strings["disturbed"] = "verstört"; -$a->strings["frustrated"] = "frustriert"; -$a->strings["motivated"] = "motiviert"; -$a->strings["relaxed"] = "entspannt"; -$a->strings["surprised"] = "überrascht"; -$a->strings["View Video"] = "Video ansehen"; -$a->strings["bytes"] = "Byte"; -$a->strings["Click to open/close"] = "Zum öffnen/schließen klicken"; -$a->strings["View on separate page"] = "Auf separater Seite ansehen"; -$a->strings["view on separate page"] = "auf separater Seite ansehen"; -$a->strings["event"] = "Event"; -$a->strings["photo"] = "Foto"; -$a->strings["activity"] = "Aktivität"; -$a->strings["comment"] = array( - 0 => "Kommentar", - 1 => "Kommentare", -); -$a->strings["post"] = "Beitrag"; -$a->strings["Item filed"] = "Beitrag abgelegt"; -$a->strings["Requested account is not available."] = "Das angefragte Profil ist nicht vorhanden."; -$a->strings["Requested profile is not available."] = "Das angefragte Profil ist nicht vorhanden."; -$a->strings["Edit profile"] = "Profil bearbeiten"; -$a->strings["Atom feed"] = "Atom-Feed"; -$a->strings["Message"] = "Nachricht"; -$a->strings["Profiles"] = "Profile"; -$a->strings["Manage/edit profiles"] = "Profile verwalten/editieren"; -$a->strings["Change profile photo"] = "Profilbild ändern"; -$a->strings["Create New Profile"] = "Neues Profil anlegen"; -$a->strings["Profile Image"] = "Profilbild"; -$a->strings["visible to everybody"] = "sichtbar für jeden"; -$a->strings["Edit visibility"] = "Sichtbarkeit bearbeiten"; -$a->strings["Forum"] = "Forum"; -$a->strings["Gender:"] = "Geschlecht:"; -$a->strings["Status:"] = "Status:"; -$a->strings["Homepage:"] = "Homepage:"; -$a->strings["About:"] = "Über:"; -$a->strings["Network:"] = "Netzwerk:"; -$a->strings["g A l F d"] = "l, d. F G \\U\\h\\r"; -$a->strings["F d"] = "d. F"; -$a->strings["[today]"] = "[heute]"; -$a->strings["Birthday Reminders"] = "Geburtstagserinnerungen"; -$a->strings["Birthdays this week:"] = "Geburtstage diese Woche:"; -$a->strings["[No description]"] = "[keine Beschreibung]"; -$a->strings["Event Reminders"] = "Veranstaltungserinnerungen"; -$a->strings["Events this week:"] = "Veranstaltungen diese Woche"; -$a->strings["Profile"] = "Profil"; -$a->strings["Full Name:"] = "Kompletter Name:"; -$a->strings["j F, Y"] = "j F, Y"; -$a->strings["j F"] = "j F"; -$a->strings["Age:"] = "Alter:"; -$a->strings["for %1\$d %2\$s"] = "für %1\$d %2\$s"; -$a->strings["Sexual Preference:"] = "Sexuelle Vorlieben:"; -$a->strings["Hometown:"] = "Heimatort:"; -$a->strings["Tags:"] = "Tags"; -$a->strings["Political Views:"] = "Politische Ansichten:"; -$a->strings["Religion:"] = "Religion:"; -$a->strings["Hobbies/Interests:"] = "Hobbies/Interessen:"; -$a->strings["Likes:"] = "Likes:"; -$a->strings["Dislikes:"] = "Dislikes:"; -$a->strings["Contact information and Social Networks:"] = "Kontaktinformationen und Soziale Netzwerke:"; -$a->strings["Musical interests:"] = "Musikalische Interessen:"; -$a->strings["Books, literature:"] = "Literatur/Bücher:"; -$a->strings["Television:"] = "Fernsehen:"; -$a->strings["Film/dance/culture/entertainment:"] = "Filme/Tänze/Kultur/Unterhaltung:"; -$a->strings["Love/Romance:"] = "Liebesleben:"; -$a->strings["Work/employment:"] = "Arbeit/Beschäftigung:"; -$a->strings["School/education:"] = "Schule/Ausbildung:"; -$a->strings["Forums:"] = "Foren:"; -$a->strings["Basic"] = "Allgemein"; -$a->strings["Advanced"] = "Erweitert"; -$a->strings["Status"] = "Status"; -$a->strings["Status Messages and Posts"] = "Statusnachrichten und Beiträge"; -$a->strings["Profile Details"] = "Profildetails"; -$a->strings["Photos"] = "Bilder"; -$a->strings["Photo Albums"] = "Fotoalben"; -$a->strings["Videos"] = "Videos"; -$a->strings["Events"] = "Veranstaltungen"; -$a->strings["Events and Calendar"] = "Ereignisse und Kalender"; -$a->strings["Personal Notes"] = "Persönliche Notizen"; -$a->strings["Only You Can See This"] = "Nur Du kannst das sehen"; -$a->strings["Disallowed profile URL."] = "Nicht erlaubte Profil-URL."; -$a->strings["Connect URL missing."] = "Connect-URL fehlt"; -$a->strings["This site is not configured to allow communications with other networks."] = "Diese Seite ist so konfiguriert, dass keine Kommunikation mit anderen Netzwerken erfolgen kann."; -$a->strings["No compatible communication protocols or feeds were discovered."] = "Es wurden keine kompatiblen Kommunikationsprotokolle oder Feeds gefunden."; -$a->strings["The profile address specified does not provide adequate information."] = "Die angegebene Profiladresse liefert unzureichende Informationen."; -$a->strings["An author or name was not found."] = "Es wurde kein Autor oder Name gefunden."; -$a->strings["No browser URL could be matched to this address."] = "Zu dieser Adresse konnte keine passende Browser URL gefunden werden."; -$a->strings["Unable to match @-style Identity Address with a known protocol or email contact."] = "Konnte die @-Adresse mit keinem der bekannten Protokolle oder Email-Kontakte abgleichen."; -$a->strings["Use mailto: in front of address to force email check."] = "Verwende mailto: vor der Email Adresse, um eine Überprüfung der E-Mail-Adresse zu erzwingen."; -$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "Die Adresse dieses Profils gehört zu einem Netzwerk, mit dem die Kommunikation auf dieser Seite ausgeschaltet wurde."; -$a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Eingeschränktes Profil. Diese Person wird keine direkten/privaten Nachrichten von Dir erhalten können."; -$a->strings["Unable to retrieve contact information."] = "Konnte die Kontaktinformationen nicht empfangen."; -$a->strings["following"] = "folgen"; $a->strings["Embedded content"] = "Eingebetteter Inhalt"; $a->strings["Embedding disabled"] = "Einbettungen deaktiviert"; $a->strings["Image/photo"] = "Bild/Foto"; @@ -487,12 +328,18 @@ $a->strings["Advanced Profile Settings"] = "Erweiterte Profil-Einstellungen"; $a->strings["Show visitors public community forums at the Advanced Profile Page"] = "Zeige Besuchern öffentliche Gemeinschafts-Foren auf der Erweiterten Profil-Seite"; $a->strings["Nothing new here"] = "Keine Neuigkeiten"; $a->strings["Clear notifications"] = "Bereinige Benachrichtigungen"; +$a->strings["@name, !forum, #tags, content"] = "@name, !forum, #tags, content"; $a->strings["Logout"] = "Abmelden"; $a->strings["End this session"] = "Diese Sitzung beenden"; +$a->strings["Status"] = "Status"; $a->strings["Your posts and conversations"] = "Deine Beiträge und Unterhaltungen"; +$a->strings["Profile"] = "Profil"; $a->strings["Your profile page"] = "Deine Profilseite"; +$a->strings["Photos"] = "Bilder"; $a->strings["Your photos"] = "Deine Fotos"; +$a->strings["Videos"] = "Videos"; $a->strings["Your videos"] = "Deine Videos"; +$a->strings["Events"] = "Veranstaltungen"; $a->strings["Your events"] = "Deine Ereignisse"; $a->strings["Personal notes"] = "Persönliche Notizen"; $a->strings["Your personal notes"] = "Deine persönlichen Notizen"; @@ -506,10 +353,15 @@ $a->strings["Help"] = "Hilfe"; $a->strings["Help and documentation"] = "Hilfe und Dokumentation"; $a->strings["Apps"] = "Apps"; $a->strings["Addon applications, utilities, games"] = "Addon Anwendungen, Dienstprogramme, Spiele"; +$a->strings["Search"] = "Suche"; $a->strings["Search site content"] = "Inhalt der Seite durchsuchen"; +$a->strings["Full Text"] = "Volltext"; +$a->strings["Tags"] = "Tags"; +$a->strings["Contacts"] = "Kontakte"; $a->strings["Community"] = "Gemeinschaft"; $a->strings["Conversations on this site"] = "Unterhaltungen auf dieser Seite"; $a->strings["Conversations on the network"] = "Unterhaltungen im Netzwerk"; +$a->strings["Events and Calendar"] = "Ereignisse und Kalender"; $a->strings["Directory"] = "Verzeichnis"; $a->strings["People directory"] = "Nutzerverzeichnis"; $a->strings["Information"] = "Information"; @@ -535,29 +387,13 @@ $a->strings["Delegations"] = "Delegationen"; $a->strings["Delegate Page Management"] = "Delegiere das Management für die Seite"; $a->strings["Settings"] = "Einstellungen"; $a->strings["Account settings"] = "Kontoeinstellungen"; +$a->strings["Profiles"] = "Profile"; $a->strings["Manage/Edit Profiles"] = "Profile Verwalten/Editieren"; $a->strings["Manage/edit friends and contacts"] = " Kontakte verwalten/editieren"; $a->strings["Admin"] = "Administration"; $a->strings["Site setup and configuration"] = "Einstellungen der Seite und Konfiguration"; $a->strings["Navigation"] = "Navigation"; $a->strings["Site map"] = "Sitemap"; -$a->strings["status"] = "Status"; -$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["[no subject]"] = "[kein Betreff]"; -$a->strings["Post to Email"] = "An E-Mail senden"; -$a->strings["Connectors disabled, since \"%s\" is enabled."] = "Konnektoren sind nicht verfügbar, da \"%s\" aktiv ist."; -$a->strings["Hide your profile details from unknown viewers?"] = "Profil-Details vor unbekannten Betrachtern verbergen?"; -$a->strings["Visible to everybody"] = "Für jeden sichtbar"; -$a->strings["show"] = "zeigen"; -$a->strings["don't show"] = "nicht zeigen"; -$a->strings["CC: email addresses"] = "Cc: E-Mail-Addressen"; -$a->strings["Example: bob@example.com, mary@example.com"] = "Z.B.: bob@example.com, mary@example.com"; -$a->strings["Permissions"] = "Berechtigungen"; -$a->strings["Close"] = "Schließen"; $a->strings["Unknown | Not categorised"] = "Unbekannt | Nicht kategorisiert"; $a->strings["Block immediately"] = "Sofort blockieren"; $a->strings["Shady, spammer, self-marketer"] = "Zwielichtig, Spammer, Selbstdarsteller"; @@ -587,6 +423,11 @@ $a->strings["Diaspora Connector"] = "Diaspora"; $a->strings["GNU Social"] = "GNU Social"; $a->strings["App.net"] = "App.net"; $a->strings["Hubzilla/Redmatrix"] = "Hubzilla/Redmatrix"; +$a->strings["event"] = "Event"; +$a->strings["status"] = "Status"; +$a->strings["photo"] = "Foto"; +$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 attends %2\$s's %3\$s"] = "%1\$s nimmt an %2\$ss %3\$s teil."; $a->strings["%1\$s doesn't attend %2\$s's %3\$s"] = "%1\$s nimmt nicht an %2\$ss %3\$s teil."; $a->strings["%1\$s attends maybe %2\$s's %3\$s"] = "%1\$s nimmt eventuell an %2\$ss %3\$s teil."; @@ -668,9 +509,11 @@ $a->strings["Permission settings"] = "Berechtigungseinstellungen"; $a->strings["permissions"] = "Zugriffsrechte"; $a->strings["Public post"] = "Öffentlicher Beitrag"; $a->strings["Preview"] = "Vorschau"; +$a->strings["Cancel"] = "Abbrechen"; $a->strings["Post to Groups"] = "Poste an Gruppe"; $a->strings["Post to Contacts"] = "Poste an Kontakte"; $a->strings["Private post"] = "Privater Beitrag"; +$a->strings["Message"] = "Nachricht"; $a->strings["Browser"] = "Browser"; $a->strings["View all"] = "Zeige alle"; $a->strings["Like"] = array( @@ -685,29 +528,180 @@ $a->strings["Not Attending"] = array( 0 => "Nicht teilnehmend ", 1 => "Nicht teilnehmend", ); -$a->strings["Sharing notification from Diaspora network"] = "Freigabe-Benachrichtigung von Diaspora"; -$a->strings["Attachments:"] = "Anhänge:"; $a->strings["view full size"] = "Volle Größe anzeigen"; -$a->strings["Click here to upgrade."] = "Zum Upgraden hier klicken."; -$a->strings["This action exceeds the limits set by your subscription plan."] = "Diese Aktion überschreitet die Obergrenze Deines Abonnements."; -$a->strings["This action is not available under your subscription plan."] = "Diese Aktion ist in Deinem Abonnement nicht verfügbar."; -$a->strings["stopped following"] = "wird nicht mehr gefolgt"; -$a->strings["Drop Contact"] = "Kontakt löschen"; -$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["\n\t\t\tThe friendica developers released update %s recently,\n\t\t\tbut when I tried to install it, something went terribly wrong.\n\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."] = "\nDie Friendica-Entwickler haben vor kurzem das Update %s veröffentlicht, aber bei der Installation ging etwas schrecklich schief.\n\nDas Problem sollte so schnell wie möglich gelöst werden, aber ich schaffe es nicht alleine. Bitte kontaktiere einen Friendica-Entwickler falls Du mir nicht alleine helfen kannst. Meine Datenbank könnte ungültig sein."; $a->strings["The error message is\n[pre]%s[/pre]"] = "Die Fehlermeldung lautet\n[pre]%s[/pre]"; $a->strings["Errors encountered creating database tables."] = "Fehler aufgetreten während der Erzeugung der Datenbanktabellen."; $a->strings["Errors encountered performing database changes."] = "Es sind Fehler beim Bearbeiten der Datenbank aufgetreten."; -$a->strings["Account approved."] = "Konto freigegeben."; -$a->strings["Registration revoked for %s"] = "Registrierung für %s wurde zurückgezogen"; -$a->strings["Please login."] = "Bitte melde Dich an."; +$a->strings["stopped following"] = "wird nicht mehr gefolgt"; +$a->strings["Drop Contact"] = "Kontakt löschen"; +$a->strings["Post to Email"] = "An E-Mail senden"; +$a->strings["Connectors disabled, since \"%s\" is enabled."] = "Konnektoren sind nicht verfügbar, da \"%s\" aktiv ist."; +$a->strings["Hide your profile details from unknown viewers?"] = "Profil-Details vor unbekannten Betrachtern verbergen?"; +$a->strings["Visible to everybody"] = "Für jeden sichtbar"; +$a->strings["show"] = "zeigen"; +$a->strings["don't show"] = "nicht zeigen"; +$a->strings["CC: email addresses"] = "Cc: E-Mail-Addressen"; +$a->strings["Example: bob@example.com, mary@example.com"] = "Z.B.: bob@example.com, mary@example.com"; +$a->strings["Permissions"] = "Berechtigungen"; +$a->strings["Close"] = "Schließen"; +$a->strings["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["%s\\'s birthday"] = "%ss Geburtstag"; +$a->strings["Sharing notification from Diaspora network"] = "Freigabe-Benachrichtigung von Diaspora"; +$a->strings["Attachments:"] = "Anhänge:"; +$a->strings["Disallowed profile URL."] = "Nicht erlaubte Profil-URL."; +$a->strings["Connect URL missing."] = "Connect-URL fehlt"; +$a->strings["This site is not configured to allow communications with other networks."] = "Diese Seite ist so konfiguriert, dass keine Kommunikation mit anderen Netzwerken erfolgen kann."; +$a->strings["No compatible communication protocols or feeds were discovered."] = "Es wurden keine kompatiblen Kommunikationsprotokolle oder Feeds gefunden."; +$a->strings["The profile address specified does not provide adequate information."] = "Die angegebene Profiladresse liefert unzureichende Informationen."; +$a->strings["An author or name was not found."] = "Es wurde kein Autor oder Name gefunden."; +$a->strings["No browser URL could be matched to this address."] = "Zu dieser Adresse konnte keine passende Browser URL gefunden werden."; +$a->strings["Unable to match @-style Identity Address with a known protocol or email contact."] = "Konnte die @-Adresse mit keinem der bekannten Protokolle oder Email-Kontakte abgleichen."; +$a->strings["Use mailto: in front of address to force email check."] = "Verwende mailto: vor der Email Adresse, um eine Überprüfung der E-Mail-Adresse zu erzwingen."; +$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "Die Adresse dieses Profils gehört zu einem Netzwerk, mit dem die Kommunikation auf dieser Seite ausgeschaltet wurde."; +$a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Eingeschränktes Profil. Diese Person wird keine direkten/privaten Nachrichten von Dir erhalten können."; +$a->strings["Unable to retrieve contact information."] = "Konnte die Kontaktinformationen nicht empfangen."; +$a->strings["following"] = "folgen"; +$a->strings["Requested account is not available."] = "Das angefragte Profil ist nicht vorhanden."; +$a->strings["Requested profile is not available."] = "Das angefragte Profil ist nicht vorhanden."; +$a->strings["Edit profile"] = "Profil bearbeiten"; +$a->strings["Atom feed"] = "Atom-Feed"; +$a->strings["Manage/edit profiles"] = "Profile verwalten/editieren"; +$a->strings["Change profile photo"] = "Profilbild ändern"; +$a->strings["Create New Profile"] = "Neues Profil anlegen"; +$a->strings["Profile Image"] = "Profilbild"; +$a->strings["visible to everybody"] = "sichtbar für jeden"; +$a->strings["Edit visibility"] = "Sichtbarkeit bearbeiten"; +$a->strings["Forum"] = "Forum"; +$a->strings["Gender:"] = "Geschlecht:"; +$a->strings["Status:"] = "Status:"; +$a->strings["Homepage:"] = "Homepage:"; +$a->strings["About:"] = "Über:"; +$a->strings["Network:"] = "Netzwerk:"; +$a->strings["g A l F d"] = "l, d. F G \\U\\h\\r"; +$a->strings["F d"] = "d. F"; +$a->strings["[today]"] = "[heute]"; +$a->strings["Birthday Reminders"] = "Geburtstagserinnerungen"; +$a->strings["Birthdays this week:"] = "Geburtstage diese Woche:"; +$a->strings["[No description]"] = "[keine Beschreibung]"; +$a->strings["Event Reminders"] = "Veranstaltungserinnerungen"; +$a->strings["Events this week:"] = "Veranstaltungen diese Woche"; +$a->strings["Full Name:"] = "Kompletter Name:"; +$a->strings["j F, Y"] = "j F, Y"; +$a->strings["j F"] = "j F"; +$a->strings["Age:"] = "Alter:"; +$a->strings["for %1\$d %2\$s"] = "für %1\$d %2\$s"; +$a->strings["Sexual Preference:"] = "Sexuelle Vorlieben:"; +$a->strings["Hometown:"] = "Heimatort:"; +$a->strings["Tags:"] = "Tags:"; +$a->strings["Political Views:"] = "Politische Ansichten:"; +$a->strings["Religion:"] = "Religion:"; +$a->strings["Hobbies/Interests:"] = "Hobbies/Interessen:"; +$a->strings["Likes:"] = "Likes:"; +$a->strings["Dislikes:"] = "Dislikes:"; +$a->strings["Contact information and Social Networks:"] = "Kontaktinformationen und Soziale Netzwerke:"; +$a->strings["Musical interests:"] = "Musikalische Interessen:"; +$a->strings["Books, literature:"] = "Literatur/Bücher:"; +$a->strings["Television:"] = "Fernsehen:"; +$a->strings["Film/dance/culture/entertainment:"] = "Filme/Tänze/Kultur/Unterhaltung:"; +$a->strings["Love/Romance:"] = "Liebesleben:"; +$a->strings["Work/employment:"] = "Arbeit/Beschäftigung:"; +$a->strings["School/education:"] = "Schule/Ausbildung:"; +$a->strings["Forums:"] = "Foren:"; +$a->strings["Basic"] = "Allgemein"; +$a->strings["Advanced"] = "Erweitert"; +$a->strings["Status Messages and Posts"] = "Statusnachrichten und Beiträge"; +$a->strings["Profile Details"] = "Profildetails"; +$a->strings["Photo Albums"] = "Fotoalben"; +$a->strings["Personal Notes"] = "Persönliche Notizen"; +$a->strings["Only You Can See This"] = "Nur Du kannst das sehen"; +$a->strings["[Name Withheld]"] = "[Name unterdrückt]"; +$a->strings["Item not found."] = "Beitrag nicht gefunden."; +$a->strings["Do you really want to delete this item?"] = "Möchtest Du wirklich dieses Item löschen?"; +$a->strings["Yes"] = "Ja"; +$a->strings["Permission denied."] = "Zugriff verweigert."; +$a->strings["Archives"] = "Archiv"; +$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["[no subject]"] = "[kein Betreff]"; +$a->strings["Click here to upgrade."] = "Zum Upgraden hier klicken."; +$a->strings["This action exceeds the limits set by your subscription plan."] = "Diese Aktion überschreitet die Obergrenze Deines Abonnements."; +$a->strings["This action is not available under your subscription plan."] = "Diese Aktion ist in Deinem Abonnement nicht verfügbar."; +$a->strings["newer"] = "neuer"; +$a->strings["older"] = "älter"; +$a->strings["prev"] = "vorige"; +$a->strings["first"] = "erste"; +$a->strings["last"] = "letzte"; +$a->strings["next"] = "nächste"; +$a->strings["Loading more entries..."] = "lade weitere Einträge..."; +$a->strings["The end"] = "Das Ende"; +$a->strings["No contacts"] = "Keine Kontakte"; +$a->strings["%d Contact"] = array( + 0 => "%d Kontakt", + 1 => "%d Kontakte", +); +$a->strings["View Contacts"] = "Kontakte anzeigen"; +$a->strings["Save"] = "Speichern"; +$a->strings["poke"] = "anstupsen"; +$a->strings["poked"] = "stupste"; +$a->strings["ping"] = "anpingen"; +$a->strings["pinged"] = "pingte"; +$a->strings["prod"] = "knuffen"; +$a->strings["prodded"] = "knuffte"; +$a->strings["slap"] = "ohrfeigen"; +$a->strings["slapped"] = "ohrfeigte"; +$a->strings["finger"] = "befummeln"; +$a->strings["fingered"] = "befummelte"; +$a->strings["rebuff"] = "eine Abfuhr erteilen"; +$a->strings["rebuffed"] = "abfuhrerteilte"; +$a->strings["happy"] = "glücklich"; +$a->strings["sad"] = "traurig"; +$a->strings["mellow"] = "sanft"; +$a->strings["tired"] = "müde"; +$a->strings["perky"] = "frech"; +$a->strings["angry"] = "sauer"; +$a->strings["stupified"] = "verblüfft"; +$a->strings["puzzled"] = "verwirrt"; +$a->strings["interested"] = "interessiert"; +$a->strings["bitter"] = "verbittert"; +$a->strings["cheerful"] = "fröhlich"; +$a->strings["alive"] = "lebendig"; +$a->strings["annoyed"] = "verärgert"; +$a->strings["anxious"] = "unruhig"; +$a->strings["cranky"] = "schrullig"; +$a->strings["disturbed"] = "verstört"; +$a->strings["frustrated"] = "frustriert"; +$a->strings["motivated"] = "motiviert"; +$a->strings["relaxed"] = "entspannt"; +$a->strings["surprised"] = "überrascht"; +$a->strings["View Video"] = "Video ansehen"; +$a->strings["bytes"] = "Byte"; +$a->strings["Click to open/close"] = "Zum öffnen/schließen klicken"; +$a->strings["View on separate page"] = "Auf separater Seite ansehen"; +$a->strings["view on separate page"] = "auf separater Seite ansehen"; +$a->strings["activity"] = "Aktivität"; +$a->strings["comment"] = array( + 0 => "Kommentar", + 1 => "Kommentare", +); +$a->strings["post"] = "Beitrag"; +$a->strings["Item filed"] = "Beitrag abgelegt"; +$a->strings["Error decoding account file"] = "Fehler beim Verarbeiten der Account Datei"; +$a->strings["Error! No version data in file! This is not a Friendica account file?"] = "Fehler! Keine Versionsdaten in der Datei! Ist das wirklich eine Friendica Account Datei?"; +$a->strings["Error! Cannot check nickname"] = "Fehler! Konnte den Nickname nicht überprüfen."; +$a->strings["User '%s' already exists on this server!"] = "Nutzer '%s' existiert bereits auf diesem Server!"; +$a->strings["User creation error"] = "Fehler beim Anlegen des Nutzeraccounts aufgetreten"; +$a->strings["User profile creation error"] = "Fehler beim Anlegen des Nutzerkontos"; +$a->strings["%d contact not imported"] = array( + 0 => "%d Kontakt nicht importiert", + 1 => "%d Kontakte nicht importiert", +); +$a->strings["Done. You can now login with your username and password"] = "Erledigt. Du kannst Dich jetzt mit Deinem Nutzernamen und Passwort anmelden"; $a->strings["Post successful."] = "Beitrag erfolgreich veröffentlicht."; $a->strings["[Embedded content - reload page to view]"] = "[Eingebetteter Inhalt - Seite neu laden zum Betrachten]"; -$a->strings["People Search - %s"] = "Personensuche - %s"; -$a->strings["Forum Search - %s"] = "Forensuche - %s"; -$a->strings["No matches"] = "Keine Übereinstimmungen"; $a->strings["Access denied."] = "Zugriff verweigert."; $a->strings["Welcome to %s"] = "Willkommen zu %s"; $a->strings["No more system notifications."] = "Keine weiteren Systembenachrichtigungen."; @@ -755,29 +749,8 @@ $a->strings["Invalid request."] = "Ungültige Anfrage"; $a->strings["Image exceeds size limit of %s"] = "Bildgröße überschreitet das Limit von %s"; $a->strings["Unable to process image."] = "Konnte das Bild nicht bearbeiten."; $a->strings["Image upload failed."] = "Hochladen des Bildes gescheitert."; -$a->strings["Contact not found."] = "Kontakt nicht gefunden."; -$a->strings["Friend suggestion sent."] = "Kontaktvorschlag gesendet."; -$a->strings["Suggest Friends"] = "Kontakte vorschlagen"; -$a->strings["Suggest a friend for %s"] = "Schlage %s einen Kontakt vor"; -$a->strings["Submit"] = "Senden"; $a->strings["Remote privacy information not available."] = "Entfernte Privatsphäreneinstellungen nicht verfügbar."; $a->strings["Visible to:"] = "Sichtbar für:"; -$a->strings["Event can not end before it has started."] = "Die Veranstaltung kann nicht enden bevor sie beginnt."; -$a->strings["Event title and start time are required."] = "Der Veranstaltungstitel und die Anfangszeit müssen angegeben werden."; -$a->strings["View"] = "Ansehen"; -$a->strings["Create New Event"] = "Neue Veranstaltung erstellen"; -$a->strings["Previous"] = "Vorherige"; -$a->strings["Next"] = "Nächste"; -$a->strings["Event details"] = "Veranstaltungsdetails"; -$a->strings["Starting date and Title are required."] = "Anfangszeitpunkt und Titel werden benötigt"; -$a->strings["Event Starts:"] = "Veranstaltungsbeginn:"; -$a->strings["Required"] = "Benötigt"; -$a->strings["Finish date/time is not known or not relevant"] = "Enddatum/-zeit ist nicht bekannt oder nicht relevant"; -$a->strings["Event Finishes:"] = "Veranstaltungsende:"; -$a->strings["Adjust for viewer timezone"] = "An Zeitzone des Betrachters anpassen"; -$a->strings["Description:"] = "Beschreibung"; -$a->strings["Title:"] = "Titel:"; -$a->strings["Share this event"] = "Veranstaltung teilen"; $a->strings["Global Directory"] = "Weltweites Verzeichnis"; $a->strings["Find on this site"] = "Auf diesem Server suchen"; $a->strings["Results for:"] = "Ergebnisse für:"; @@ -799,6 +772,7 @@ $a->strings["Contacts who are not members of a group"] = "Kontakte, die keiner G $a->strings["No keywords to match. Please add keywords to your default profile."] = "Keine Schlüsselwörter zum Abgleichen gefunden. Bitte füge einige Schlüsselwörter zu Deinem Standardprofil hinzu."; $a->strings["is interested in:"] = "ist interessiert an:"; $a->strings["Profile Match"] = "Profilübereinstimmungen"; +$a->strings["No matches"] = "Keine Übereinstimmungen"; $a->strings["Export account"] = "Account exportieren"; $a->strings["Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server."] = "Exportiere Deine Accountinformationen und Kontakte. Verwende dies um ein Backup Deines Accounts anzulegen und/oder damit auf einen anderen Server umzuziehen."; $a->strings["Export all"] = "Alles exportieren"; @@ -825,6 +799,7 @@ $a->strings["You are cordially invited to join me and other close friends on Fri $a->strings["You will need to supply this invitation code: \$invite_code"] = "Du benötigst den folgenden Einladungscode: \$invite_code"; $a->strings["Once you have registered, please connect with me via my profile page at:"] = "Sobald Du registriert bist, kontaktiere mich bitte auf meiner Profilseite:"; $a->strings["For more information about the Friendica project and why we feel it is important, please visit http://friendica.com"] = "Für weitere Informationen über das Friendica Projekt und warum wir es für ein wichtiges Projekt halten, besuche bitte http://friendica.com"; +$a->strings["Submit"] = "Senden"; $a->strings["Contact Photos"] = "Kontaktbilder"; $a->strings["Files"] = "Dateien"; $a->strings["System down for maintenance"] = "System zur Wartung abgeschaltet"; @@ -842,6 +817,396 @@ $a->strings["Remove"] = "Entfernen"; $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"; +$a->strings["Sorry, maybe your upload is bigger than the PHP configuration allows"] = "Entschuldige, die Datei scheint größer zu sein als es die PHP Konfiguration erlaubt."; +$a->strings["Or - did you try to upload an empty file?"] = "Oder - hast Du versucht, eine leere Datei hochzuladen?"; +$a->strings["File exceeds size limit of %s"] = "Die Datei ist größer als das erlaubte Limit von %s"; +$a->strings["File upload failed."] = "Hochladen der Datei fehlgeschlagen."; +$a->strings["No friends to display."] = "Keine Kontakte zum Anzeigen."; +$a->strings["Access to this profile has been restricted."] = "Der Zugriff zu diesem Profil wurde eingeschränkt."; +$a->strings["View"] = "Ansehen"; +$a->strings["Previous"] = "Vorherige"; +$a->strings["Next"] = "Nächste"; +$a->strings["User not found"] = "Nutzer nicht gefunden"; +$a->strings["This calendar format is not supported"] = "Dieses Kalenderformat wird nicht unterstützt."; +$a->strings["No exportable data found"] = "Keine exportierbaren Daten gefunden"; +$a->strings["calendar"] = "Kalender"; +$a->strings["Resubscribing to OStatus contacts"] = "Erneuern der OStatus Abonements"; +$a->strings["Error"] = "Fehler"; +$a->strings["Done"] = "Erledigt"; +$a->strings["Keep this window open until done."] = "Lasse dieses Fenster offen, bis der Vorgang abgeschlossen ist."; +$a->strings["No potential page delegates located."] = "Keine potentiellen Bevollmächtigten für die Seite gefunden."; +$a->strings["Delegates are able to manage all aspects of this account/page except for basic account settings. Please do not delegate your personal account to anybody that you do not trust completely."] = "Bevollmächtigte sind in der Lage, alle Aspekte dieses Kontos/dieser Seite zu verwalten, abgesehen von den Grundeinstellungen des Kontos. Bitte gib niemandem eine Bevollmächtigung für Deinen privaten Account, dem Du nicht absolut vertraust!"; +$a->strings["Existing Page Managers"] = "Vorhandene Seitenmanager"; +$a->strings["Existing Page Delegates"] = "Vorhandene Bevollmächtigte für die Seite"; +$a->strings["Potential Delegates"] = "Potentielle Bevollmächtigte"; +$a->strings["Add"] = "Hinzufügen"; +$a->strings["No entries."] = "Keine Einträge."; +$a->strings["Credits"] = "Credits"; +$a->strings["Friendica is a community project, that would not be possible without the help of many people. Here is a list of those who have contributed to the code or the translation of Friendica. Thank you all!"] = "Friendica ist ein Gemeinschaftsprojekt, das nicht ohne die Hilfe vieler Personen möglich wäre. Hier ist eine Aufzählung der Personen, die zum Code oder der Übersetzung beigetragen haben. Dank an alle !"; +$a->strings["- select -"] = "- auswählen -"; +$a->strings["Friendica Communications Server - Setup"] = "Friendica-Server für soziale Netzwerke – Setup"; +$a->strings["Could not connect to database."] = "Verbindung zur Datenbank gescheitert."; +$a->strings["Could not create table."] = "Tabelle konnte nicht angelegt werden."; +$a->strings["Your Friendica site database has been installed."] = "Die Datenbank Deiner Friendicaseite wurde installiert."; +$a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "Möglicherweise musst Du die Datei \"database.sql\" manuell mit phpmyadmin oder mysql importieren."; +$a->strings["Please see the file \"INSTALL.txt\"."] = "Lies bitte die \"INSTALL.txt\"."; +$a->strings["Database already in use."] = "Die Datenbank wird bereits verwendet."; +$a->strings["System check"] = "Systemtest"; +$a->strings["Check again"] = "Noch einmal testen"; +$a->strings["Database connection"] = "Datenbankverbindung"; +$a->strings["In order to install Friendica we need to know how to connect to your database."] = "Um Friendica installieren zu können, müssen wir wissen, wie wir mit Deiner Datenbank Kontakt aufnehmen können."; +$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Bitte kontaktiere den Hosting Provider oder den Administrator der Seite, falls Du Fragen zu diesen Einstellungen haben solltest."; +$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "Die Datenbank, die Du unten angibst, sollte bereits existieren. Ist dies noch nicht der Fall, erzeuge sie bitte bevor Du mit der Installation fortfährst."; +$a->strings["Database Server Name"] = "Datenbank-Server"; +$a->strings["Database Login Name"] = "Datenbank-Nutzer"; +$a->strings["Database Login Password"] = "Datenbank-Passwort"; +$a->strings["Database Name"] = "Datenbank-Name"; +$a->strings["Site administrator email address"] = "E-Mail-Adresse des Administrators"; +$a->strings["Your account email address must match this in order to use the web admin panel."] = "Die E-Mail-Adresse, die in Deinem Friendica-Account eingetragen ist, muss mit dieser Adresse übereinstimmen, damit Du das Admin-Panel benutzen kannst."; +$a->strings["Please select a default timezone for your website"] = "Bitte wähle die Standardzeitzone Deiner Webseite"; +$a->strings["Site settings"] = "Server-Einstellungen"; +$a->strings["System Language:"] = "Systemsprache:"; +$a->strings["Set the default language for your Friendica installation interface and to send emails."] = "Wähle die Standardsprache für deine Friendica-Installations-Oberfläche und den E-Mail-Versand"; +$a->strings["Could not find a command line version of PHP in the web server PATH."] = "Konnte keine Kommandozeilenversion von PHP im PATH des Servers finden."; +$a->strings["If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron. See 'Setup the poller'"] = "Wenn Du keine Kommandozeilen-Version von PHP auf Deinem Server installiert hast, kannst Du keine Hintergrundprozesse via cron starten. Siehe 'Setup the poller'"; +$a->strings["PHP executable path"] = "Pfad zu PHP"; +$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Gib den kompletten Pfad zur ausführbaren Datei von PHP an. Du kannst dieses Feld auch frei lassen und mit der Installation fortfahren."; +$a->strings["Command line PHP"] = "Kommandozeilen-PHP"; +$a->strings["PHP executable is not the php cli binary (could be cgi-fgci version)"] = "Die ausführbare Datei von PHP stimmt nicht mit der PHP cli Version überein (es könnte sich um die cgi-fgci Version handeln)"; +$a->strings["Found PHP version: "] = "Gefundene PHP Version:"; +$a->strings["PHP cli binary"] = "PHP CLI Binary"; +$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "Die Kommandozeilenversion von PHP auf Deinem System hat \"register_argc_argv\" nicht aktiviert."; +$a->strings["This is required for message delivery to work."] = "Dies wird für die Auslieferung von Nachrichten benötigt."; +$a->strings["PHP register_argc_argv"] = "PHP register_argc_argv"; +$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Fehler: Die Funktion \"openssl_pkey_new\" auf diesem System ist nicht in der Lage, Verschlüsselungsschlüssel zu erzeugen"; +$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Wenn der Server unter Windows läuft, schau Dir bitte \"http://www.php.net/manual/en/openssl.installation.php\" an."; +$a->strings["Generate encryption keys"] = "Schlüssel erzeugen"; +$a->strings["libCurl PHP module"] = "PHP: libCurl-Modul"; +$a->strings["GD graphics PHP module"] = "PHP: GD-Grafikmodul"; +$a->strings["OpenSSL PHP module"] = "PHP: OpenSSL-Modul"; +$a->strings["mysqli PHP module"] = "PHP: mysqli-Modul"; +$a->strings["mb_string PHP module"] = "PHP: mb_string-Modul"; +$a->strings["mcrypt PHP module"] = "PHP mcrypt Modul"; +$a->strings["XML PHP module"] = "XML PHP Modul"; +$a->strings["Apache mod_rewrite module"] = "Apache mod_rewrite module"; +$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Fehler: Das Apache-Modul mod-rewrite wird benötigt, es ist allerdings nicht installiert."; +$a->strings["Error: libCURL PHP module required but not installed."] = "Fehler: Das libCURL PHP Modul wird benötigt, ist aber nicht installiert."; +$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Fehler: Das GD-Graphikmodul für PHP mit JPEG-Unterstützung ist nicht installiert."; +$a->strings["Error: openssl PHP module required but not installed."] = "Fehler: Das openssl-Modul von PHP ist nicht installiert."; +$a->strings["Error: mysqli PHP module required but not installed."] = "Fehler: Das mysqli-Modul von PHP ist nicht installiert."; +$a->strings["Error: mb_string PHP module required but not installed."] = "Fehler: mb_string PHP Module wird benötigt ist aber nicht installiert."; +$a->strings["Error: mcrypt PHP module required but not installed."] = "Fehler: Das mcrypt Modul von PHP ist nicht installiert"; +$a->strings["If you are using php_cli, please make sure that mcrypt module is enabled in its config file"] = "Wenn du das Modul \"php_cli\" benutzt dann versichere dich, daß das mcrypt Modul in seiner Konfigurationsdatei aktiviert ist. "; +$a->strings["Function mcrypt_create_iv() is not defined. This is needed to enable RINO2 encryption layer."] = "Die Funktion mcrypt_create_iv() ist nicht festgelegt. Dies ist notwendig um den RINO2-Encryption-Layer zu aktivieren."; +$a->strings["mcrypt_create_iv() function"] = "mcrypt_create_iv() function"; +$a->strings["Error, XML PHP module required but not installed."] = "Fehler: XML PHP Modul erforderlich aber nicht installiert."; +$a->strings["The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so."] = "Der Installationswizard muss in der Lage sein, eine Datei im Stammverzeichnis Deines Webservers anzulegen, ist allerdings derzeit nicht in der Lage, dies zu tun."; +$a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "In den meisten Fällen ist dies ein Problem mit den Schreibrechten. Der Webserver könnte keine Schreiberlaubnis haben, selbst wenn Du sie hast."; +$a->strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Friendica top folder."] = "Nachdem Du alles ausgefüllt hast, erhältst Du einen Text, den Du in eine Datei namens .htconfig.php in Deinem Friendica-Wurzelverzeichnis kopieren musst."; +$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Alternativ kannst Du diesen Schritt aber auch überspringen und die Installation manuell durchführen. Eine Anleitung dazu (Englisch) findest Du in der Datei INSTALL.txt."; +$a->strings[".htconfig.php is writable"] = "Schreibrechte auf .htconfig.php"; +$a->strings["Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Friendica nutzt die Smarty3 Template Engine um die Webansichten zu rendern. Smarty3 kompiliert Templates zu PHP um das Rendern zu beschleunigen."; +$a->strings["In order to store these compiled templates, the web server needs to have write access to the directory view/smarty3/ under the Friendica top level folder."] = "Um diese kompilierten Templates zu speichern benötigt der Webserver Schreibrechte zum Verzeichnis view/smarty3/ im obersten Ordner von Friendica."; +$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Bitte stelle sicher, dass der Nutzer unter dem der Webserver läuft (z.B. www-data) Schreibrechte zu diesem Verzeichnis hat."; +$a->strings["Note: as a security measure, you should give the web server write access to view/smarty3/ only--not the template files (.tpl) that it contains."] = "Hinweis: aus Sicherheitsgründen solltest Du dem Webserver nur Schreibrechte für view/smarty3/ geben -- Nicht den Templatedateien (.tpl) die sie enthalten."; +$a->strings["view/smarty3 is writable"] = "view/smarty3 ist schreibbar"; +$a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "Umschreiben der URLs in der .htaccess funktioniert nicht. Überprüfe die Konfiguration des Servers."; +$a->strings["Url rewrite is working"] = "URL rewrite funktioniert"; +$a->strings["ImageMagick PHP extension is installed"] = "ImageMagick PHP Erweiterung ist installiert"; +$a->strings["ImageMagick supports GIF"] = "ImageMagick unterstützt GIF"; +$a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "Die Konfigurationsdatei \".htconfig.php\" konnte nicht angelegt werden. Bitte verwende den angefügten Text, um die Datei im Stammverzeichnis Deiner Friendica-Installation zu erzeugen."; +$a->strings["

What next

"] = "

Wie geht es weiter?

"; +$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "WICHTIG: Du musst [manuell] einen Cronjob (o.ä.) für den Poller einrichten."; +$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s folgt %2\$s %3\$s"; +$a->strings["Item not available."] = "Beitrag nicht verfügbar."; +$a->strings["Item was not found."] = "Beitrag konnte nicht gefunden werden."; +$a->strings["Submit Request"] = "Anfrage abschicken"; +$a->strings["You already added this contact."] = "Du hast den Kontakt bereits hinzugefügt."; +$a->strings["Diaspora support isn't enabled. Contact can't be added."] = "Diaspora Unterstützung ist nicht aktiviert. Der Kontakt kann nicht zugefügt werden."; +$a->strings["OStatus support is disabled. Contact can't be added."] = "OStatus Unterstützung ist nicht aktiviert. Der Kontakt kann nicht zugefügt werden."; +$a->strings["The network type couldn't be detected. Contact can't be added."] = "Der Netzwerktype wurde nicht erkannt. Der Kontakt kann nicht hinzugefügt werden."; +$a->strings["Please answer the following:"] = "Bitte beantworte folgendes:"; +$a->strings["Does %s know you?"] = "Kennt %s Dich?"; +$a->strings["No"] = "Nein"; +$a->strings["Add a personal note:"] = "Eine persönliche Notiz beifügen:"; +$a->strings["Your Identity Address:"] = "Adresse Deines Profils:"; +$a->strings["Profile URL"] = "Profil URL"; +$a->strings["Contact added"] = "Kontakt hinzugefügt"; +$a->strings["You must be logged in to use addons. "] = "Sie müssen angemeldet sein um Addons benutzen zu können."; +$a->strings["Applications"] = "Anwendungen"; +$a->strings["No installed applications."] = "Keine Applikationen installiert."; +$a->strings["Do you really want to delete this suggestion?"] = "Möchtest Du wirklich diese Empfehlung löschen?"; +$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Keine Vorschläge verfügbar. Falls der Server frisch aufgesetzt wurde, versuche es bitte in 24 Stunden noch einmal."; +$a->strings["Ignore/Hide"] = "Ignorieren/Verbergen"; +$a->strings["Not Extended"] = "Nicht erweitert."; +$a->strings["Item has been removed."] = "Eintrag wurde entfernt."; +$a->strings["No contacts in common."] = "Keine gemeinsamen Kontakte."; +$a->strings["Common Friends"] = "Gemeinsame Kontakte"; +$a->strings["Welcome to Friendica"] = "Willkommen bei Friendica"; +$a->strings["New Member Checklist"] = "Checkliste für neue Mitglieder"; +$a->strings["We would like to offer some tips and links to help make your experience enjoyable. Click any item to visit the relevant page. A link to this page will be visible from your home page for two weeks after your initial registration and then will quietly disappear."] = "Wir möchten Dir einige Tipps und Links anbieten, die Dir helfen könnten, den Einstieg angenehmer zu machen. Klicke auf ein Element, um die entsprechende Seite zu besuchen. Ein Link zu dieser Seite hier bleibt für Dich an Deiner Pinnwand für zwei Wochen nach dem Registrierungsdatum sichtbar und wird dann verschwinden."; +$a->strings["Getting Started"] = "Einstieg"; +$a->strings["Friendica Walk-Through"] = "Friendica Rundgang"; +$a->strings["On your Quick Start page - find a brief introduction to your profile and network tabs, make some new connections, and find some groups to join."] = "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."; +$a->strings["Go to Your Settings"] = "Gehe zu deinen Einstellungen"; +$a->strings["On your Settings page - change your initial password. Also make a note of your Identity Address. This looks just like an email address - and will be useful in making friends on the free social web."] = "Ändere bitte unter Einstellungen dein Passwort. Außerdem merke dir deine Identifikationsadresse. Diese sieht aus wie eine E-Mail-Adresse und wird benötigt, um Kontakte mit anderen im Friendica Netzwerk zu knüpfen.."; +$a->strings["Review the other settings, particularly the privacy settings. An unpublished directory listing is like having an unlisted phone number. In general, you should probably publish your listing - unless all of your friends and potential friends know exactly how to find you."] = "Überprüfe die restlichen Einstellungen, insbesondere die Einstellungen zur Privatsphäre. Wenn Du Dein Profil nicht veröffentlichst, ist das als wenn Du Deine Telefonnummer nicht ins Telefonbuch einträgst. Im Allgemeinen solltest Du es veröffentlichen - außer all Deine Kontakte und potentiellen Kontakte wissen genau, wie sie Dich finden können."; +$a->strings["Upload Profile Photo"] = "Profilbild hochladen"; +$a->strings["Upload a profile photo if you have not done so already. Studies have shown that people with real photos of themselves are ten times more likely to make friends than people who do not."] = "Lade ein Profilbild hoch, falls Du es noch nicht getan hast. Studien haben gezeigt, dass es zehnmal wahrscheinlicher ist neue Kontakte zu finden, wenn Du ein Bild von Dir selbst verwendest, als wenn Du dies nicht tust."; +$a->strings["Edit Your Profile"] = "Editiere dein Profil"; +$a->strings["Edit your default profile to your liking. Review the settings for hiding your list of friends and hiding the profile from unknown visitors."] = "Editiere Dein Standard Profil nach Deinen Vorlieben. Überprüfe die Einstellungen zum Verbergen Deiner Kontaktliste vor unbekannten Betrachtern des Profils."; +$a->strings["Profile Keywords"] = "Profil Schlüsselbegriffe"; +$a->strings["Set some public keywords for your default profile which describe your interests. We may be able to find other people with similar interests and suggest friendships."] = "Trage ein paar öffentliche Stichwörter in Dein Standardprofil ein, die Deine Interessen beschreiben. Eventuell sind wir in der Lage Leute zu finden, die Deine Interessen teilen und können Dir dann Kontakte vorschlagen."; +$a->strings["Connecting"] = "Verbindungen knüpfen"; +$a->strings["Importing Emails"] = "Emails Importieren"; +$a->strings["Enter your email access information on your Connector Settings page if you wish to import and interact with friends or mailing lists from your email INBOX"] = "Gib Deine E-Mail-Zugangsinformationen auf der Connector-Einstellungsseite ein, falls Du E-Mails aus Deinem Posteingang importieren und mit Kontakten und Mailinglisten interagieren willst."; +$a->strings["Go to Your Contacts Page"] = "Gehe zu deiner Kontakt-Seite"; +$a->strings["Your Contacts page is your gateway to managing friendships and connecting with friends on other networks. Typically you enter their address or site URL in the Add New Contact dialog."] = "Die Kontakte-Seite ist die Einstiegsseite, von der aus Du Kontakte verwalten und Dich mit Personen in anderen Netzwerken verbinden kannst. Normalerweise gibst Du dazu einfach ihre Adresse oder die URL der Seite im Kasten Neuen Kontakt hinzufügen ein."; +$a->strings["Go to Your Site's Directory"] = "Gehe zum Verzeichnis Deiner Friendica Instanz"; +$a->strings["The Directory page lets you find other people in this network or other federated sites. Look for a Connect or Follow link on their profile page. Provide your own Identity Address if requested."] = "Über die Verzeichnisseite kannst Du andere Personen auf diesem Server oder anderen verknüpften Seiten finden. Halte nach einem Verbinden oder Folgen Link auf deren Profilseiten Ausschau und gib Deine eigene Profiladresse an, falls Du danach gefragt wirst."; +$a->strings["Finding New People"] = "Neue Leute kennenlernen"; +$a->strings["On the side panel of the Contacts page are several tools to find new friends. We can match people by interest, look up people by name or interest, and provide suggestions based on network relationships. On a brand new site, friend suggestions will usually begin to be populated within 24 hours."] = "Im seitlichen Bedienfeld der Kontakteseite gibt es diverse Werkzeuge, um neue Personen zu finden. Wir können Menschen mit den gleichen Interessen finden, anhand von Namen oder Interessen suchen oder aber aufgrund vorhandener Kontakte neue Leute vorschlagen.\nAuf einer brandneuen - soeben erstellten - Seite starten die Kontaktvorschläge innerhalb von 24 Stunden."; +$a->strings["Group Your Contacts"] = "Gruppiere deine Kontakte"; +$a->strings["Once you have made some friends, organize them into private conversation groups from the sidebar of your Contacts page and then you can interact with each group privately on your Network page."] = "Sobald Du einige Kontakte gefunden hast, organisiere sie in Gruppen zur privaten Kommunikation im Seitenmenü der Kontakte-Seite. Du kannst dann mit jeder dieser Gruppen von der Netzwerkseite aus privat interagieren."; +$a->strings["Why Aren't My Posts Public?"] = "Warum sind meine Beiträge nicht öffentlich?"; +$a->strings["Friendica respects your privacy. By default, your posts will only show up to people you've added as friends. For more information, see the help section from the link above."] = "Friendica respektiert Deine Privatsphäre. Mit der Grundeinstellung werden Deine Beiträge ausschließlich Deinen Kontakten angezeigt. Für weitere Informationen diesbezüglich lies Dir bitte den entsprechenden Abschnitt in der Hilfe unter dem obigen Link durch."; +$a->strings["Getting Help"] = "Hilfe bekommen"; +$a->strings["Go to the Help Section"] = "Zum Hilfe Abschnitt gehen"; +$a->strings["Our help pages may be consulted for detail on other program features and resources."] = "Unsere Hilfe Seiten können herangezogen werden, um weitere Einzelheiten zu andern Programm Features zu erhalten."; +$a->strings["Remove My Account"] = "Konto löschen"; +$a->strings["This will completely remove your account. Once this has been done it is not recoverable."] = "Dein Konto wird endgültig gelöscht. Es gibt keine Möglichkeit, es wiederherzustellen."; +$a->strings["Please enter your password for verification:"] = "Bitte gib Dein Passwort zur Verifikation ein:"; +$a->strings["Item not found"] = "Beitrag nicht gefunden"; +$a->strings["Edit post"] = "Beitrag bearbeiten"; +$a->strings["Warning: This group contains %s member from an insecure network."] = array( + 0 => "Warnung: Diese Gruppe beinhaltet %s Person aus einem unsicheren Netzwerk.", + 1 => "Warnung: Diese Gruppe beinhaltet %s Personen aus unsicheren Netzwerken.", +); +$a->strings["Private messages to this group are at risk of public disclosure."] = "Private Nachrichten an diese Gruppe könnten an die Öffentlichkeit geraten."; +$a->strings["No such group"] = "Es gibt keine solche Gruppe"; +$a->strings["Group is empty"] = "Gruppe ist leer"; +$a->strings["Group: %s"] = "Gruppe: %s"; +$a->strings["Private messages to this person are at risk of public disclosure."] = "Private Nachrichten an diese Person könnten an die Öffentlichkeit gelangen."; +$a->strings["Invalid contact."] = "Ungültiger Kontakt."; +$a->strings["Commented Order"] = "Neueste Kommentare"; +$a->strings["Sort by Comment Date"] = "Nach Kommentardatum sortieren"; +$a->strings["Posted Order"] = "Neueste Beiträge"; +$a->strings["Sort by Post Date"] = "Nach Beitragsdatum sortieren"; +$a->strings["Personal"] = "Persönlich"; +$a->strings["Posts that mention or involve you"] = "Beiträge, in denen es um Dich geht"; +$a->strings["New"] = "Neue"; +$a->strings["Activity Stream - by date"] = "Aktivitäten-Stream - nach Datum"; +$a->strings["Shared Links"] = "Geteilte Links"; +$a->strings["Interesting Links"] = "Interessante Links"; +$a->strings["Starred"] = "Markierte"; +$a->strings["Favourite Posts"] = "Favorisierte Beiträge"; +$a->strings["Not available."] = "Nicht verfügbar."; +$a->strings["Time Conversion"] = "Zeitumrechnung"; +$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica bietet diese Funktion an, um das Teilen von Events mit Kontakten zu vereinfachen, deren Zeitzone nicht ermittelt werden kann."; +$a->strings["UTC time: %s"] = "UTC Zeit: %s"; +$a->strings["Current timezone: %s"] = "Aktuelle Zeitzone: %s"; +$a->strings["Converted localtime: %s"] = "Umgerechnete lokale Zeit: %s"; +$a->strings["Please select your timezone:"] = "Bitte wähle Deine Zeitzone:"; +$a->strings["The post was created"] = "Der Beitrag wurde angelegt"; +$a->strings["Group created."] = "Gruppe erstellt."; +$a->strings["Could not create group."] = "Konnte die Gruppe nicht erstellen."; +$a->strings["Group not found."] = "Gruppe nicht gefunden."; +$a->strings["Group name changed."] = "Gruppenname geändert."; +$a->strings["Save Group"] = "Gruppe speichern"; +$a->strings["Create a group of contacts/friends."] = "Eine Kontaktgruppe anlegen."; +$a->strings["Group removed."] = "Gruppe entfernt."; +$a->strings["Unable to remove group."] = "Konnte die Gruppe nicht entfernen."; +$a->strings["Group Editor"] = "Gruppeneditor"; +$a->strings["Members"] = "Mitglieder"; +$a->strings["All Contacts"] = "Alle Kontakte"; +$a->strings["Number of daily wall messages for %s exceeded. Message failed."] = "Maximale Anzahl der täglichen Pinnwand Nachrichten für %s ist überschritten. Zustellung fehlgeschlagen."; +$a->strings["No recipient selected."] = "Kein Empfänger gewählt."; +$a->strings["Unable to check your home location."] = "Konnte Deinen Heimatort nicht bestimmen."; +$a->strings["Message could not be sent."] = "Nachricht konnte nicht gesendet werden."; +$a->strings["Message collection failure."] = "Konnte Nachrichten nicht abrufen."; +$a->strings["Message sent."] = "Nachricht gesendet."; +$a->strings["No recipient."] = "Kein Empfänger."; +$a->strings["Send Private Message"] = "Private Nachricht senden"; +$a->strings["If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders."] = "Wenn Du möchtest, dass %s Dir antworten kann, überprüfe Deine Privatsphären-Einstellungen und erlaube private Nachrichten von unbekannten Absendern."; +$a->strings["To:"] = "An:"; +$a->strings["Subject:"] = "Betreff:"; +$a->strings["link"] = "Link"; +$a->strings["Authorize application connection"] = "Verbindung der Applikation autorisieren"; +$a->strings["Return to your app and insert this Securty Code:"] = "Gehe zu Deiner Anwendung zurück und trage dort folgenden Sicherheitscode ein:"; +$a->strings["Please login to continue."] = "Bitte melde Dich an um fortzufahren."; +$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Möchtest Du dieser Anwendung den Zugriff auf Deine Beiträge und Kontakte, sowie das Erstellen neuer Beiträge in Deinem Namen gestatten?"; +$a->strings["Source (bbcode) text:"] = "Quelle (bbcode) Text:"; +$a->strings["Source (Diaspora) text to convert to BBcode:"] = "Eingabe (Diaspora) nach BBCode zu konvertierender Text:"; +$a->strings["Source input: "] = "Originaltext:"; +$a->strings["bb2html (raw HTML): "] = "bb2html (reines HTML): "; +$a->strings["bb2html: "] = "bb2html: "; +$a->strings["bb2html2bb: "] = "bb2html2bb: "; +$a->strings["bb2md: "] = "bb2md: "; +$a->strings["bb2md2html: "] = "bb2md2html: "; +$a->strings["bb2dia2bb: "] = "bb2dia2bb: "; +$a->strings["bb2md2html2bb: "] = "bb2md2html2bb: "; +$a->strings["Source input (Diaspora format): "] = "Originaltext (Diaspora Format): "; +$a->strings["diaspora2bb: "] = "diaspora2bb: "; +$a->strings["Subscribing to OStatus contacts"] = "OStatus Kontakten folgen"; +$a->strings["No contact provided."] = "Keine Kontakte gefunden."; +$a->strings["Couldn't fetch information for contact."] = "Konnte die Kontaktinformationen nicht einholen."; +$a->strings["Couldn't fetch friends for contact."] = "Konnte die Kontaktliste des Kontakts nicht abfragen."; +$a->strings["success"] = "Erfolg"; +$a->strings["failed"] = "Fehlgeschlagen"; +$a->strings["ignored"] = "Ignoriert"; +$a->strings["%1\$s welcomes %2\$s"] = "%1\$s heißt %2\$s herzlich willkommen"; +$a->strings["Tips for New Members"] = "Tipps für neue Nutzer"; +$a->strings["Unable to locate contact information."] = "Konnte die Kontaktinformationen nicht finden."; +$a->strings["Do you really want to delete this message?"] = "Möchtest Du wirklich diese Nachricht löschen?"; +$a->strings["Message deleted."] = "Nachricht gelöscht."; +$a->strings["Conversation removed."] = "Unterhaltung gelöscht."; +$a->strings["No messages."] = "Keine Nachrichten."; +$a->strings["Message not available."] = "Nachricht nicht verfügbar."; +$a->strings["Delete message"] = "Nachricht löschen"; +$a->strings["Delete conversation"] = "Unterhaltung löschen"; +$a->strings["No secure communications available. You may be able to respond from the sender's profile page."] = "Sichere Kommunikation ist nicht verfügbar. Eventuell kannst Du auf der Profilseite des Absenders antworten."; +$a->strings["Send Reply"] = "Antwort senden"; +$a->strings["Unknown sender - %s"] = "'Unbekannter Absender - %s"; +$a->strings["You and %s"] = "Du und %s"; +$a->strings["%s and You"] = "%s und Du"; +$a->strings["D, d M Y - g:i A"] = "D, d. M Y - g:i A"; +$a->strings["%d message"] = array( + 0 => "%d Nachricht", + 1 => "%d Nachrichten", +); +$a->strings["Manage Identities and/or Pages"] = "Verwalte Identitäten und/oder Seiten"; +$a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "Zwischen verschiedenen Identitäten oder Gemeinschafts-/Gruppenseiten wechseln, die Deine Kontoinformationen teilen oder zu denen Du „Verwalten“-Befugnisse bekommen hast."; +$a->strings["Select an identity to manage: "] = "Wähle eine Identität zum Verwalten aus: "; +$a->strings["Contact settings applied."] = "Einstellungen zum Kontakt angewandt."; +$a->strings["Contact update failed."] = "Konnte den Kontakt nicht aktualisieren."; +$a->strings["Contact not found."] = "Kontakt nicht gefunden."; +$a->strings["WARNING: This is highly advanced and if you enter incorrect information your communications with this contact may stop working."] = "ACHTUNG: Das sind Experten-Einstellungen! Wenn Du etwas Falsches eingibst, funktioniert die Kommunikation mit diesem Kontakt evtl. nicht mehr."; +$a->strings["Please use your browser 'Back' button now if you are uncertain what to do on this page."] = "Bitte nutze den Zurück-Button Deines Browsers jetzt, wenn Du Dir unsicher bist, was Du tun willst."; +$a->strings["No mirroring"] = "Kein Spiegeln"; +$a->strings["Mirror as forwarded posting"] = "Spiegeln als weitergeleitete Beiträge"; +$a->strings["Mirror as my own posting"] = "Spiegeln als meine eigenen Beiträge"; +$a->strings["Return to contact editor"] = "Zurück zum Kontakteditor"; +$a->strings["Refetch contact data"] = "Kontaktdaten neu laden"; +$a->strings["Remote Self"] = "Entfernte Konten"; +$a->strings["Mirror postings from this contact"] = "Spiegle Beiträge dieses Kontakts"; +$a->strings["Mark this contact as remote_self, this will cause friendica to repost new entries from this contact."] = "Markiere diesen Kontakt als remote_self (entferntes Konto), dies veranlasst Friendica alle Top-Level Beiträge dieses Kontakts an all Deine Kontakte zu senden."; +$a->strings["Name"] = "Name"; +$a->strings["Account Nickname"] = "Konto-Spitzname"; +$a->strings["@Tagname - overrides Name/Nickname"] = "@Tagname - überschreibt Name/Spitzname"; +$a->strings["Account URL"] = "Konto-URL"; +$a->strings["Friend Request URL"] = "URL für Kontaktschaftsanfragen"; +$a->strings["Friend Confirm URL"] = "URL für Bestätigungen von Kontaktanfragen"; +$a->strings["Notification Endpoint URL"] = "URL-Endpunkt für Benachrichtigungen"; +$a->strings["Poll/Feed URL"] = "Pull/Feed-URL"; +$a->strings["New photo from this URL"] = "Neues Foto von dieser URL"; +$a->strings["This introduction has already been accepted."] = "Diese Kontaktanfrage wurde bereits akzeptiert."; +$a->strings["Profile location is not valid or does not contain profile information."] = "Profiladresse ist ungültig oder stellt keine Profildaten zur Verfügung."; +$a->strings["Warning: profile location has no identifiable owner name."] = "Warnung: Es konnte kein Name des Besitzers von der angegebenen Profiladresse gefunden werden."; +$a->strings["Warning: profile location has no profile photo."] = "Warnung: Es gibt kein Profilbild bei der angegebenen Profiladresse."; +$a->strings["%d required parameter was not found at the given location"] = array( + 0 => "%d benötigter Parameter wurde an der angegebenen Stelle nicht gefunden", + 1 => "%d benötigte Parameter wurden an der angegebenen Stelle nicht gefunden", +); +$a->strings["Introduction complete."] = "Kontaktanfrage abgeschlossen."; +$a->strings["Unrecoverable protocol error."] = "Nicht behebbarer Protokollfehler."; +$a->strings["Profile unavailable."] = "Profil nicht verfügbar."; +$a->strings["%s has received too many connection requests today."] = "%s hat heute zu viele Kontaktanfragen erhalten."; +$a->strings["Spam protection measures have been invoked."] = "Maßnahmen zum Spamschutz wurden ergriffen."; +$a->strings["Friends are advised to please try again in 24 hours."] = "Freunde sind angehalten, es in 24 Stunden erneut zu versuchen."; +$a->strings["Invalid locator"] = "Ungültiger Locator"; +$a->strings["Invalid email address."] = "Ungültige E-Mail-Adresse."; +$a->strings["This account has not been configured for email. Request failed."] = "Dieses Konto ist nicht für E-Mail konfiguriert. Anfrage fehlgeschlagen."; +$a->strings["You have already introduced yourself here."] = "Du hast Dich hier bereits vorgestellt."; +$a->strings["Apparently you are already friends with %s."] = "Es scheint so, als ob Du bereits mit %s in Kontakt stehst."; +$a->strings["Invalid profile URL."] = "Ungültige Profil-URL."; +$a->strings["Failed to update contact record."] = "Aktualisierung der Kontaktdaten fehlgeschlagen."; +$a->strings["Your introduction has been sent."] = "Deine Kontaktanfrage wurde gesendet."; +$a->strings["Remote subscription can't be done for your network. Please subscribe directly on your system."] = "Entferntes abon­nie­ren kann für dein Netzwerk nicht durchgeführt werden. Bitte nutze direkt die Abonnieren-Funktion deines Systems. "; +$a->strings["Please login to confirm introduction."] = "Bitte melde Dich an, um die Kontaktanfrage zu bestätigen."; +$a->strings["Incorrect identity currently logged in. Please login to this profile."] = "Momentan bist Du mit einer anderen Identität angemeldet. Bitte melde Dich mit diesem Profil an."; +$a->strings["Confirm"] = "Bestätigen"; +$a->strings["Hide this contact"] = "Verberge diesen Kontakt"; +$a->strings["Welcome home %s."] = "Willkommen zurück %s."; +$a->strings["Please confirm your introduction/connection request to %s."] = "Bitte bestätige Deine Kontaktanfrage bei %s."; +$a->strings["Please enter your 'Identity Address' from one of the following supported communications networks:"] = "Bitte gib die Adresse Deines Profils in einem der unterstützten sozialen Netzwerke an:"; +$a->strings["If you are not yet a member of the free social web, follow this link to find a public Friendica site and join us today."] = "Wenn du noch kein Mitglied dieses freien sozialen Netzwerks bist, folge diesem Link um einen öffentlichen Friendica-Server zu finden und beizutreten."; +$a->strings["Friend/Connection Request"] = "Kontaktanfrage"; +$a->strings["Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"] = "Beispiele: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"; +$a->strings["StatusNet/Federated Social Web"] = "StatusNet/Federated Social Web"; +$a->strings[" - please do not use this form. Instead, enter %s into your Diaspora search bar."] = " - bitte verwende dieses Formular nicht. Stattdessen suche nach %s in Deiner Diaspora Suchleiste."; +$a->strings["This entry was edited"] = "Dieser Beitrag wurde bearbeitet."; +$a->strings["%d comment"] = array( + 0 => "%d Kommentar", + 1 => "%d Kommentare", +); +$a->strings["Private Message"] = "Private Nachricht"; +$a->strings["I like this (toggle)"] = "Ich mag das (toggle)"; +$a->strings["like"] = "mag ich"; +$a->strings["I don't like this (toggle)"] = "Ich mag das nicht (toggle)"; +$a->strings["dislike"] = "mag ich nicht"; +$a->strings["Share this"] = "Weitersagen"; +$a->strings["share"] = "Teilen"; +$a->strings["This is you"] = "Das bist Du"; +$a->strings["Comment"] = "Kommentar"; +$a->strings["Bold"] = "Fett"; +$a->strings["Italic"] = "Kursiv"; +$a->strings["Underline"] = "Unterstrichen"; +$a->strings["Quote"] = "Zitat"; +$a->strings["Code"] = "Code"; +$a->strings["Image"] = "Bild"; +$a->strings["Link"] = "Link"; +$a->strings["Video"] = "Video"; +$a->strings["Edit"] = "Bearbeiten"; +$a->strings["add star"] = "markieren"; +$a->strings["remove star"] = "Markierung entfernen"; +$a->strings["toggle star status"] = "Markierung umschalten"; +$a->strings["starred"] = "markiert"; +$a->strings["add tag"] = "Tag hinzufügen"; +$a->strings["ignore thread"] = "Thread ignorieren"; +$a->strings["unignore thread"] = "Thread nicht mehr ignorieren"; +$a->strings["toggle ignore status"] = "Ignoriert-Status ein-/ausschalten"; +$a->strings["save to folder"] = "In Ordner speichern"; +$a->strings["I will attend"] = "Ich werde teilnehmen"; +$a->strings["I will not attend"] = "Ich werde nicht teilnehmen"; +$a->strings["I might attend"] = "Ich werde eventuell teilnehmen"; +$a->strings["to"] = "zu"; +$a->strings["Wall-to-Wall"] = "Wall-to-Wall"; +$a->strings["via Wall-To-Wall:"] = "via Wall-To-Wall:"; +$a->strings["Invalid request identifier."] = "Invalid request identifier."; +$a->strings["Discard"] = "Verwerfen"; +$a->strings["Ignore"] = "Ignorieren"; +$a->strings["Show Ignored Requests"] = "Zeige ignorierte Anfragen"; +$a->strings["Hide Ignored Requests"] = "Verberge ignorierte Anfragen"; +$a->strings["Notification type: "] = "Benachrichtigungstyp: "; +$a->strings["Friend Suggestion"] = "Kontaktvorschlag"; +$a->strings["suggested by %s"] = "vorgeschlagen von %s"; +$a->strings["Hide this contact from others"] = "Verbirg diesen Kontakt vor andere"; +$a->strings["Post a new friend activity"] = "Neue-Kontakt Nachricht senden"; +$a->strings["if applicable"] = "falls anwendbar"; +$a->strings["Approve"] = "Genehmigen"; +$a->strings["Claims to be known to you: "] = "Behauptet Dich zu kennen: "; +$a->strings["yes"] = "ja"; +$a->strings["no"] = "nein"; +$a->strings["Shall your connection be bidirectional or not? \"Friend\" implies that you allow to read and you subscribe to their posts. \"Fan/Admirer\" means that you allow to read but you do not want to read theirs. Approve as: "] = "Soll Deine Beziehung beidseitig sein oder nicht? \"Kontakt\" bedeutet, ihr könnt gegenseitig die Beiträge des Anderen lesen dürft. \"Fan/Verehrer\", dass du das lesen deiner Beiträge erlaubst aber nicht die Beiträge der anderen Seite lesen möchtest. Genehmigen als:"; +$a->strings["Shall your connection be bidirectional or not? \"Friend\" implies that you allow to read and you subscribe to their posts. \"Sharer\" means that you allow to read but you do not want to read theirs. Approve as: "] = "Soll Deine Beziehung beidseitig sein oder nicht? \"Freund\" bedeutet, ihr gegenseitig die Beiträge des Anderen lesen dürft. \"Teilenden\", das du das lesen deiner Beiträge erlaubst aber nicht die Beiträge der anderen Seite lesen möchtest. Genehmigen als:"; +$a->strings["Friend"] = "Kontakt"; +$a->strings["Sharer"] = "Teilenden"; +$a->strings["Fan/Admirer"] = "Fan/Verehrer"; +$a->strings["Friend/Connect Request"] = "Kontakt-/Freundschaftsanfrage"; +$a->strings["New Follower"] = "Neuer Bewunderer"; +$a->strings["No introductions."] = "Keine Kontaktanfragen."; +$a->strings["Network Notifications"] = "Netzwerk Benachrichtigungen"; +$a->strings["%s liked %s's post"] = "%s mag %ss Beitrag"; +$a->strings["%s disliked %s's post"] = "%s mag %ss Beitrag nicht"; +$a->strings["%s is now friends with %s"] = "%s ist jetzt mit %s befreundet"; +$a->strings["%s created a new post"] = "%s hat einen neuen Beitrag erstellt"; +$a->strings["%s commented on %s's post"] = "%s hat %ss Beitrag kommentiert"; +$a->strings["No more network notifications."] = "Keine weiteren Netzwerk-Benachrichtigungen."; +$a->strings["Personal Notifications"] = "Persönliche Benachrichtigungen"; +$a->strings["No more personal notifications."] = "Keine weiteren persönlichen Benachrichtigungen"; +$a->strings["Home Notifications"] = "Pinnwand Benachrichtigungen"; +$a->strings["No more home notifications."] = "Keine weiteren Pinnwand-Benachrichtigungen"; +$a->strings["System"] = "System"; $a->strings["Theme settings updated."] = "Themeneinstellungen aktualisiert."; $a->strings["Site"] = "Seite"; $a->strings["Users"] = "Nutzer"; @@ -1062,6 +1427,8 @@ $a->strings["Maximum number of parallel workers"] = "Maximale Anzahl parallel la $a->strings["On shared hosters set this to 2. On larger systems, values of 10 are great. Default value is 4."] = "Wenn dein Knoten bei einem Shared Hoster ist, setzte diesen Wert auf 2. Auf größeren Systemen funktioniert ein Wert von 10 recht gut. Standardeinstellung sind 4."; $a->strings["Don't use 'proc_open' with the worker"] = "'proc_open' nicht mit den Workern verwenden"; $a->strings["Enable this if your system doesn't allow the use of 'proc_open'. This can happen on shared hosters. If this is enabled you should increase the frequency of poller calls in your crontab."] = "Aktiviere diese Option, wenn dein System die Verwendung von 'proc_open' verhindert. Dies könnte auf Shared Hostern der Fall sein. Wenn du diese Option aktivierst, solltest du die Frequenz der poller Aufrufe in deiner crontab erhöhen."; +$a->strings["Enable fastlane"] = "Aktiviere Fastlane"; +$a->strings["When enabed, the fastlane mechanism starts an additional worker if processes with higher priority are blocked by processes of lower priority."] = "Wenn aktiviert, wird der Fastlane-Mechanismus einen weiteren Worker-Prozeß starten wenn Prozesse mit höherer Priorität von Prozessen mit niedrigerer Priorität blockiert werden."; $a->strings["Update has been marked successful"] = "Update wurde als erfolgreich markiert"; $a->strings["Database structure update %s was successfully applied."] = "Das Update %s der Struktur der Datenbank wurde erfolgreich angewandt."; $a->strings["Executing of database structure update %s failed with error: %s"] = "Das Update %s der Struktur der Datenbank schlug mit folgender Fehlermeldung fehl: %s"; @@ -1088,7 +1455,6 @@ $a->strings["%s user deleted"] = array( $a->strings["User '%s' deleted"] = "Nutzer '%s' gelöscht"; $a->strings["User '%s' unblocked"] = "Nutzer '%s' entsperrt"; $a->strings["User '%s' blocked"] = "Nutzer '%s' gesperrt"; -$a->strings["Name"] = "Name"; $a->strings["Register date"] = "Anmeldedatum"; $a->strings["Last login"] = "Letzte Anmeldung"; $a->strings["Last item"] = "Letzter Beitrag"; @@ -1099,7 +1465,6 @@ $a->strings["User registrations waiting for confirm"] = "Neuanmeldungen, die auf $a->strings["User waiting for permanent deletion"] = "Nutzer wartet auf permanente Löschung"; $a->strings["Request date"] = "Anfragedatum"; $a->strings["No registrations."] = "Keine Neuanmeldungen."; -$a->strings["Approve"] = "Genehmigen"; $a->strings["Deny"] = "Verwehren"; $a->strings["Block"] = "Sperren"; $a->strings["Unblock"] = "Entsperren"; @@ -1140,219 +1505,181 @@ $a->strings["Off"] = "Aus"; $a->strings["On"] = "An"; $a->strings["Lock feature %s"] = "Feature festlegen: %s"; $a->strings["Manage Additional Features"] = "Zusätzliche Features Verwalten"; -$a->strings["Sorry, maybe your upload is bigger than the PHP configuration allows"] = "Entschuldige, die Datei scheint größer zu sein als es die PHP Konfiguration erlaubt."; -$a->strings["Or - did you try to upload an empty file?"] = "Oder - hast Du versucht, eine leere Datei hochzuladen?"; -$a->strings["File exceeds size limit of %s"] = "Die Datei ist größer als das erlaubte Limit von %s"; -$a->strings["File upload failed."] = "Hochladen der Datei fehlgeschlagen."; -$a->strings["No friends to display."] = "Keine Kontakte zum Anzeigen."; -$a->strings["Access to this profile has been restricted."] = "Der Zugriff zu diesem Profil wurde eingeschränkt."; -$a->strings["User not found"] = "Nutzer nicht gefunden"; -$a->strings["This calendar format is not supported"] = "Dieses Kalenderformat wird nicht unterstützt."; -$a->strings["No exportable data found"] = "Keine exportierbaren Daten gefunden"; -$a->strings["calendar"] = "Kalender"; -$a->strings["Resubscribing to OStatus contacts"] = "Erneuern der OStatus Abonements"; -$a->strings["Error"] = "Fehler"; -$a->strings["Done"] = "Erledigt"; -$a->strings["Keep this window open until done."] = "Lasse dieses Fenster offen, bis der Vorgang abgeschlossen ist."; -$a->strings["No potential page delegates located."] = "Keine potentiellen Bevollmächtigten für die Seite gefunden."; -$a->strings["Delegates are able to manage all aspects of this account/page except for basic account settings. Please do not delegate your personal account to anybody that you do not trust completely."] = "Bevollmächtigte sind in der Lage, alle Aspekte dieses Kontos/dieser Seite zu verwalten, abgesehen von den Grundeinstellungen des Kontos. Bitte gib niemandem eine Bevollmächtigung für Deinen privaten Account, dem Du nicht absolut vertraust!"; -$a->strings["Existing Page Managers"] = "Vorhandene Seitenmanager"; -$a->strings["Existing Page Delegates"] = "Vorhandene Bevollmächtigte für die Seite"; -$a->strings["Potential Delegates"] = "Potentielle Bevollmächtigte"; -$a->strings["Add"] = "Hinzufügen"; -$a->strings["No entries."] = "Keine Einträge."; -$a->strings["Do you really want to delete this video?"] = "Möchtest Du dieses Video wirklich löschen?"; -$a->strings["Delete Video"] = "Video Löschen"; -$a->strings["No videos selected"] = "Keine Videos ausgewählt"; +$a->strings["%d contact edited."] = array( + 0 => "%d Kontakt bearbeitet.", + 1 => "%d Kontakte bearbeitet.", +); +$a->strings["Could not access contact record."] = "Konnte nicht auf die Kontaktdaten zugreifen."; +$a->strings["Could not locate selected profile."] = "Konnte das ausgewählte Profil nicht finden."; +$a->strings["Contact updated."] = "Kontakt aktualisiert."; +$a->strings["Contact has been blocked"] = "Kontakt wurde blockiert"; +$a->strings["Contact has been unblocked"] = "Kontakt wurde wieder freigegeben"; +$a->strings["Contact has been ignored"] = "Kontakt wurde ignoriert"; +$a->strings["Contact has been unignored"] = "Kontakt wird nicht mehr ignoriert"; +$a->strings["Contact has been archived"] = "Kontakt wurde archiviert"; +$a->strings["Contact has been unarchived"] = "Kontakt wurde aus dem Archiv geholt"; +$a->strings["Drop contact"] = "Kontakt löschen"; +$a->strings["Do you really want to delete this contact?"] = "Möchtest Du wirklich diesen Kontakt löschen?"; +$a->strings["Contact has been removed."] = "Kontakt wurde entfernt."; +$a->strings["You are mutual friends with %s"] = "Du hast mit %s eine beidseitige Freundschaft"; +$a->strings["You are sharing with %s"] = "Du teilst mit %s"; +$a->strings["%s is sharing with you"] = "%s teilt mit Dir"; +$a->strings["Private communications are not available for this contact."] = "Private Kommunikation ist für diesen Kontakt nicht verfügbar."; +$a->strings["(Update was successful)"] = "(Aktualisierung war erfolgreich)"; +$a->strings["(Update was not successful)"] = "(Aktualisierung war nicht erfolgreich)"; +$a->strings["Suggest friends"] = "Kontakte vorschlagen"; +$a->strings["Network type: %s"] = "Netzwerktyp: %s"; +$a->strings["Communications lost with this contact!"] = "Verbindungen mit diesem Kontakt verloren!"; +$a->strings["Fetch further information for feeds"] = "Weitere Informationen zu Feeds holen"; +$a->strings["Fetch information"] = "Beziehe Information"; +$a->strings["Fetch information and keywords"] = "Beziehe Information und Schlüsselworte"; +$a->strings["Contact"] = "Kontakt: "; +$a->strings["Profile Visibility"] = "Profil-Sichtbarkeit"; +$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Bitte wähle eines Deiner Profile das angezeigt werden soll, wenn %s Dein Profil aufruft."; +$a->strings["Contact Information / Notes"] = "Kontakt Informationen / Notizen"; +$a->strings["Edit contact notes"] = "Notizen zum Kontakt bearbeiten"; +$a->strings["Block/Unblock contact"] = "Kontakt blockieren/freischalten"; +$a->strings["Ignore contact"] = "Ignoriere den Kontakt"; +$a->strings["Repair URL settings"] = "URL Einstellungen reparieren"; +$a->strings["View conversations"] = "Unterhaltungen anzeigen"; +$a->strings["Last update:"] = "Letzte Aktualisierung: "; +$a->strings["Update public posts"] = "Öffentliche Beiträge aktualisieren"; +$a->strings["Update now"] = "Jetzt aktualisieren"; +$a->strings["Unignore"] = "Ignorieren aufheben"; +$a->strings["Currently blocked"] = "Derzeit geblockt"; +$a->strings["Currently ignored"] = "Derzeit ignoriert"; +$a->strings["Currently archived"] = "Momentan archiviert"; +$a->strings["Replies/likes to your public posts may still be visible"] = "Antworten/Likes auf deine öffentlichen Beiträge könnten weiterhin sichtbar sein"; +$a->strings["Notification for new posts"] = "Benachrichtigung bei neuen Beiträgen"; +$a->strings["Send a notification of every new post of this contact"] = "Sende eine Benachrichtigung, wann immer dieser Kontakt einen neuen Beitrag schreibt."; +$a->strings["Blacklisted keywords"] = "Blacklistete Schlüsselworte "; +$a->strings["Comma separated list of keywords that should not be converted to hashtags, when \"Fetch information and keywords\" is selected"] = "Komma-Separierte Liste mit Schlüsselworten, die nicht in Hashtags konvertiert werden, wenn \"Beziehe Information und Schlüsselworte\" aktiviert wurde"; +$a->strings["Actions"] = "Aktionen"; +$a->strings["Contact Settings"] = "Kontakteinstellungen"; +$a->strings["Suggestions"] = "Kontaktvorschläge"; +$a->strings["Suggest potential friends"] = "Kontakte vorschlagen"; +$a->strings["Show all contacts"] = "Alle Kontakte anzeigen"; +$a->strings["Unblocked"] = "Ungeblockt"; +$a->strings["Only show unblocked contacts"] = "Nur nicht-blockierte Kontakte anzeigen"; +$a->strings["Blocked"] = "Geblockt"; +$a->strings["Only show blocked contacts"] = "Nur blockierte Kontakte anzeigen"; +$a->strings["Ignored"] = "Ignoriert"; +$a->strings["Only show ignored contacts"] = "Nur ignorierte Kontakte anzeigen"; +$a->strings["Archived"] = "Archiviert"; +$a->strings["Only show archived contacts"] = "Nur archivierte Kontakte anzeigen"; +$a->strings["Hidden"] = "Verborgen"; +$a->strings["Only show hidden contacts"] = "Nur verborgene Kontakte anzeigen"; +$a->strings["Search your contacts"] = "Suche in deinen Kontakten"; +$a->strings["Update"] = "Aktualisierungen"; +$a->strings["Archive"] = "Archivieren"; +$a->strings["Unarchive"] = "Aus Archiv zurückholen"; +$a->strings["Batch Actions"] = "Stapelverarbeitung"; +$a->strings["View all contacts"] = "Alle Kontakte anzeigen"; +$a->strings["View all common friends"] = "Alle Kontakte anzeigen"; +$a->strings["Advanced Contact Settings"] = "Fortgeschrittene Kontakteinstellungen"; +$a->strings["Mutual Friendship"] = "Beidseitige Freundschaft"; +$a->strings["is a fan of yours"] = "ist ein Fan von dir"; +$a->strings["you are a fan of"] = "Du bist Fan von"; +$a->strings["Toggle Blocked status"] = "Geblockt-Status ein-/ausschalten"; +$a->strings["Toggle Ignored status"] = "Ignoriert-Status ein-/ausschalten"; +$a->strings["Toggle Archive status"] = "Archiviert-Status ein-/ausschalten"; +$a->strings["Delete contact"] = "Lösche den Kontakt"; +$a->strings["Profile not found."] = "Profil nicht gefunden."; +$a->strings["This may occasionally happen if contact was requested by both persons and it has already been approved."] = "Das kann passieren, wenn sich zwei Kontakte gegenseitig eingeladen haben und bereits einer angenommen wurde."; +$a->strings["Response from remote site was not understood."] = "Antwort der Gegenstelle unverständlich."; +$a->strings["Unexpected response from remote site: "] = "Unerwartete Antwort der Gegenstelle: "; +$a->strings["Confirmation completed successfully."] = "Bestätigung erfolgreich abgeschlossen."; +$a->strings["Remote site reported: "] = "Gegenstelle meldet: "; +$a->strings["Temporary failure. Please wait and try again."] = "Zeitweiser Fehler. Bitte warte einige Momente und versuche es dann noch einmal."; +$a->strings["Introduction failed or was revoked."] = "Kontaktanfrage schlug fehl oder wurde zurückgezogen."; +$a->strings["Unable to set contact photo."] = "Konnte das Bild des Kontakts nicht speichern."; +$a->strings["No user record found for '%s' "] = "Für '%s' wurde kein Nutzer gefunden"; +$a->strings["Our site encryption key is apparently messed up."] = "Der Verschlüsselungsschlüssel unserer Seite ist anscheinend nicht in Ordnung."; +$a->strings["Empty site URL was provided or URL could not be decrypted by us."] = "Leere URL für die Seite erhalten oder die URL konnte nicht entschlüsselt werden."; +$a->strings["Contact record was not found for you on our site."] = "Für diesen Kontakt wurde auf unserer Seite kein Eintrag gefunden."; +$a->strings["Site public key not available in contact record for URL %s."] = "Die Kontaktdaten für URL %s enthalten keinen Public Key für den Server."; +$a->strings["The ID provided by your system is a duplicate on our system. It should work if you try again."] = "Die ID, die uns Dein System angeboten hat, ist hier bereits vergeben. Bitte versuche es noch einmal."; +$a->strings["Unable to set your contact credentials on our system."] = "Deine Kontaktreferenzen konnten nicht in unserem System gespeichert werden."; +$a->strings["Unable to update your contact profile details on our system"] = "Die Updates für Dein Profil konnten nicht gespeichert werden"; +$a->strings["%1\$s has joined %2\$s"] = "%1\$s ist %2\$s beigetreten"; +$a->strings["People Search - %s"] = "Personensuche - %s"; +$a->strings["Forum Search - %s"] = "Forensuche - %s"; +$a->strings["Event can not end before it has started."] = "Die Veranstaltung kann nicht enden bevor sie beginnt."; +$a->strings["Event title and start time are required."] = "Der Veranstaltungstitel und die Anfangszeit müssen angegeben werden."; +$a->strings["Create New Event"] = "Neue Veranstaltung erstellen"; +$a->strings["Event details"] = "Veranstaltungsdetails"; +$a->strings["Starting date and Title are required."] = "Anfangszeitpunkt und Titel werden benötigt"; +$a->strings["Event Starts:"] = "Veranstaltungsbeginn:"; +$a->strings["Required"] = "Benötigt"; +$a->strings["Finish date/time is not known or not relevant"] = "Enddatum/-zeit ist nicht bekannt oder nicht relevant"; +$a->strings["Event Finishes:"] = "Veranstaltungsende:"; +$a->strings["Adjust for viewer timezone"] = "An Zeitzone des Betrachters anpassen"; +$a->strings["Description:"] = "Beschreibung"; +$a->strings["Title:"] = "Titel:"; +$a->strings["Share this event"] = "Veranstaltung teilen"; +$a->strings["Friend suggestion sent."] = "Kontaktvorschlag gesendet."; +$a->strings["Suggest Friends"] = "Kontakte vorschlagen"; +$a->strings["Suggest a friend for %s"] = "Schlage %s einen Kontakt vor"; +$a->strings["Unable to locate original post."] = "Konnte den Originalbeitrag nicht finden."; +$a->strings["Empty post discarded."] = "Leerer Beitrag wurde verworfen."; +$a->strings["System error. Post not saved."] = "Systemfehler. Beitrag konnte nicht gespeichert werden."; +$a->strings["This message was sent to you by %s, a member of the Friendica social network."] = "Diese Nachricht wurde dir von %s geschickt, einem Mitglied des Sozialen Netzwerks Friendica."; +$a->strings["You may visit them online at %s"] = "Du kannst sie online unter %s besuchen"; +$a->strings["Please contact the sender by replying to this post if you do not wish to receive these messages."] = "Falls Du diese Beiträge nicht erhalten möchtest, kontaktiere bitte den Autor, indem Du auf diese Nachricht antwortest."; +$a->strings["%s posted an update."] = "%s hat ein Update veröffentlicht."; +$a->strings["Mood"] = "Stimmung"; +$a->strings["Set your current mood and tell your friends"] = "Wähle Deine aktuelle Stimmung und erzähle sie Deinen Kontakten"; +$a->strings["Recent Photos"] = "Neueste Fotos"; +$a->strings["Upload New Photos"] = "Neue Fotos hochladen"; +$a->strings["everybody"] = "jeder"; +$a->strings["Contact information unavailable"] = "Kontaktinformationen nicht verfügbar"; +$a->strings["Album not found."] = "Album nicht gefunden."; +$a->strings["Delete Album"] = "Album löschen"; +$a->strings["Do you really want to delete this photo album and all its photos?"] = "Möchtest Du wirklich dieses Foto-Album und all seine Foto löschen?"; +$a->strings["Delete Photo"] = "Foto löschen"; +$a->strings["Do you really want to delete this photo?"] = "Möchtest Du wirklich dieses Foto löschen?"; +$a->strings["%1\$s was tagged in %2\$s by %3\$s"] = "%1\$s wurde von %3\$s in %2\$s getaggt"; +$a->strings["a photo"] = "einem Foto"; +$a->strings["Image file is empty."] = "Bilddatei ist leer."; +$a->strings["No photos selected"] = "Keine Bilder ausgewählt"; $a->strings["Access to this item is restricted."] = "Zugriff zu diesem Eintrag wurde eingeschränkt."; +$a->strings["You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."] = "Du verwendest %1$.2f Mbyte von %2$.2f Mbyte des Foto-Speichers."; +$a->strings["Upload Photos"] = "Bilder hochladen"; +$a->strings["New album name: "] = "Name des neuen Albums: "; +$a->strings["or existing album name: "] = "oder existierender Albumname: "; +$a->strings["Do not show a status post for this upload"] = "Keine Status-Mitteilung für diesen Beitrag anzeigen"; +$a->strings["Show to Groups"] = "Zeige den Gruppen"; +$a->strings["Show to Contacts"] = "Zeige den Kontakten"; +$a->strings["Private Photo"] = "Privates Foto"; +$a->strings["Public Photo"] = "Öffentliches Foto"; +$a->strings["Edit Album"] = "Album bearbeiten"; +$a->strings["Show Newest First"] = "Zeige neueste zuerst"; +$a->strings["Show Oldest First"] = "Zeige älteste zuerst"; +$a->strings["View Photo"] = "Foto betrachten"; +$a->strings["Permission denied. Access to this item may be restricted."] = "Zugriff verweigert. Zugriff zu diesem Eintrag könnte eingeschränkt sein."; +$a->strings["Photo not available"] = "Foto nicht verfügbar"; +$a->strings["View photo"] = "Fotos ansehen"; +$a->strings["Edit photo"] = "Foto bearbeiten"; +$a->strings["Use as profile photo"] = "Als Profilbild verwenden"; +$a->strings["View Full Size"] = "Betrachte Originalgröße"; +$a->strings["Tags: "] = "Tags: "; +$a->strings["[Remove any tag]"] = "[Tag entfernen]"; +$a->strings["New album name"] = "Name des neuen Albums"; +$a->strings["Caption"] = "Bildunterschrift"; +$a->strings["Add a Tag"] = "Tag hinzufügen"; +$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"] = "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"; +$a->strings["Do not rotate"] = "Nicht rotieren"; +$a->strings["Rotate CW (right)"] = "Drehen US (rechts)"; +$a->strings["Rotate CCW (left)"] = "Drehen EUS (links)"; +$a->strings["Private photo"] = "Privates Foto"; +$a->strings["Public photo"] = "Öffentliches Foto"; +$a->strings["Map"] = "Karte"; $a->strings["View Album"] = "Album betrachten"; -$a->strings["Recent Videos"] = "Neueste Videos"; -$a->strings["Upload New Videos"] = "Neues Video hochladen"; -$a->strings["Credits"] = "Credits"; -$a->strings["Friendica is a community project, that would not be possible without the help of many people. Here is a list of those who have contributed to the code or the translation of Friendica. Thank you all!"] = "Friendica ist ein Gemeinschaftsprojekt, das nicht ohne die Hilfe vieler Personen möglich wäre. Hier ist eine Aufzählung der Personen, die zum Code oder der Übersetzung beigetragen haben. Dank an alle !"; -$a->strings["- select -"] = "- auswählen -"; $a->strings["Poke/Prod"] = "Anstupsen"; $a->strings["poke, prod or do other things to somebody"] = "Stupse Leute an oder mache anderes mit ihnen"; $a->strings["Recipient"] = "Empfänger"; $a->strings["Choose what you wish to do to recipient"] = "Was willst Du mit dem Empfänger machen:"; $a->strings["Make this post private"] = "Diesen Beitrag privat machen"; -$a->strings["Friendica Communications Server - Setup"] = "Friendica-Server für soziale Netzwerke – Setup"; -$a->strings["Could not connect to database."] = "Verbindung zur Datenbank gescheitert."; -$a->strings["Could not create table."] = "Tabelle konnte nicht angelegt werden."; -$a->strings["Your Friendica site database has been installed."] = "Die Datenbank Deiner Friendicaseite wurde installiert."; -$a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "Möglicherweise musst Du die Datei \"database.sql\" manuell mit phpmyadmin oder mysql importieren."; -$a->strings["Please see the file \"INSTALL.txt\"."] = "Lies bitte die \"INSTALL.txt\"."; -$a->strings["Database already in use."] = "Die Datenbank wird bereits verwendet."; -$a->strings["System check"] = "Systemtest"; -$a->strings["Check again"] = "Noch einmal testen"; -$a->strings["Database connection"] = "Datenbankverbindung"; -$a->strings["In order to install Friendica we need to know how to connect to your database."] = "Um Friendica installieren zu können, müssen wir wissen, wie wir mit Deiner Datenbank Kontakt aufnehmen können."; -$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Bitte kontaktiere den Hosting Provider oder den Administrator der Seite, falls Du Fragen zu diesen Einstellungen haben solltest."; -$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "Die Datenbank, die Du unten angibst, sollte bereits existieren. Ist dies noch nicht der Fall, erzeuge sie bitte bevor Du mit der Installation fortfährst."; -$a->strings["Database Server Name"] = "Datenbank-Server"; -$a->strings["Database Login Name"] = "Datenbank-Nutzer"; -$a->strings["Database Login Password"] = "Datenbank-Passwort"; -$a->strings["Database Name"] = "Datenbank-Name"; -$a->strings["Site administrator email address"] = "E-Mail-Adresse des Administrators"; -$a->strings["Your account email address must match this in order to use the web admin panel."] = "Die E-Mail-Adresse, die in Deinem Friendica-Account eingetragen ist, muss mit dieser Adresse übereinstimmen, damit Du das Admin-Panel benutzen kannst."; -$a->strings["Please select a default timezone for your website"] = "Bitte wähle die Standardzeitzone Deiner Webseite"; -$a->strings["Site settings"] = "Server-Einstellungen"; -$a->strings["System Language:"] = "Systemsprache:"; -$a->strings["Set the default language for your Friendica installation interface and to send emails."] = "Wähle die Standardsprache für deine Friendica-Installations-Oberfläche und den E-Mail-Versand"; -$a->strings["Could not find a command line version of PHP in the web server PATH."] = "Konnte keine Kommandozeilenversion von PHP im PATH des Servers finden."; -$a->strings["If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron. See 'Setup the poller'"] = "Wenn Du keine Kommandozeilen-Version von PHP auf Deinem Server installiert hast, kannst Du keine Hintergrundprozesse via cron starten. Siehe 'Setup the poller'"; -$a->strings["PHP executable path"] = "Pfad zu PHP"; -$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Gib den kompletten Pfad zur ausführbaren Datei von PHP an. Du kannst dieses Feld auch frei lassen und mit der Installation fortfahren."; -$a->strings["Command line PHP"] = "Kommandozeilen-PHP"; -$a->strings["PHP executable is not the php cli binary (could be cgi-fgci version)"] = "Die ausführbare Datei von PHP stimmt nicht mit der PHP cli Version überein (es könnte sich um die cgi-fgci Version handeln)"; -$a->strings["Found PHP version: "] = "Gefundene PHP Version:"; -$a->strings["PHP cli binary"] = "PHP CLI Binary"; -$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "Die Kommandozeilenversion von PHP auf Deinem System hat \"register_argc_argv\" nicht aktiviert."; -$a->strings["This is required for message delivery to work."] = "Dies wird für die Auslieferung von Nachrichten benötigt."; -$a->strings["PHP register_argc_argv"] = "PHP register_argc_argv"; -$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Fehler: Die Funktion \"openssl_pkey_new\" auf diesem System ist nicht in der Lage, Verschlüsselungsschlüssel zu erzeugen"; -$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Wenn der Server unter Windows läuft, schau Dir bitte \"http://www.php.net/manual/en/openssl.installation.php\" an."; -$a->strings["Generate encryption keys"] = "Schlüssel erzeugen"; -$a->strings["libCurl PHP module"] = "PHP: libCurl-Modul"; -$a->strings["GD graphics PHP module"] = "PHP: GD-Grafikmodul"; -$a->strings["OpenSSL PHP module"] = "PHP: OpenSSL-Modul"; -$a->strings["mysqli PHP module"] = "PHP: mysqli-Modul"; -$a->strings["mb_string PHP module"] = "PHP: mb_string-Modul"; -$a->strings["mcrypt PHP module"] = "PHP mcrypt Modul"; -$a->strings["XML PHP module"] = "XML PHP Modul"; -$a->strings["Apache mod_rewrite module"] = "Apache mod_rewrite module"; -$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Fehler: Das Apache-Modul mod-rewrite wird benötigt, es ist allerdings nicht installiert."; -$a->strings["Error: libCURL PHP module required but not installed."] = "Fehler: Das libCURL PHP Modul wird benötigt, ist aber nicht installiert."; -$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Fehler: Das GD-Graphikmodul für PHP mit JPEG-Unterstützung ist nicht installiert."; -$a->strings["Error: openssl PHP module required but not installed."] = "Fehler: Das openssl-Modul von PHP ist nicht installiert."; -$a->strings["Error: mysqli PHP module required but not installed."] = "Fehler: Das mysqli-Modul von PHP ist nicht installiert."; -$a->strings["Error: mb_string PHP module required but not installed."] = "Fehler: mb_string PHP Module wird benötigt ist aber nicht installiert."; -$a->strings["Error: mcrypt PHP module required but not installed."] = "Fehler: Das mcrypt Modul von PHP ist nicht installiert"; -$a->strings["If you are using php_cli, please make sure that mcrypt module is enabled in its config file"] = "Wenn du das Modul \"php_cli\" benutzt dann versichere dich, daß das mcrypt Modul in seiner Konfigurationsdatei aktiviert ist. "; -$a->strings["Function mcrypt_create_iv() is not defined. This is needed to enable RINO2 encryption layer."] = "Die Funktion mcrypt_create_iv() ist nicht festgelegt. Dies ist notwendig um den RINO2-Encryption-Layer zu aktivieren."; -$a->strings["mcrypt_create_iv() function"] = "mcrypt_create_iv() function"; -$a->strings["Error, XML PHP module required but not installed."] = "Fehler: XML PHP Modul erforderlich aber nicht installiert."; -$a->strings["The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so."] = "Der Installationswizard muss in der Lage sein, eine Datei im Stammverzeichnis Deines Webservers anzulegen, ist allerdings derzeit nicht in der Lage, dies zu tun."; -$a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "In den meisten Fällen ist dies ein Problem mit den Schreibrechten. Der Webserver könnte keine Schreiberlaubnis haben, selbst wenn Du sie hast."; -$a->strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Friendica top folder."] = "Nachdem Du alles ausgefüllt hast, erhältst Du einen Text, den Du in eine Datei namens .htconfig.php in Deinem Friendica-Wurzelverzeichnis kopieren musst."; -$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Alternativ kannst Du diesen Schritt aber auch überspringen und die Installation manuell durchführen. Eine Anleitung dazu (Englisch) findest Du in der Datei INSTALL.txt."; -$a->strings[".htconfig.php is writable"] = "Schreibrechte auf .htconfig.php"; -$a->strings["Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Friendica nutzt die Smarty3 Template Engine um die Webansichten zu rendern. Smarty3 kompiliert Templates zu PHP um das Rendern zu beschleunigen."; -$a->strings["In order to store these compiled templates, the web server needs to have write access to the directory view/smarty3/ under the Friendica top level folder."] = "Um diese kompilierten Templates zu speichern benötigt der Webserver Schreibrechte zum Verzeichnis view/smarty3/ im obersten Ordner von Friendica."; -$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Bitte stelle sicher, dass der Nutzer unter dem der Webserver läuft (z.B. www-data) Schreibrechte zu diesem Verzeichnis hat."; -$a->strings["Note: as a security measure, you should give the web server write access to view/smarty3/ only--not the template files (.tpl) that it contains."] = "Hinweis: aus Sicherheitsgründen solltest Du dem Webserver nur Schreibrechte für view/smarty3/ geben -- Nicht den Templatedateien (.tpl) die sie enthalten."; -$a->strings["view/smarty3 is writable"] = "view/smarty3 ist schreibbar"; -$a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "Umschreiben der URLs in der .htaccess funktioniert nicht. Überprüfe die Konfiguration des Servers."; -$a->strings["Url rewrite is working"] = "URL rewrite funktioniert"; -$a->strings["ImageMagick PHP extension is installed"] = "ImageMagick PHP Erweiterung ist installiert"; -$a->strings["ImageMagick supports GIF"] = "ImageMagick unterstützt GIF"; -$a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "Die Konfigurationsdatei \".htconfig.php\" konnte nicht angelegt werden. Bitte verwende den angefügten Text, um die Datei im Stammverzeichnis Deiner Friendica-Installation zu erzeugen."; -$a->strings["

What next

"] = "

Wie geht es weiter?

"; -$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "WICHTIG: Du musst [manuell] einen Cronjob (o.ä.) für den Poller einrichten."; -$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s folgt %2\$s %3\$s"; -$a->strings["Item not available."] = "Beitrag nicht verfügbar."; -$a->strings["Item was not found."] = "Beitrag konnte nicht gefunden werden."; -$a->strings["Submit Request"] = "Anfrage abschicken"; -$a->strings["You already added this contact."] = "Du hast den Kontakt bereits hinzugefügt."; -$a->strings["Diaspora support isn't enabled. Contact can't be added."] = "Diaspora Unterstützung ist nicht aktiviert. Der Kontakt kann nicht zugefügt werden."; -$a->strings["OStatus support is disabled. Contact can't be added."] = "OStatus Unterstützung ist nicht aktiviert. Der Kontakt kann nicht zugefügt werden."; -$a->strings["The network type couldn't be detected. Contact can't be added."] = "Der Netzwerktype wurde nicht erkannt. Der Kontakt kann nicht hinzugefügt werden."; -$a->strings["Please answer the following:"] = "Bitte beantworte folgendes:"; -$a->strings["Does %s know you?"] = "Kennt %s Dich?"; -$a->strings["No"] = "Nein"; -$a->strings["Add a personal note:"] = "Eine persönliche Notiz beifügen:"; -$a->strings["Your Identity Address:"] = "Adresse Deines Profils:"; -$a->strings["Profile URL"] = "Profil URL"; -$a->strings["Contact added"] = "Kontakt hinzugefügt"; -$a->strings["You must be logged in to use addons. "] = "Sie müssen angemeldet sein um Addons benutzen zu können."; -$a->strings["Applications"] = "Anwendungen"; -$a->strings["No installed applications."] = "Keine Applikationen installiert."; -$a->strings["Do you really want to delete this suggestion?"] = "Möchtest Du wirklich diese Empfehlung löschen?"; -$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Keine Vorschläge verfügbar. Falls der Server frisch aufgesetzt wurde, versuche es bitte in 24 Stunden noch einmal."; -$a->strings["Ignore/Hide"] = "Ignorieren/Verbergen"; -$a->strings["Not Extended"] = "Nicht erweitert."; -$a->strings["Item has been removed."] = "Eintrag wurde entfernt."; -$a->strings["No contacts in common."] = "Keine gemeinsamen Kontakte."; -$a->strings["Common Friends"] = "Gemeinsame Kontakte"; -$a->strings["Welcome to Friendica"] = "Willkommen bei Friendica"; -$a->strings["New Member Checklist"] = "Checkliste für neue Mitglieder"; -$a->strings["We would like to offer some tips and links to help make your experience enjoyable. Click any item to visit the relevant page. A link to this page will be visible from your home page for two weeks after your initial registration and then will quietly disappear."] = "Wir möchten Dir einige Tipps und Links anbieten, die Dir helfen könnten, den Einstieg angenehmer zu machen. Klicke auf ein Element, um die entsprechende Seite zu besuchen. Ein Link zu dieser Seite hier bleibt für Dich an Deiner Pinnwand für zwei Wochen nach dem Registrierungsdatum sichtbar und wird dann verschwinden."; -$a->strings["Getting Started"] = "Einstieg"; -$a->strings["Friendica Walk-Through"] = "Friendica Rundgang"; -$a->strings["On your Quick Start page - find a brief introduction to your profile and network tabs, make some new connections, and find some groups to join."] = "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."; -$a->strings["Go to Your Settings"] = "Gehe zu deinen Einstellungen"; -$a->strings["On your Settings page - change your initial password. Also make a note of your Identity Address. This looks just like an email address - and will be useful in making friends on the free social web."] = "Ändere bitte unter Einstellungen dein Passwort. Außerdem merke dir deine Identifikationsadresse. Diese sieht aus wie eine E-Mail-Adresse und wird benötigt, um Kontakte mit anderen im Friendica Netzwerk zu knüpfen.."; -$a->strings["Review the other settings, particularly the privacy settings. An unpublished directory listing is like having an unlisted phone number. In general, you should probably publish your listing - unless all of your friends and potential friends know exactly how to find you."] = "Überprüfe die restlichen Einstellungen, insbesondere die Einstellungen zur Privatsphäre. Wenn Du Dein Profil nicht veröffentlichst, ist das als wenn Du Deine Telefonnummer nicht ins Telefonbuch einträgst. Im Allgemeinen solltest Du es veröffentlichen - außer all Deine Kontakte und potentiellen Kontakte wissen genau, wie sie Dich finden können."; -$a->strings["Upload Profile Photo"] = "Profilbild hochladen"; -$a->strings["Upload a profile photo if you have not done so already. Studies have shown that people with real photos of themselves are ten times more likely to make friends than people who do not."] = "Lade ein Profilbild hoch, falls Du es noch nicht getan hast. Studien haben gezeigt, dass es zehnmal wahrscheinlicher ist neue Kontakte zu finden, wenn Du ein Bild von Dir selbst verwendest, als wenn Du dies nicht tust."; -$a->strings["Edit Your Profile"] = "Editiere dein Profil"; -$a->strings["Edit your default profile to your liking. Review the settings for hiding your list of friends and hiding the profile from unknown visitors."] = "Editiere Dein Standard Profil nach Deinen Vorlieben. Überprüfe die Einstellungen zum Verbergen Deiner Kontaktliste vor unbekannten Betrachtern des Profils."; -$a->strings["Profile Keywords"] = "Profil Schlüsselbegriffe"; -$a->strings["Set some public keywords for your default profile which describe your interests. We may be able to find other people with similar interests and suggest friendships."] = "Trage ein paar öffentliche Stichwörter in Dein Standardprofil ein, die Deine Interessen beschreiben. Eventuell sind wir in der Lage Leute zu finden, die Deine Interessen teilen und können Dir dann Kontakte vorschlagen."; -$a->strings["Connecting"] = "Verbindungen knüpfen"; -$a->strings["Importing Emails"] = "Emails Importieren"; -$a->strings["Enter your email access information on your Connector Settings page if you wish to import and interact with friends or mailing lists from your email INBOX"] = "Gib Deine E-Mail-Zugangsinformationen auf der Connector-Einstellungsseite ein, falls Du E-Mails aus Deinem Posteingang importieren und mit Kontakten und Mailinglisten interagieren willst."; -$a->strings["Go to Your Contacts Page"] = "Gehe zu deiner Kontakt-Seite"; -$a->strings["Your Contacts page is your gateway to managing friendships and connecting with friends on other networks. Typically you enter their address or site URL in the Add New Contact dialog."] = "Die Kontakte-Seite ist die Einstiegsseite, von der aus Du Kontakte verwalten und Dich mit Personen in anderen Netzwerken verbinden kannst. Normalerweise gibst Du dazu einfach ihre Adresse oder die URL der Seite im Kasten Neuen Kontakt hinzufügen ein."; -$a->strings["Go to Your Site's Directory"] = "Gehe zum Verzeichnis Deiner Friendica Instanz"; -$a->strings["The Directory page lets you find other people in this network or other federated sites. Look for a Connect or Follow link on their profile page. Provide your own Identity Address if requested."] = "Über die Verzeichnisseite kannst Du andere Personen auf diesem Server oder anderen verknüpften Seiten finden. Halte nach einem Verbinden oder Folgen Link auf deren Profilseiten Ausschau und gib Deine eigene Profiladresse an, falls Du danach gefragt wirst."; -$a->strings["Finding New People"] = "Neue Leute kennenlernen"; -$a->strings["On the side panel of the Contacts page are several tools to find new friends. We can match people by interest, look up people by name or interest, and provide suggestions based on network relationships. On a brand new site, friend suggestions will usually begin to be populated within 24 hours."] = "Im seitlichen Bedienfeld der Kontakteseite gibt es diverse Werkzeuge, um neue Personen zu finden. Wir können Menschen mit den gleichen Interessen finden, anhand von Namen oder Interessen suchen oder aber aufgrund vorhandener Kontakte neue Leute vorschlagen.\nAuf einer brandneuen - soeben erstellten - Seite starten die Kontaktvorschläge innerhalb von 24 Stunden."; -$a->strings["Group Your Contacts"] = "Gruppiere deine Kontakte"; -$a->strings["Once you have made some friends, organize them into private conversation groups from the sidebar of your Contacts page and then you can interact with each group privately on your Network page."] = "Sobald Du einige Kontakte gefunden hast, organisiere sie in Gruppen zur privaten Kommunikation im Seitenmenü der Kontakte-Seite. Du kannst dann mit jeder dieser Gruppen von der Netzwerkseite aus privat interagieren."; -$a->strings["Why Aren't My Posts Public?"] = "Warum sind meine Beiträge nicht öffentlich?"; -$a->strings["Friendica respects your privacy. By default, your posts will only show up to people you've added as friends. For more information, see the help section from the link above."] = "Friendica respektiert Deine Privatsphäre. Mit der Grundeinstellung werden Deine Beiträge ausschließlich Deinen Kontakten angezeigt. Für weitere Informationen diesbezüglich lies Dir bitte den entsprechenden Abschnitt in der Hilfe unter dem obigen Link durch."; -$a->strings["Getting Help"] = "Hilfe bekommen"; -$a->strings["Go to the Help Section"] = "Zum Hilfe Abschnitt gehen"; -$a->strings["Our help pages may be consulted for detail on other program features and resources."] = "Unsere Hilfe Seiten können herangezogen werden, um weitere Einzelheiten zu andern Programm Features zu erhalten."; -$a->strings["Remove My Account"] = "Konto löschen"; -$a->strings["This will completely remove your account. Once this has been done it is not recoverable."] = "Dein Konto wird endgültig gelöscht. Es gibt keine Möglichkeit, es wiederherzustellen."; -$a->strings["Please enter your password for verification:"] = "Bitte gib Dein Passwort zur Verifikation ein:"; -$a->strings["Mood"] = "Stimmung"; -$a->strings["Set your current mood and tell your friends"] = "Wähle Deine aktuelle Stimmung und erzähle sie Deinen Kontakten"; -$a->strings["Item not found"] = "Beitrag nicht gefunden"; -$a->strings["Edit post"] = "Beitrag bearbeiten"; -$a->strings["Warning: This group contains %s member from an insecure network."] = array( - 0 => "Warnung: Diese Gruppe beinhaltet %s Person aus einem unsicheren Netzwerk.", - 1 => "Warnung: Diese Gruppe beinhaltet %s Personen aus unsicheren Netzwerken.", -); -$a->strings["Private messages to this group are at risk of public disclosure."] = "Private Nachrichten an diese Gruppe könnten an die Öffentlichkeit geraten."; -$a->strings["No such group"] = "Es gibt keine solche Gruppe"; -$a->strings["Group is empty"] = "Gruppe ist leer"; -$a->strings["Group: %s"] = "Gruppe: %s"; -$a->strings["Private messages to this person are at risk of public disclosure."] = "Private Nachrichten an diese Person könnten an die Öffentlichkeit gelangen."; -$a->strings["Invalid contact."] = "Ungültiger Kontakt."; -$a->strings["Commented Order"] = "Neueste Kommentare"; -$a->strings["Sort by Comment Date"] = "Nach Kommentardatum sortieren"; -$a->strings["Posted Order"] = "Neueste Beiträge"; -$a->strings["Sort by Post Date"] = "Nach Beitragsdatum sortieren"; -$a->strings["Personal"] = "Persönlich"; -$a->strings["Posts that mention or involve you"] = "Beiträge, in denen es um Dich geht"; -$a->strings["New"] = "Neue"; -$a->strings["Activity Stream - by date"] = "Aktivitäten-Stream - nach Datum"; -$a->strings["Shared Links"] = "Geteilte Links"; -$a->strings["Interesting Links"] = "Interessante Links"; -$a->strings["Starred"] = "Markierte"; -$a->strings["Favourite Posts"] = "Favorisierte Beiträge"; -$a->strings["Not available."] = "Nicht verfügbar."; -$a->strings["Time Conversion"] = "Zeitumrechnung"; -$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica bietet diese Funktion an, um das Teilen von Events mit Kontakten zu vereinfachen, deren Zeitzone nicht ermittelt werden kann."; -$a->strings["UTC time: %s"] = "UTC Zeit: %s"; -$a->strings["Current timezone: %s"] = "Aktuelle Zeitzone: %s"; -$a->strings["Converted localtime: %s"] = "Umgerechnete lokale Zeit: %s"; -$a->strings["Please select your timezone:"] = "Bitte wähle Deine Zeitzone:"; -$a->strings["The post was created"] = "Der Beitrag wurde angelegt"; -$a->strings["Group created."] = "Gruppe erstellt."; -$a->strings["Could not create group."] = "Konnte die Gruppe nicht erstellen."; -$a->strings["Group not found."] = "Gruppe nicht gefunden."; -$a->strings["Group name changed."] = "Gruppenname geändert."; -$a->strings["Save Group"] = "Gruppe speichern"; -$a->strings["Create a group of contacts/friends."] = "Eine Kontaktgruppe anlegen."; -$a->strings["Group removed."] = "Gruppe entfernt."; -$a->strings["Unable to remove group."] = "Konnte die Gruppe nicht entfernen."; -$a->strings["Group Editor"] = "Gruppeneditor"; -$a->strings["Members"] = "Mitglieder"; -$a->strings["All Contacts"] = "Alle Kontakte"; $a->strings["Image uploaded but image cropping failed."] = "Bild hochgeladen, aber das Zuschneiden schlug fehl."; $a->strings["Image size reduction [%s] failed."] = "Verkleinern der Bildgröße von [%s] scheiterte."; $a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Drücke Umschalt+Neu Laden oder leere den Browser-Cache, falls das neue Foto nicht gleich angezeigt wird."; @@ -1367,6 +1694,76 @@ $a->strings["Crop Image"] = "Bild zurechtschneiden"; $a->strings["Please adjust the image cropping for optimum viewing."] = "Passe bitte den Bildausschnitt an, damit das Bild optimal dargestellt werden kann."; $a->strings["Done Editing"] = "Bearbeitung abgeschlossen"; $a->strings["Image uploaded successfully."] = "Bild erfolgreich hochgeladen."; +$a->strings["Profile deleted."] = "Profil gelöscht."; +$a->strings["Profile-"] = "Profil-"; +$a->strings["New profile created."] = "Neues Profil angelegt."; +$a->strings["Profile unavailable to clone."] = "Profil nicht zum Duplizieren verfügbar."; +$a->strings["Profile Name is required."] = "Profilname ist erforderlich."; +$a->strings["Marital Status"] = "Familienstand"; +$a->strings["Romantic Partner"] = "Romanze"; +$a->strings["Work/Employment"] = "Arbeit / Beschäftigung"; +$a->strings["Religion"] = "Religion"; +$a->strings["Political Views"] = "Politische Ansichten"; +$a->strings["Gender"] = "Geschlecht"; +$a->strings["Sexual Preference"] = "Sexuelle Vorlieben"; +$a->strings["Homepage"] = "Webseite"; +$a->strings["Interests"] = "Interessen"; +$a->strings["Address"] = "Adresse"; +$a->strings["Location"] = "Wohnort"; +$a->strings["Profile updated."] = "Profil aktualisiert."; +$a->strings[" and "] = " und "; +$a->strings["public profile"] = "öffentliches Profil"; +$a->strings["%1\$s changed %2\$s to “%3\$s”"] = "%1\$s hat %2\$s geändert auf “%3\$s”"; +$a->strings[" - Visit %1\$s's %2\$s"] = " – %1\$ss %2\$s besuchen"; +$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s hat folgendes aktualisiert %2\$s, verändert wurde %3\$s."; +$a->strings["Hide contacts and friends:"] = "Kontakte und Freunde verbergen"; +$a->strings["Hide your contact/friend list from viewers of this profile?"] = "Liste der Kontakte vor Betrachtern dieses Profils verbergen?"; +$a->strings["Show more profile fields:"] = "Zeige mehr Profil-Felder:"; +$a->strings["Profile Actions"] = "Profilaktionen"; +$a->strings["Edit Profile Details"] = "Profil bearbeiten"; +$a->strings["Change Profile Photo"] = "Profilbild ändern"; +$a->strings["View this profile"] = "Dieses Profil anzeigen"; +$a->strings["Create a new profile using these settings"] = "Neues Profil anlegen und diese Einstellungen verwenden"; +$a->strings["Clone this profile"] = "Dieses Profil duplizieren"; +$a->strings["Delete this profile"] = "Dieses Profil löschen"; +$a->strings["Basic information"] = "Grundinformationen"; +$a->strings["Profile picture"] = "Profilbild"; +$a->strings["Preferences"] = "Vorlieben"; +$a->strings["Status information"] = "Status Informationen"; +$a->strings["Additional information"] = "Zusätzliche Informationen"; +$a->strings["Relation"] = "Beziehung"; +$a->strings["Your Gender:"] = "Dein Geschlecht:"; +$a->strings["♥ Marital Status:"] = "♥ Beziehungsstatus:"; +$a->strings["Example: fishing photography software"] = "Beispiel: Fischen Fotografie Software"; +$a->strings["Profile Name:"] = "Profilname:"; +$a->strings["This is your public profile.
It may be visible to anybody using the internet."] = "Dies ist Dein öffentliches Profil.
Es könnte für jeden Nutzer des Internets sichtbar sein."; +$a->strings["Your Full Name:"] = "Dein kompletter Name:"; +$a->strings["Title/Description:"] = "Titel/Beschreibung:"; +$a->strings["Street Address:"] = "Adresse:"; +$a->strings["Locality/City:"] = "Wohnort:"; +$a->strings["Region/State:"] = "Region/Bundesstaat:"; +$a->strings["Postal/Zip Code:"] = "Postleitzahl:"; +$a->strings["Country:"] = "Land:"; +$a->strings["Who: (if applicable)"] = "Wer: (falls anwendbar)"; +$a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Beispiele: cathy123, Cathy Williams, cathy@example.com"; +$a->strings["Since [date]:"] = "Seit [Datum]:"; +$a->strings["Tell us about yourself..."] = "Erzähle uns ein bisschen von Dir …"; +$a->strings["Homepage URL:"] = "Adresse der Homepage:"; +$a->strings["Religious Views:"] = "Religiöse Ansichten:"; +$a->strings["Public Keywords:"] = "Öffentliche Schlüsselwörter:"; +$a->strings["(Used for suggesting potential friends, can be seen by others)"] = "(Wird verwendet, um potentielle Kontakte zu finden, kann von Kontakten eingesehen werden)"; +$a->strings["Private Keywords:"] = "Private Schlüsselwörter:"; +$a->strings["(Used for searching profiles, never shown to others)"] = "(Wird für die Suche nach Profilen verwendet und niemals veröffentlicht)"; +$a->strings["Musical interests"] = "Musikalische Interessen"; +$a->strings["Books, literature"] = "Bücher, Literatur"; +$a->strings["Television"] = "Fernsehen"; +$a->strings["Film/dance/culture/entertainment"] = "Filme/Tänze/Kultur/Unterhaltung"; +$a->strings["Hobbies/Interests"] = "Hobbies/Interessen"; +$a->strings["Love/romance"] = "Liebe/Romantik"; +$a->strings["Work/employment"] = "Arbeit/Anstellung"; +$a->strings["School/education"] = "Schule/Ausbildung"; +$a->strings["Contact information and Social Networks"] = "Kontaktinformationen und Soziale Netzwerke"; +$a->strings["Edit/Manage Profiles"] = "Bearbeite/Verwalte Profile"; $a->strings["Registration successful. Please check your email for further instructions."] = "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an Dich gesendet."; $a->strings["Failed to send email message. Here your accout details:
login: %s
password: %s

You can change your password after login."] = "Versenden der E-Mail fehlgeschlagen. Hier sind Deine Account Details:\n\nLogin: %s\nPasswort: %s\n\nDu kannst das Passwort nach dem Anmelden ändern."; $a->strings["Registration successful."] = "Registrierung erfolgreich."; @@ -1386,13 +1783,14 @@ $a->strings["Confirm:"] = "Bestätigen:"; $a->strings["Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be 'nickname@\$sitename'."] = "Wähle einen Spitznamen für Dein Profil. Dieser muss mit einem Buchstaben beginnen. Die Adresse Deines Profils auf dieser Seite wird 'spitzname@\$sitename' sein."; $a->strings["Choose a nickname: "] = "Spitznamen wählen: "; $a->strings["Import your profile to this friendica instance"] = "Importiere Dein Profil auf diese Friendica Instanz"; -$a->strings["everybody"] = "jeder"; +$a->strings["Account approved."] = "Konto freigegeben."; +$a->strings["Registration revoked for %s"] = "Registrierung für %s wurde zurückgezogen"; +$a->strings["Please login."] = "Bitte melde Dich an."; $a->strings["Display"] = "Anzeige"; $a->strings["Social Networks"] = "Soziale Netzwerke"; $a->strings["Connected apps"] = "Verbundene Programme"; $a->strings["Remove account"] = "Konto löschen"; $a->strings["Missing some important data!"] = "Wichtige Daten fehlen!"; -$a->strings["Update"] = "Aktualisierungen"; $a->strings["Failed to connect with email account using the settings provided."] = "Verbindung zum E-Mail-Konto mit den angegebenen Einstellungen nicht möglich."; $a->strings["Email settings updated."] = "E-Mail Einstellungen bearbeitet."; $a->strings["Features updated"] = "Features aktualisiert"; @@ -1416,7 +1814,6 @@ $a->strings["Redirect"] = "Umleiten"; $a->strings["Icon url"] = "Icon URL"; $a->strings["You can't edit this application."] = "Du kannst dieses Programm nicht bearbeiten."; $a->strings["Connected Apps"] = "Verbundene Programme"; -$a->strings["Edit"] = "Bearbeiten"; $a->strings["Client key starts with"] = "Anwenderschlüssel beginnt mit"; $a->strings["No name"] = "Kein Name"; $a->strings["Remove authorization"] = "Autorisierung entziehen"; @@ -1520,8 +1917,6 @@ $a->strings["Maximum Friend Requests/Day:"] = "Maximale Anzahl vonKontaktanfrage $a->strings["(to prevent spam abuse)"] = "(um SPAM zu vermeiden)"; $a->strings["Default Post Permissions"] = "Standard-Zugriffsrechte für Beiträge"; $a->strings["(click to open/close)"] = "(klicke zum öffnen/schließen)"; -$a->strings["Show to Groups"] = "Zeige den Gruppen"; -$a->strings["Show to Contacts"] = "Zeige den Kontakten"; $a->strings["Default Private Post"] = "Privater Standardbeitrag"; $a->strings["Default Public Post"] = "Öffentlicher Standardbeitrag"; $a->strings["Default Permissions for New Posts"] = "Standardberechtigungen für neue Beiträge"; @@ -1549,404 +1944,11 @@ $a->strings["Change the behaviour of this account for special situations"] = "Ve $a->strings["Relocate"] = "Umziehen"; $a->strings["If you have moved this profile from another server, and some of your contacts don't receive your updates, try pushing this button."] = "Wenn Du Dein Profil von einem anderen Server umgezogen hast und einige Deiner Kontakte Deine Beiträge nicht erhalten, verwende diesen Button."; $a->strings["Resend relocate message to contacts"] = "Umzugsbenachrichtigung erneut an Kontakte senden"; -$a->strings["Number of daily wall messages for %s exceeded. Message failed."] = "Maximale Anzahl der täglichen Pinnwand Nachrichten für %s ist überschritten. Zustellung fehlgeschlagen."; -$a->strings["No recipient selected."] = "Kein Empfänger gewählt."; -$a->strings["Unable to check your home location."] = "Konnte Deinen Heimatort nicht bestimmen."; -$a->strings["Message could not be sent."] = "Nachricht konnte nicht gesendet werden."; -$a->strings["Message collection failure."] = "Konnte Nachrichten nicht abrufen."; -$a->strings["Message sent."] = "Nachricht gesendet."; -$a->strings["No recipient."] = "Kein Empfänger."; -$a->strings["Send Private Message"] = "Private Nachricht senden"; -$a->strings["If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders."] = "Wenn Du möchtest, dass %s Dir antworten kann, überprüfe Deine Privatsphären-Einstellungen und erlaube private Nachrichten von unbekannten Absendern."; -$a->strings["To:"] = "An:"; -$a->strings["Subject:"] = "Betreff:"; -$a->strings["link"] = "Link"; -$a->strings["Authorize application connection"] = "Verbindung der Applikation autorisieren"; -$a->strings["Return to your app and insert this Securty Code:"] = "Gehe zu Deiner Anwendung zurück und trage dort folgenden Sicherheitscode ein:"; -$a->strings["Please login to continue."] = "Bitte melde Dich an um fortzufahren."; -$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Möchtest Du dieser Anwendung den Zugriff auf Deine Beiträge und Kontakte, sowie das Erstellen neuer Beiträge in Deinem Namen gestatten?"; -$a->strings["Source (bbcode) text:"] = "Quelle (bbcode) Text:"; -$a->strings["Source (Diaspora) text to convert to BBcode:"] = "Eingabe (Diaspora) nach BBCode zu konvertierender Text:"; -$a->strings["Source input: "] = "Originaltext:"; -$a->strings["bb2html (raw HTML): "] = "bb2html (reines HTML): "; -$a->strings["bb2html: "] = "bb2html: "; -$a->strings["bb2html2bb: "] = "bb2html2bb: "; -$a->strings["bb2md: "] = "bb2md: "; -$a->strings["bb2md2html: "] = "bb2md2html: "; -$a->strings["bb2dia2bb: "] = "bb2dia2bb: "; -$a->strings["bb2md2html2bb: "] = "bb2md2html2bb: "; -$a->strings["Source input (Diaspora format): "] = "Originaltext (Diaspora Format): "; -$a->strings["diaspora2bb: "] = "diaspora2bb: "; -$a->strings["Unable to locate original post."] = "Konnte den Originalbeitrag nicht finden."; -$a->strings["Empty post discarded."] = "Leerer Beitrag wurde verworfen."; -$a->strings["System error. Post not saved."] = "Systemfehler. Beitrag konnte nicht gespeichert werden."; -$a->strings["This message was sent to you by %s, a member of the Friendica social network."] = "Diese Nachricht wurde dir von %s geschickt, einem Mitglied des Sozialen Netzwerks Friendica."; -$a->strings["You may visit them online at %s"] = "Du kannst sie online unter %s besuchen"; -$a->strings["Please contact the sender by replying to this post if you do not wish to receive these messages."] = "Falls Du diese Beiträge nicht erhalten möchtest, kontaktiere bitte den Autor, indem Du auf diese Nachricht antwortest."; -$a->strings["%s posted an update."] = "%s hat ein Update veröffentlicht."; -$a->strings["Subscribing to OStatus contacts"] = "OStatus Kontakten folgen"; -$a->strings["No contact provided."] = "Keine Kontakte gefunden."; -$a->strings["Couldn't fetch information for contact."] = "Konnte die Kontaktinformationen nicht einholen."; -$a->strings["Couldn't fetch friends for contact."] = "Konnte die Kontaktliste des Kontakts nicht abfragen."; -$a->strings["success"] = "Erfolg"; -$a->strings["failed"] = "Fehlgeschlagen"; -$a->strings["ignored"] = "Ignoriert"; -$a->strings["%1\$s welcomes %2\$s"] = "%1\$s heißt %2\$s herzlich willkommen"; -$a->strings["Tips for New Members"] = "Tipps für neue Nutzer"; -$a->strings["Unable to locate contact information."] = "Konnte die Kontaktinformationen nicht finden."; -$a->strings["Do you really want to delete this message?"] = "Möchtest Du wirklich diese Nachricht löschen?"; -$a->strings["Message deleted."] = "Nachricht gelöscht."; -$a->strings["Conversation removed."] = "Unterhaltung gelöscht."; -$a->strings["No messages."] = "Keine Nachrichten."; -$a->strings["Message not available."] = "Nachricht nicht verfügbar."; -$a->strings["Delete message"] = "Nachricht löschen"; -$a->strings["Delete conversation"] = "Unterhaltung löschen"; -$a->strings["No secure communications available. You may be able to respond from the sender's profile page."] = "Sichere Kommunikation ist nicht verfügbar. Eventuell kannst Du auf der Profilseite des Absenders antworten."; -$a->strings["Send Reply"] = "Antwort senden"; -$a->strings["Unknown sender - %s"] = "'Unbekannter Absender - %s"; -$a->strings["You and %s"] = "Du und %s"; -$a->strings["%s and You"] = "%s und Du"; -$a->strings["D, d M Y - g:i A"] = "D, d. M Y - g:i A"; -$a->strings["%d message"] = array( - 0 => "%d Nachricht", - 1 => "%d Nachrichten", -); -$a->strings["Manage Identities and/or Pages"] = "Verwalte Identitäten und/oder Seiten"; -$a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "Zwischen verschiedenen Identitäten oder Gemeinschafts-/Gruppenseiten wechseln, die Deine Kontoinformationen teilen oder zu denen Du „Verwalten“-Befugnisse bekommen hast."; -$a->strings["Select an identity to manage: "] = "Wähle eine Identität zum Verwalten aus: "; -$a->strings["%d contact edited."] = array( - 0 => "%d Kontakt bearbeitet.", - 1 => "%d Kontakte bearbeitet.", -); -$a->strings["Could not access contact record."] = "Konnte nicht auf die Kontaktdaten zugreifen."; -$a->strings["Could not locate selected profile."] = "Konnte das ausgewählte Profil nicht finden."; -$a->strings["Contact updated."] = "Kontakt aktualisiert."; -$a->strings["Failed to update contact record."] = "Aktualisierung der Kontaktdaten fehlgeschlagen."; -$a->strings["Contact has been blocked"] = "Kontakt wurde blockiert"; -$a->strings["Contact has been unblocked"] = "Kontakt wurde wieder freigegeben"; -$a->strings["Contact has been ignored"] = "Kontakt wurde ignoriert"; -$a->strings["Contact has been unignored"] = "Kontakt wird nicht mehr ignoriert"; -$a->strings["Contact has been archived"] = "Kontakt wurde archiviert"; -$a->strings["Contact has been unarchived"] = "Kontakt wurde aus dem Archiv geholt"; -$a->strings["Drop contact"] = "Kontakt löschen"; -$a->strings["Do you really want to delete this contact?"] = "Möchtest Du wirklich diesen Kontakt löschen?"; -$a->strings["Contact has been removed."] = "Kontakt wurde entfernt."; -$a->strings["You are mutual friends with %s"] = "Du hast mit %s eine beidseitige Freundschaft"; -$a->strings["You are sharing with %s"] = "Du teilst mit %s"; -$a->strings["%s is sharing with you"] = "%s teilt mit Dir"; -$a->strings["Private communications are not available for this contact."] = "Private Kommunikation ist für diesen Kontakt nicht verfügbar."; -$a->strings["(Update was successful)"] = "(Aktualisierung war erfolgreich)"; -$a->strings["(Update was not successful)"] = "(Aktualisierung war nicht erfolgreich)"; -$a->strings["Suggest friends"] = "Kontakte vorschlagen"; -$a->strings["Network type: %s"] = "Netzwerktyp: %s"; -$a->strings["Communications lost with this contact!"] = "Verbindungen mit diesem Kontakt verloren!"; -$a->strings["Fetch further information for feeds"] = "Weitere Informationen zu Feeds holen"; -$a->strings["Fetch information"] = "Beziehe Information"; -$a->strings["Fetch information and keywords"] = "Beziehe Information und Schlüsselworte"; -$a->strings["Contact"] = "Kontakt: "; -$a->strings["Profile Visibility"] = "Profil-Sichtbarkeit"; -$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Bitte wähle eines Deiner Profile das angezeigt werden soll, wenn %s Dein Profil aufruft."; -$a->strings["Contact Information / Notes"] = "Kontakt Informationen / Notizen"; -$a->strings["Edit contact notes"] = "Notizen zum Kontakt bearbeiten"; -$a->strings["Block/Unblock contact"] = "Kontakt blockieren/freischalten"; -$a->strings["Ignore contact"] = "Ignoriere den Kontakt"; -$a->strings["Repair URL settings"] = "URL Einstellungen reparieren"; -$a->strings["View conversations"] = "Unterhaltungen anzeigen"; -$a->strings["Last update:"] = "Letzte Aktualisierung: "; -$a->strings["Update public posts"] = "Öffentliche Beiträge aktualisieren"; -$a->strings["Update now"] = "Jetzt aktualisieren"; -$a->strings["Unignore"] = "Ignorieren aufheben"; -$a->strings["Ignore"] = "Ignorieren"; -$a->strings["Currently blocked"] = "Derzeit geblockt"; -$a->strings["Currently ignored"] = "Derzeit ignoriert"; -$a->strings["Currently archived"] = "Momentan archiviert"; -$a->strings["Hide this contact from others"] = "Verbirg diesen Kontakt vor andere"; -$a->strings["Replies/likes to your public posts may still be visible"] = "Antworten/Likes auf deine öffentlichen Beiträge könnten weiterhin sichtbar sein"; -$a->strings["Notification for new posts"] = "Benachrichtigung bei neuen Beiträgen"; -$a->strings["Send a notification of every new post of this contact"] = "Sende eine Benachrichtigung, wann immer dieser Kontakt einen neuen Beitrag schreibt."; -$a->strings["Blacklisted keywords"] = "Blacklistete Schlüsselworte "; -$a->strings["Comma separated list of keywords that should not be converted to hashtags, when \"Fetch information and keywords\" is selected"] = "Komma-Separierte Liste mit Schlüsselworten, die nicht in Hashtags konvertiert werden, wenn \"Beziehe Information und Schlüsselworte\" aktiviert wurde"; -$a->strings["Actions"] = "Aktionen"; -$a->strings["Contact Settings"] = "Kontakteinstellungen"; -$a->strings["Suggestions"] = "Kontaktvorschläge"; -$a->strings["Suggest potential friends"] = "Kontakte vorschlagen"; -$a->strings["Show all contacts"] = "Alle Kontakte anzeigen"; -$a->strings["Unblocked"] = "Ungeblockt"; -$a->strings["Only show unblocked contacts"] = "Nur nicht-blockierte Kontakte anzeigen"; -$a->strings["Blocked"] = "Geblockt"; -$a->strings["Only show blocked contacts"] = "Nur blockierte Kontakte anzeigen"; -$a->strings["Ignored"] = "Ignoriert"; -$a->strings["Only show ignored contacts"] = "Nur ignorierte Kontakte anzeigen"; -$a->strings["Archived"] = "Archiviert"; -$a->strings["Only show archived contacts"] = "Nur archivierte Kontakte anzeigen"; -$a->strings["Hidden"] = "Verborgen"; -$a->strings["Only show hidden contacts"] = "Nur verborgene Kontakte anzeigen"; -$a->strings["Search your contacts"] = "Suche in deinen Kontakten"; -$a->strings["Archive"] = "Archivieren"; -$a->strings["Unarchive"] = "Aus Archiv zurückholen"; -$a->strings["Batch Actions"] = "Stapelverarbeitung"; -$a->strings["View all contacts"] = "Alle Kontakte anzeigen"; -$a->strings["View all common friends"] = "Alle Kontakte anzeigen"; -$a->strings["Advanced Contact Settings"] = "Fortgeschrittene Kontakteinstellungen"; -$a->strings["Mutual Friendship"] = "Beidseitige Freundschaft"; -$a->strings["is a fan of yours"] = "ist ein Fan von dir"; -$a->strings["you are a fan of"] = "Du bist Fan von"; -$a->strings["Toggle Blocked status"] = "Geblockt-Status ein-/ausschalten"; -$a->strings["Toggle Ignored status"] = "Ignoriert-Status ein-/ausschalten"; -$a->strings["Toggle Archive status"] = "Archiviert-Status ein-/ausschalten"; -$a->strings["Delete contact"] = "Lösche den Kontakt"; -$a->strings["Contact settings applied."] = "Einstellungen zum Kontakt angewandt."; -$a->strings["Contact update failed."] = "Konnte den Kontakt nicht aktualisieren."; -$a->strings["WARNING: This is highly advanced and if you enter incorrect information your communications with this contact may stop working."] = "ACHTUNG: Das sind Experten-Einstellungen! Wenn Du etwas Falsches eingibst, funktioniert die Kommunikation mit diesem Kontakt evtl. nicht mehr."; -$a->strings["Please use your browser 'Back' button now if you are uncertain what to do on this page."] = "Bitte nutze den Zurück-Button Deines Browsers jetzt, wenn Du Dir unsicher bist, was Du tun willst."; -$a->strings["No mirroring"] = "Kein Spiegeln"; -$a->strings["Mirror as forwarded posting"] = "Spiegeln als weitergeleitete Beiträge"; -$a->strings["Mirror as my own posting"] = "Spiegeln als meine eigenen Beiträge"; -$a->strings["Return to contact editor"] = "Zurück zum Kontakteditor"; -$a->strings["Refetch contact data"] = "Kontaktdaten neu laden"; -$a->strings["Remote Self"] = "Entfernte Konten"; -$a->strings["Mirror postings from this contact"] = "Spiegle Beiträge dieses Kontakts"; -$a->strings["Mark this contact as remote_self, this will cause friendica to repost new entries from this contact."] = "Markiere diesen Kontakt als remote_self (entferntes Konto), dies veranlasst Friendica alle Top-Level Beiträge dieses Kontakts an all Deine Kontakte zu senden."; -$a->strings["Account Nickname"] = "Konto-Spitzname"; -$a->strings["@Tagname - overrides Name/Nickname"] = "@Tagname - überschreibt Name/Spitzname"; -$a->strings["Account URL"] = "Konto-URL"; -$a->strings["Friend Request URL"] = "URL für Kontaktschaftsanfragen"; -$a->strings["Friend Confirm URL"] = "URL für Bestätigungen von Kontaktanfragen"; -$a->strings["Notification Endpoint URL"] = "URL-Endpunkt für Benachrichtigungen"; -$a->strings["Poll/Feed URL"] = "Pull/Feed-URL"; -$a->strings["New photo from this URL"] = "Neues Foto von dieser URL"; -$a->strings["Profile not found."] = "Profil nicht gefunden."; -$a->strings["This may occasionally happen if contact was requested by both persons and it has already been approved."] = "Das kann passieren, wenn sich zwei Kontakte gegenseitig eingeladen haben und bereits einer angenommen wurde."; -$a->strings["Response from remote site was not understood."] = "Antwort der Gegenstelle unverständlich."; -$a->strings["Unexpected response from remote site: "] = "Unerwartete Antwort der Gegenstelle: "; -$a->strings["Confirmation completed successfully."] = "Bestätigung erfolgreich abgeschlossen."; -$a->strings["Remote site reported: "] = "Gegenstelle meldet: "; -$a->strings["Temporary failure. Please wait and try again."] = "Zeitweiser Fehler. Bitte warte einige Momente und versuche es dann noch einmal."; -$a->strings["Introduction failed or was revoked."] = "Kontaktanfrage schlug fehl oder wurde zurückgezogen."; -$a->strings["Unable to set contact photo."] = "Konnte das Bild des Kontakts nicht speichern."; -$a->strings["No user record found for '%s' "] = "Für '%s' wurde kein Nutzer gefunden"; -$a->strings["Our site encryption key is apparently messed up."] = "Der Verschlüsselungsschlüssel unserer Seite ist anscheinend nicht in Ordnung."; -$a->strings["Empty site URL was provided or URL could not be decrypted by us."] = "Leere URL für die Seite erhalten oder die URL konnte nicht entschlüsselt werden."; -$a->strings["Contact record was not found for you on our site."] = "Für diesen Kontakt wurde auf unserer Seite kein Eintrag gefunden."; -$a->strings["Site public key not available in contact record for URL %s."] = "Die Kontaktdaten für URL %s enthalten keinen Public Key für den Server."; -$a->strings["The ID provided by your system is a duplicate on our system. It should work if you try again."] = "Die ID, die uns Dein System angeboten hat, ist hier bereits vergeben. Bitte versuche es noch einmal."; -$a->strings["Unable to set your contact credentials on our system."] = "Deine Kontaktreferenzen konnten nicht in unserem System gespeichert werden."; -$a->strings["Unable to update your contact profile details on our system"] = "Die Updates für Dein Profil konnten nicht gespeichert werden"; -$a->strings["%1\$s has joined %2\$s"] = "%1\$s ist %2\$s beigetreten"; -$a->strings["This introduction has already been accepted."] = "Diese Kontaktanfrage wurde bereits akzeptiert."; -$a->strings["Profile location is not valid or does not contain profile information."] = "Profiladresse ist ungültig oder stellt keine Profildaten zur Verfügung."; -$a->strings["Warning: profile location has no identifiable owner name."] = "Warnung: Es konnte kein Name des Besitzers von der angegebenen Profiladresse gefunden werden."; -$a->strings["Warning: profile location has no profile photo."] = "Warnung: Es gibt kein Profilbild bei der angegebenen Profiladresse."; -$a->strings["%d required parameter was not found at the given location"] = array( - 0 => "%d benötigter Parameter wurde an der angegebenen Stelle nicht gefunden", - 1 => "%d benötigte Parameter wurden an der angegebenen Stelle nicht gefunden", -); -$a->strings["Introduction complete."] = "Kontaktanfrage abgeschlossen."; -$a->strings["Unrecoverable protocol error."] = "Nicht behebbarer Protokollfehler."; -$a->strings["Profile unavailable."] = "Profil nicht verfügbar."; -$a->strings["%s has received too many connection requests today."] = "%s hat heute zu viele Kontaktanfragen erhalten."; -$a->strings["Spam protection measures have been invoked."] = "Maßnahmen zum Spamschutz wurden ergriffen."; -$a->strings["Friends are advised to please try again in 24 hours."] = "Freunde sind angehalten, es in 24 Stunden erneut zu versuchen."; -$a->strings["Invalid locator"] = "Ungültiger Locator"; -$a->strings["Invalid email address."] = "Ungültige E-Mail-Adresse."; -$a->strings["This account has not been configured for email. Request failed."] = "Dieses Konto ist nicht für E-Mail konfiguriert. Anfrage fehlgeschlagen."; -$a->strings["You have already introduced yourself here."] = "Du hast Dich hier bereits vorgestellt."; -$a->strings["Apparently you are already friends with %s."] = "Es scheint so, als ob Du bereits mit %s in Kontakt stehst."; -$a->strings["Invalid profile URL."] = "Ungültige Profil-URL."; -$a->strings["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"; -$a->strings["Hide this contact"] = "Verberge diesen Kontakt"; -$a->strings["Welcome home %s."] = "Willkommen zurück %s."; -$a->strings["Please confirm your introduction/connection request to %s."] = "Bitte bestätige Deine Kontaktanfrage bei %s."; -$a->strings["Please enter your 'Identity Address' from one of the following supported communications networks:"] = "Bitte gib die Adresse Deines Profils in einem der unterstützten sozialen Netzwerke an:"; -$a->strings["If you are not yet a member of the free social web, follow this link to find a public Friendica site and join us today."] = "Wenn du noch kein Mitglied dieses freien sozialen Netzwerks bist, folge diesem Link um einen öffentlichen Friendica-Server zu finden und beizutreten."; -$a->strings["Friend/Connection Request"] = "Kontaktanfrage"; -$a->strings["Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"] = "Beispiele: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"; -$a->strings["StatusNet/Federated Social Web"] = "StatusNet/Federated Social Web"; -$a->strings[" - please do not use this form. Instead, enter %s into your Diaspora search bar."] = " - bitte verwende dieses Formular nicht. Stattdessen suche nach %s in Deiner Diaspora Suchleiste."; -$a->strings["Recent Photos"] = "Neueste Fotos"; -$a->strings["Upload New Photos"] = "Neue Fotos hochladen"; -$a->strings["Contact information unavailable"] = "Kontaktinformationen nicht verfügbar"; -$a->strings["Album not found."] = "Album nicht gefunden."; -$a->strings["Delete Album"] = "Album löschen"; -$a->strings["Do you really want to delete this photo album and all its photos?"] = "Möchtest Du wirklich dieses Foto-Album und all seine Foto löschen?"; -$a->strings["Delete Photo"] = "Foto löschen"; -$a->strings["Do you really want to delete this photo?"] = "Möchtest Du wirklich dieses Foto löschen?"; -$a->strings["%1\$s was tagged in %2\$s by %3\$s"] = "%1\$s wurde von %3\$s in %2\$s getaggt"; -$a->strings["a photo"] = "einem Foto"; -$a->strings["Image file is empty."] = "Bilddatei ist leer."; -$a->strings["No photos selected"] = "Keine Bilder ausgewählt"; -$a->strings["You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."] = "Du verwendest %1$.2f Mbyte von %2$.2f Mbyte des Foto-Speichers."; -$a->strings["Upload Photos"] = "Bilder hochladen"; -$a->strings["New album name: "] = "Name des neuen Albums: "; -$a->strings["or existing album name: "] = "oder existierender Albumname: "; -$a->strings["Do not show a status post for this upload"] = "Keine Status-Mitteilung für diesen Beitrag anzeigen"; -$a->strings["Private Photo"] = "Privates Foto"; -$a->strings["Public Photo"] = "Öffentliches Foto"; -$a->strings["Edit Album"] = "Album bearbeiten"; -$a->strings["Show Newest First"] = "Zeige neueste zuerst"; -$a->strings["Show Oldest First"] = "Zeige älteste zuerst"; -$a->strings["View Photo"] = "Foto betrachten"; -$a->strings["Permission denied. Access to this item may be restricted."] = "Zugriff verweigert. Zugriff zu diesem Eintrag könnte eingeschränkt sein."; -$a->strings["Photo not available"] = "Foto nicht verfügbar"; -$a->strings["View photo"] = "Fotos ansehen"; -$a->strings["Edit photo"] = "Foto bearbeiten"; -$a->strings["Use as profile photo"] = "Als Profilbild verwenden"; -$a->strings["Private Message"] = "Private Nachricht"; -$a->strings["View Full Size"] = "Betrachte Originalgröße"; -$a->strings["Tags: "] = "Tags: "; -$a->strings["[Remove any tag]"] = "[Tag entfernen]"; -$a->strings["New album name"] = "Name des neuen Albums"; -$a->strings["Caption"] = "Bildunterschrift"; -$a->strings["Add a Tag"] = "Tag hinzufügen"; -$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"] = "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"; -$a->strings["Do not rotate"] = "Nicht rotieren"; -$a->strings["Rotate CW (right)"] = "Drehen US (rechts)"; -$a->strings["Rotate CCW (left)"] = "Drehen EUS (links)"; -$a->strings["Private photo"] = "Privates Foto"; -$a->strings["Public photo"] = "Öffentliches Foto"; -$a->strings["I like this (toggle)"] = "Ich mag das (toggle)"; -$a->strings["I don't like this (toggle)"] = "Ich mag das nicht (toggle)"; -$a->strings["This is you"] = "Das bist Du"; -$a->strings["Comment"] = "Kommentar"; -$a->strings["Map"] = "Karte"; -$a->strings["Profile deleted."] = "Profil gelöscht."; -$a->strings["Profile-"] = "Profil-"; -$a->strings["New profile created."] = "Neues Profil angelegt."; -$a->strings["Profile unavailable to clone."] = "Profil nicht zum Duplizieren verfügbar."; -$a->strings["Profile Name is required."] = "Profilname ist erforderlich."; -$a->strings["Marital Status"] = "Familienstand"; -$a->strings["Romantic Partner"] = "Romanze"; -$a->strings["Work/Employment"] = "Arbeit / Beschäftigung"; -$a->strings["Religion"] = "Religion"; -$a->strings["Political Views"] = "Politische Ansichten"; -$a->strings["Gender"] = "Geschlecht"; -$a->strings["Sexual Preference"] = "Sexuelle Vorlieben"; -$a->strings["Homepage"] = "Webseite"; -$a->strings["Interests"] = "Interessen"; -$a->strings["Address"] = "Adresse"; -$a->strings["Location"] = "Wohnort"; -$a->strings["Profile updated."] = "Profil aktualisiert."; -$a->strings[" and "] = " und "; -$a->strings["public profile"] = "öffentliches Profil"; -$a->strings["%1\$s changed %2\$s to “%3\$s”"] = "%1\$s hat %2\$s geändert auf “%3\$s”"; -$a->strings[" - Visit %1\$s's %2\$s"] = " – %1\$ss %2\$s besuchen"; -$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s hat folgendes aktualisiert %2\$s, verändert wurde %3\$s."; -$a->strings["Hide contacts and friends:"] = "Kontakte und Freunde verbergen"; -$a->strings["Hide your contact/friend list from viewers of this profile?"] = "Liste der Kontakte vor Betrachtern dieses Profils verbergen?"; -$a->strings["Show more profile fields:"] = "Zeige mehr Profil-Felder:"; -$a->strings["Profile Actions"] = "Profilaktionen"; -$a->strings["Edit Profile Details"] = "Profil bearbeiten"; -$a->strings["Change Profile Photo"] = "Profilbild ändern"; -$a->strings["View this profile"] = "Dieses Profil anzeigen"; -$a->strings["Create a new profile using these settings"] = "Neues Profil anlegen und diese Einstellungen verwenden"; -$a->strings["Clone this profile"] = "Dieses Profil duplizieren"; -$a->strings["Delete this profile"] = "Dieses Profil löschen"; -$a->strings["Basic information"] = "Grundinformationen"; -$a->strings["Profile picture"] = "Profilbild"; -$a->strings["Preferences"] = "Vorlieben"; -$a->strings["Status information"] = "Status Informationen"; -$a->strings["Additional information"] = "Zusätzliche Informationen"; -$a->strings["Relation"] = "Beziehung"; -$a->strings["Your Gender:"] = "Dein Geschlecht:"; -$a->strings["♥ Marital Status:"] = "♥ Beziehungsstatus:"; -$a->strings["Example: fishing photography software"] = "Beispiel: Fischen Fotografie Software"; -$a->strings["Profile Name:"] = "Profilname:"; -$a->strings["This is your public profile.
It may be visible to anybody using the internet."] = "Dies ist Dein öffentliches Profil.
Es könnte für jeden Nutzer des Internets sichtbar sein."; -$a->strings["Your Full Name:"] = "Dein kompletter Name:"; -$a->strings["Title/Description:"] = "Titel/Beschreibung:"; -$a->strings["Street Address:"] = "Adresse:"; -$a->strings["Locality/City:"] = "Wohnort:"; -$a->strings["Region/State:"] = "Region/Bundesstaat:"; -$a->strings["Postal/Zip Code:"] = "Postleitzahl:"; -$a->strings["Country:"] = "Land:"; -$a->strings["Who: (if applicable)"] = "Wer: (falls anwendbar)"; -$a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Beispiele: cathy123, Cathy Williams, cathy@example.com"; -$a->strings["Since [date]:"] = "Seit [Datum]:"; -$a->strings["Tell us about yourself..."] = "Erzähle uns ein bisschen von Dir …"; -$a->strings["Homepage URL:"] = "Adresse der Homepage:"; -$a->strings["Religious Views:"] = "Religiöse Ansichten:"; -$a->strings["Public Keywords:"] = "Öffentliche Schlüsselwörter:"; -$a->strings["(Used for suggesting potential friends, can be seen by others)"] = "(Wird verwendet, um potentielle Kontakte zu finden, kann von Kontakten eingesehen werden)"; -$a->strings["Private Keywords:"] = "Private Schlüsselwörter:"; -$a->strings["(Used for searching profiles, never shown to others)"] = "(Wird für die Suche nach Profilen verwendet und niemals veröffentlicht)"; -$a->strings["Musical interests"] = "Musikalische Interessen"; -$a->strings["Books, literature"] = "Bücher, Literatur"; -$a->strings["Television"] = "Fernsehen"; -$a->strings["Film/dance/culture/entertainment"] = "Filme/Tänze/Kultur/Unterhaltung"; -$a->strings["Hobbies/Interests"] = "Hobbies/Interessen"; -$a->strings["Love/romance"] = "Liebe/Romantik"; -$a->strings["Work/employment"] = "Arbeit/Anstellung"; -$a->strings["School/education"] = "Schule/Ausbildung"; -$a->strings["Contact information and Social Networks"] = "Kontaktinformationen und Soziale Netzwerke"; -$a->strings["Edit/Manage Profiles"] = "Bearbeite/Verwalte Profile"; -$a->strings["This entry was edited"] = "Dieser Beitrag wurde bearbeitet."; -$a->strings["%d comment"] = array( - 0 => "%d Kommentar", - 1 => "%d Kommentare", -); -$a->strings["like"] = "mag ich"; -$a->strings["dislike"] = "mag ich nicht"; -$a->strings["Share this"] = "Weitersagen"; -$a->strings["share"] = "Teilen"; -$a->strings["Bold"] = "Fett"; -$a->strings["Italic"] = "Kursiv"; -$a->strings["Underline"] = "Unterstrichen"; -$a->strings["Quote"] = "Zitat"; -$a->strings["Code"] = "Code"; -$a->strings["Image"] = "Bild"; -$a->strings["Link"] = "Link"; -$a->strings["Video"] = "Video"; -$a->strings["add star"] = "markieren"; -$a->strings["remove star"] = "Markierung entfernen"; -$a->strings["toggle star status"] = "Markierung umschalten"; -$a->strings["starred"] = "markiert"; -$a->strings["add tag"] = "Tag hinzufügen"; -$a->strings["ignore thread"] = "Thread ignorieren"; -$a->strings["unignore thread"] = "Thread nicht mehr ignorieren"; -$a->strings["toggle ignore status"] = "Ignoriert-Status ein-/ausschalten"; -$a->strings["save to folder"] = "In Ordner speichern"; -$a->strings["I will attend"] = "Ich werde teilnehmen"; -$a->strings["I will not attend"] = "Ich werde nicht teilnehmen"; -$a->strings["I might attend"] = "Ich werde eventuell teilnehmen"; -$a->strings["to"] = "zu"; -$a->strings["Wall-to-Wall"] = "Wall-to-Wall"; -$a->strings["via Wall-To-Wall:"] = "via Wall-To-Wall:"; -$a->strings["Invalid request identifier."] = "Invalid request identifier."; -$a->strings["Discard"] = "Verwerfen"; -$a->strings["Show Ignored Requests"] = "Zeige ignorierte Anfragen"; -$a->strings["Hide Ignored Requests"] = "Verberge ignorierte Anfragen"; -$a->strings["Notification type: "] = "Benachrichtigungstyp: "; -$a->strings["Friend Suggestion"] = "Kontaktvorschlag"; -$a->strings["suggested by %s"] = "vorgeschlagen von %s"; -$a->strings["Post a new friend activity"] = "Neue-Kontakt Nachricht senden"; -$a->strings["if applicable"] = "falls anwendbar"; -$a->strings["Claims to be known to you: "] = "Behauptet Dich zu kennen: "; -$a->strings["yes"] = "ja"; -$a->strings["no"] = "nein"; -$a->strings["Shall your connection be bidirectional or not? \"Friend\" implies that you allow to read and you subscribe to their posts. \"Fan/Admirer\" means that you allow to read but you do not want to read theirs. Approve as: "] = "Soll Deine Beziehung beidseitig sein oder nicht? \"Kontakt\" bedeutet, ihr könnt gegenseitig die Beiträge des Anderen lesen dürft. \"Fan/Verehrer\", dass du das lesen deiner Beiträge erlaubst aber nicht die Beiträge der anderen Seite lesen möchtest. Genehmigen als:"; -$a->strings["Shall your connection be bidirectional or not? \"Friend\" implies that you allow to read and you subscribe to their posts. \"Sharer\" means that you allow to read but you do not want to read theirs. Approve as: "] = "Soll Deine Beziehung beidseitig sein oder nicht? \"Freund\" bedeutet, ihr gegenseitig die Beiträge des Anderen lesen dürft. \"Teilenden\", das du das lesen deiner Beiträge erlaubst aber nicht die Beiträge der anderen Seite lesen möchtest. Genehmigen als:"; -$a->strings["Friend"] = "Kontakt"; -$a->strings["Sharer"] = "Teilenden"; -$a->strings["Fan/Admirer"] = "Fan/Verehrer"; -$a->strings["Friend/Connect Request"] = "Kontakt-/Freundschaftsanfrage"; -$a->strings["New Follower"] = "Neuer Bewunderer"; -$a->strings["No introductions."] = "Keine Kontaktanfragen."; -$a->strings["Network Notifications"] = "Netzwerk Benachrichtigungen"; -$a->strings["%s liked %s's post"] = "%s mag %ss Beitrag"; -$a->strings["%s disliked %s's post"] = "%s mag %ss Beitrag nicht"; -$a->strings["%s is now friends with %s"] = "%s ist jetzt mit %s befreundet"; -$a->strings["%s created a new post"] = "%s hat einen neuen Beitrag erstellt"; -$a->strings["%s commented on %s's post"] = "%s hat %ss Beitrag kommentiert"; -$a->strings["No more network notifications."] = "Keine weiteren Netzwerk-Benachrichtigungen."; -$a->strings["Personal Notifications"] = "Persönliche Benachrichtigungen"; -$a->strings["No more personal notifications."] = "Keine weiteren persönlichen Benachrichtigungen"; -$a->strings["Home Notifications"] = "Pinnwand Benachrichtigungen"; -$a->strings["No more home notifications."] = "Keine weiteren Pinnwand-Benachrichtigungen"; -$a->strings["System"] = "System"; +$a->strings["Do you really want to delete this video?"] = "Möchtest Du dieses Video wirklich löschen?"; +$a->strings["Delete Video"] = "Video Löschen"; +$a->strings["No videos selected"] = "Keine Videos ausgewählt"; +$a->strings["Recent Videos"] = "Neueste Videos"; +$a->strings["Upload New Videos"] = "Neues Video hochladen"; $a->strings["via"] = "via"; $a->strings["Repeat the image"] = "Bild wiederholen"; $a->strings["Will repeat your image to fill the background."] = "Wiederholt das Bild um den Hintergrund auszufüllen."; From e374ec2bc8d679202f6ccdaa709b20f63b629824 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Thu, 4 Aug 2016 14:33:08 +0200 Subject: [PATCH 032/352] frio:fix jot - posts with images were not available on wall --- view/theme/frio/js/modal.js | 6 +- view/theme/frio/templates/jot-header.tpl | 2 +- view/theme/frio/templates/jot.tpl | 118 ++++++++++++----------- 3 files changed, 64 insertions(+), 62 deletions(-) diff --git a/view/theme/frio/js/modal.js b/view/theme/frio/js/modal.js index b29b8d4caa..82b1ebdb91 100644 --- a/view/theme/frio/js/modal.js +++ b/view/theme/frio/js/modal.js @@ -234,15 +234,15 @@ function editpost(url) { } var modal = $('#jot-modal').modal(); - url = url + " #profile-jot-form"; + url = url + " #jot-sections"; //var rand_num = random_digits(12); $(".jot-nav .jot-perms-lnk").parent("li").addClass("hidden"); - // For editpost we load the modal html form the edit page. So we would have two jot forms in + // For editpost we load the modal html of "jot-sections" of the edit page. So we would have two jot forms in // the page html. To avoid js conflicts we store the original jot in the variable jotcache. // After closing the modal original jot should be restored at its orginal position in the html structure. - jotcache = $("#jot-content > #profile-jot-form"); + jotcache = $("#jot-content > #jot-sections"); // remove the original Jot as long as the edit Jot is open jotcache.remove(); diff --git a/view/theme/frio/templates/jot-header.tpl b/view/theme/frio/templates/jot-header.tpl index 7c8d502de6..792c1d1a3b 100644 --- a/view/theme/frio/templates/jot-header.tpl +++ b/view/theme/frio/templates/jot-header.tpl @@ -397,7 +397,7 @@ function enableOnUser(){ function jotShow() { var modal = $('#jot-modal').modal(); - jotcache = $("#profile-jot-form"); + jotcache = $("#jot-sections"); modal .find('#jot-modal-content') diff --git a/view/theme/frio/templates/jot.tpl b/view/theme/frio/templates/jot.tpl index 0d88472863..737ba3679d 100644 --- a/view/theme/frio/templates/jot.tpl +++ b/view/theme/frio/templates/jot.tpl @@ -4,7 +4,7 @@
-
+
{{* Note: We need 2 modal close buttons here to bypass a bug in bootstrap. The second is for mobile view. The first one doesnt work with dropdowns. To get a working close button @@ -35,71 +35,73 @@
- -
-
-
- -
- -
- - {{* The hidden input fields which submit important values with the post *}} - - - - - - - - - {{if $notes_cid}} - - {{/if}} -
- {{if $placeholdercategory}} -
- {{/if}} - - {{* The jot text field in which the post text is inserted *}} -
- -
- - -
- +
- + {{* The hidden input fields which submit important values with the post *}} + + + + + + + + + {{if $notes_cid}} + + {{/if}} +
+ {{if $placeholdercategory}} +
+ {{/if}} + + {{* The jot text field in which the post text is inserted *}} +
+ +
+ + + +
+ + + + + {{if $content}}{{/if}}
- +
From dad74e965085a29589f1f6f9c9ba33df493e889e Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Thu, 4 Aug 2016 15:15:43 +0200 Subject: [PATCH 033/352] pubsubpublish is now split into separate calls per entry. --- include/notifier.php | 4 +- include/pubsubpublish.php | 101 ++++++++++++++++++++++---------------- 2 files changed, 60 insertions(+), 45 deletions(-) diff --git a/include/notifier.php b/include/notifier.php index cfe4e18412..0610a4e398 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -642,8 +642,8 @@ function notifier_run(&$argv, &$argc){ if ($h === '[internal]') { // Set push flag for PuSH subscribers to this topic, // they will be notified in queue.php - q("UPDATE `push_subscriber` SET `push` = 1 " . - "WHERE `nickname` = '%s'", dbesc($owner['nickname'])); + q("UPDATE `push_subscriber` SET `push` = 1 ". + "WHERE `nickname` = '%s' AND `push` = 0", dbesc($owner['nickname'])); logger('Activating internal PuSH for item '.$item_id, LOGGER_DEBUG); diff --git a/include/pubsubpublish.php b/include/pubsubpublish.php index 625eefc261..85637facb2 100644 --- a/include/pubsubpublish.php +++ b/include/pubsubpublish.php @@ -2,60 +2,57 @@ require_once("boot.php"); require_once("include/ostatus.php"); -function handle_pubsubhubbub() { +use \Friendica\Core\Config; +use \Friendica\Core\PConfig; + +function handle_pubsubhubbub($id) { global $a, $db; - logger('start'); + $r = q("SELECT * FROM `push_subscriber` WHERE `id` = %d", intval($id)); + if (!$r) + return; + else + $rr = $r[0]; - // We'll push to each subscriber that has push > 0, - // i.e. there has been an update (set in notifier.php). + logger("Generate feed of user ".$rr['nickname']." to ".$rr['callback_url']." - last updated ".$rr['last_update'], LOGGER_DEBUG); - $r = q("SELECT * FROM `push_subscriber` WHERE `push` > 0"); + $params = ostatus::feed($a, $rr['nickname'], $rr['last_update']); + $hmac_sig = hash_hmac("sha1", $params, $rr['secret']); - foreach($r as $rr) { + $headers = array("Content-type: application/atom+xml", + sprintf("Link: <%s>;rel=hub,<%s>;rel=self", + $a->get_baseurl().'/pubsubhubbub', + $rr['topic']), + "X-Hub-Signature: sha1=".$hmac_sig); - logger("Generate feed for user ".$rr['nickname']." - last updated ".$rr['last_update'], LOGGER_DEBUG); + logger('POST '.print_r($headers, true)."\n".$params, LOGGER_DEBUG); - $params = ostatus::feed($a, $rr['nickname'], $rr['last_update']); - $hmac_sig = hash_hmac("sha1", $params, $rr['secret']); + post_url($rr['callback_url'], $params, $headers); + $ret = $a->get_curl_code(); - $headers = array("Content-type: application/atom+xml", - sprintf("Link: <%s>;rel=hub,<%s>;rel=self", - $a->get_baseurl().'/pubsubhubbub', - $rr['topic']), - "X-Hub-Signature: sha1=".$hmac_sig); + if ($ret >= 200 && $ret <= 299) { + logger('successfully pushed to '.$rr['callback_url']); - logger('POST '.print_r($headers, true)."\n".$params, LOGGER_DEBUG); + // set last_update to "now", and reset push=0 + $date_now = datetime_convert('UTC','UTC','now','Y-m-d H:i:s'); + q("UPDATE `push_subscriber` SET `push` = 0, last_update = '%s' WHERE id = %d", + dbesc($date_now), + intval($rr['id'])); - post_url($rr['callback_url'], $params, $headers); - $ret = $a->get_curl_code(); + } else { + logger('error when pushing to '.$rr['callback_url'].' HTTP: '.$ret); - if ($ret >= 200 && $ret <= 299) { - logger('successfully pushed to '.$rr['callback_url']); + // we use the push variable also as a counter, if we failed we + // increment this until some upper limit where we give up + $new_push = intval($rr['push']) + 1; - // set last_update to "now", and reset push=0 - $date_now = datetime_convert('UTC','UTC','now','Y-m-d H:i:s'); - q("UPDATE `push_subscriber` SET `push` = 0, last_update = '%s' WHERE id = %d", - dbesc($date_now), - intval($rr['id'])); + if ($new_push > 30) // OK, let's give up + $new_push = 0; - } else { - logger('error when pushing to '.$rr['callback_url'].' HTTP: '.$ret); - - // we use the push variable also as a counter, if we failed we - // increment this until some upper limit where we give up - $new_push = intval($rr['push']) + 1; - - if ($new_push > 30) // OK, let's give up - $new_push = 0; - - q("UPDATE `push_subscriber` SET `push` = %d WHERE id = %d", - $new_push, - intval($rr['id'])); - } + q("UPDATE `push_subscriber` SET `push` = %d WHERE id = %d", + $new_push, + intval($rr['id'])); } - - logger('done'); } @@ -89,10 +86,28 @@ function pubsubpublish_run(&$argv, &$argc){ if($argc > 1) $pubsubpublish_id = intval($argv[1]); - else - $pubsubpublish_id = 0; + else { + // We'll push to each subscriber that has push > 0, + // i.e. there has been an update (set in notifier.php). + $r = q("SELECT `id`, `callback_url` FROM `push_subscriber` WHERE `push` > 0"); - handle_pubsubhubbub(); + // Use the delivery interval that is also used for the notifier + $interval = Config::get("system", "delivery_interval", 2); + + // If we are using the worker we don't need a delivery interval + if (get_config("system", "worker")) + $interval = false; + + foreach($r as $rr) { + logger("Publish feed to ".$rr["callback_url"], LOGGER_DEBUG); + proc_run(PRIORITY_HIGH, 'include/pubsubpublish.php', $rr["id"]); + + if($interval) + @time_sleep_until(microtime(true) + (float) $interval); + } + } + + handle_pubsubhubbub($pubsubpublish_id); return; From 074ae59f49ddaae9d699a1e32537cb71c2c7590e Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Thu, 4 Aug 2016 15:33:15 +0200 Subject: [PATCH 034/352] Reschedule killed processes at the beginning of the queue. --- include/poller.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/include/poller.php b/include/poller.php index dfc3b90cf0..578f1424eb 100644 --- a/include/poller.php +++ b/include/poller.php @@ -235,9 +235,10 @@ function poller_kill_stale_workers() { logger("Worker process ".$pid["pid"]." took more than 3 hours. It will be killed now."); posix_kill($pid["pid"], SIGTERM); - // Question: If a process is stale: Should we remove it or should we reschedule it? - // By now we rescheduling it. It's maybe not the wisest decision? - q("UPDATE `workerqueue` SET `executed` = '0000-00-00 00:00:00', `pid` = 0 WHERE `pid` = %d", + // We killed the stale process. + // To avoid a blocking situation we reschedule the process at the beginning of the queue. + q("UPDATE `workerqueue` SET `executed` = '0000-00-00 00:00:00', `created` = '%s', `pid` = 0 WHERE `pid` = %d", + dbesc(datetime_convert()), intval($pid["pid"])); } else logger("Worker process ".$pid["pid"]." now runs for ".round($duration)." minutes. That's okay.", LOGGER_DEBUG); From 0411eb289e967dcc0dbd17f4dcba512c5903082e Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Thu, 4 Aug 2016 15:41:32 +0200 Subject: [PATCH 035/352] Lower the priority for stale processes --- include/poller.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/poller.php b/include/poller.php index 578f1424eb..73950e35b2 100644 --- a/include/poller.php +++ b/include/poller.php @@ -237,8 +237,11 @@ function poller_kill_stale_workers() { // We killed the stale process. // To avoid a blocking situation we reschedule the process at the beginning of the queue. - q("UPDATE `workerqueue` SET `executed` = '0000-00-00 00:00:00', `created` = '%s', `pid` = 0 WHERE `pid` = %d", + // Additionally we are lowering the priority. + q("UPDATE `workerqueue` SET `executed` = '0000-00-00 00:00:00', `created` = '%s', + `priority` = %d, `pid` = 0 WHERE `pid` = %d", dbesc(datetime_convert()), + intval(PRIORITY_LOW), intval($pid["pid"])); } else logger("Worker process ".$pid["pid"]." now runs for ".round($duration)." minutes. That's okay.", LOGGER_DEBUG); From 94d297155cb78231faf78ce68013edd09113865a Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Thu, 4 Aug 2016 19:59:45 +0200 Subject: [PATCH 036/352] frio:implement comment highlighting with jquery.color --- .../frameworks/jquery-color/jquery.color.js | 674 ++++++++++++++++++ .../frio/templates/threaded_conversation.tpl | 10 +- 2 files changed, 678 insertions(+), 6 deletions(-) create mode 100644 view/theme/frio/frameworks/jquery-color/jquery.color.js diff --git a/view/theme/frio/frameworks/jquery-color/jquery.color.js b/view/theme/frio/frameworks/jquery-color/jquery.color.js new file mode 100644 index 0000000000..c933f7761d --- /dev/null +++ b/view/theme/frio/frameworks/jquery-color/jquery.color.js @@ -0,0 +1,674 @@ +/*! + * jQuery Color Animations v@VERSION + * https://github.com/jquery/jquery-color + * + * Copyright jQuery Foundation and other contributors + * Released under the MIT license. + * http://jquery.org/license + * + * Date: @DATE + */ + +(function( root, factory ) { + if ( typeof define === "function" && define.amd) { + + // AMD. Register as an anonymous module. + define( [ "jquery" ], factory); + } else if ( typeof exports === "object" ) { + module.exports = factory( require( "jquery" ) ); + } else { + factory( root.jQuery ); + } +})( this, function( jQuery, undefined ) { + + var stepHooks = "backgroundColor borderBottomColor borderLeftColor borderRightColor borderTopColor color columnRuleColor outlineColor textDecorationColor textEmphasisColor", + + // plusequals test for += 100 -= 100 + rplusequals = /^([\-+])=\s*(\d+\.?\d*)/, + // a set of RE's that can match strings and generate color tuples. + stringParsers = [{ + re: /rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/, + parse: function( execResult ) { + return [ + execResult[ 1 ], + execResult[ 2 ], + execResult[ 3 ], + execResult[ 4 ] + ]; + } + }, { + re: /rgba?\(\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/, + parse: function( execResult ) { + return [ + execResult[ 1 ] * 2.55, + execResult[ 2 ] * 2.55, + execResult[ 3 ] * 2.55, + execResult[ 4 ] + ]; + } + }, { + // this regex ignores A-F because it's compared against an already lowercased string + re: /#([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})/, + parse: function( execResult ) { + return [ + parseInt( execResult[ 1 ], 16 ), + parseInt( execResult[ 2 ], 16 ), + parseInt( execResult[ 3 ], 16 ) + ]; + } + }, { + // this regex ignores A-F because it's compared against an already lowercased string + re: /#([a-f0-9])([a-f0-9])([a-f0-9])/, + parse: function( execResult ) { + return [ + parseInt( execResult[ 1 ] + execResult[ 1 ], 16 ), + parseInt( execResult[ 2 ] + execResult[ 2 ], 16 ), + parseInt( execResult[ 3 ] + execResult[ 3 ], 16 ) + ]; + } + }, { + re: /hsla?\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/, + space: "hsla", + parse: function( execResult ) { + return [ + execResult[ 1 ], + execResult[ 2 ] / 100, + execResult[ 3 ] / 100, + execResult[ 4 ] + ]; + } + }], + + // jQuery.Color( ) + color = jQuery.Color = function( color, green, blue, alpha ) { + return new jQuery.Color.fn.parse( color, green, blue, alpha ); + }, + spaces = { + rgba: { + props: { + red: { + idx: 0, + type: "byte" + }, + green: { + idx: 1, + type: "byte" + }, + blue: { + idx: 2, + type: "byte" + } + } + }, + + hsla: { + props: { + hue: { + idx: 0, + type: "degrees" + }, + saturation: { + idx: 1, + type: "percent" + }, + lightness: { + idx: 2, + type: "percent" + } + } + } + }, + propTypes = { + "byte": { + floor: true, + max: 255 + }, + "percent": { + max: 1 + }, + "degrees": { + mod: 360, + floor: true + } + }, + support = color.support = {}, + + // element for support tests + supportElem = jQuery( "

" )[ 0 ], + + // colors = jQuery.Color.names + colors, + + // local aliases of functions called often + each = jQuery.each; + +// determine rgba support immediately +supportElem.style.cssText = "background-color:rgba(1,1,1,.5)"; +support.rgba = supportElem.style.backgroundColor.indexOf( "rgba" ) > -1; + +// define cache name and alpha properties +// for rgba and hsla spaces +each( spaces, function( spaceName, space ) { + space.cache = "_" + spaceName; + space.props.alpha = { + idx: 3, + type: "percent", + def: 1 + }; +}); + +function clamp( value, prop, allowEmpty ) { + var type = propTypes[ prop.type ] || {}; + + if ( value == null ) { + return (allowEmpty || !prop.def) ? null : prop.def; + } + + // ~~ is an short way of doing floor for positive numbers + value = type.floor ? ~~value : parseFloat( value ); + + // IE will pass in empty strings as value for alpha, + // which will hit this case + if ( isNaN( value ) ) { + return prop.def; + } + + if ( type.mod ) { + // we add mod before modding to make sure that negatives values + // get converted properly: -10 -> 350 + return (value + type.mod) % type.mod; + } + + // for now all property types without mod have min and max + return 0 > value ? 0 : type.max < value ? type.max : value; +} + +function stringParse( string ) { + var inst = color(), + rgba = inst._rgba = []; + + string = string.toLowerCase(); + + each( stringParsers, function( i, parser ) { + var parsed, + match = parser.re.exec( string ), + values = match && parser.parse( match ), + spaceName = parser.space || "rgba"; + + if ( values ) { + parsed = inst[ spaceName ]( values ); + + // if this was an rgba parse the assignment might happen twice + // oh well.... + inst[ spaces[ spaceName ].cache ] = parsed[ spaces[ spaceName ].cache ]; + rgba = inst._rgba = parsed._rgba; + + // exit each( stringParsers ) here because we matched + return false; + } + }); + + // Found a stringParser that handled it + if ( rgba.length ) { + + // if this came from a parsed string, force "transparent" when alpha is 0 + // chrome, (and maybe others) return "transparent" as rgba(0,0,0,0) + if ( rgba.join() === "0,0,0,0" ) { + jQuery.extend( rgba, colors.transparent ); + } + return inst; + } + + // named colors + return colors[ string ]; +} + +color.fn = jQuery.extend( color.prototype, { + parse: function( red, green, blue, alpha ) { + if ( red === undefined ) { + this._rgba = [ null, null, null, null ]; + return this; + } + if ( red.jquery || red.nodeType ) { + red = jQuery( red ).css( green ); + green = undefined; + } + + var inst = this, + type = jQuery.type( red ), + rgba = this._rgba = []; + + // more than 1 argument specified - assume ( red, green, blue, alpha ) + if ( green !== undefined ) { + red = [ red, green, blue, alpha ]; + type = "array"; + } + + if ( type === "string" ) { + return this.parse( stringParse( red ) || colors._default ); + } + + if ( type === "array" ) { + each( spaces.rgba.props, function( key, prop ) { + rgba[ prop.idx ] = clamp( red[ prop.idx ], prop ); + }); + return this; + } + + if ( type === "object" ) { + if ( red instanceof color ) { + each( spaces, function( spaceName, space ) { + if ( red[ space.cache ] ) { + inst[ space.cache ] = red[ space.cache ].slice(); + } + }); + } else { + each( spaces, function( spaceName, space ) { + var cache = space.cache; + each( space.props, function( key, prop ) { + + // if the cache doesn't exist, and we know how to convert + if ( !inst[ cache ] && space.to ) { + + // if the value was null, we don't need to copy it + // if the key was alpha, we don't need to copy it either + if ( key === "alpha" || red[ key ] == null ) { + return; + } + inst[ cache ] = space.to( inst._rgba ); + } + + // this is the only case where we allow nulls for ALL properties. + // call clamp with alwaysAllowEmpty + inst[ cache ][ prop.idx ] = clamp( red[ key ], prop, true ); + }); + + // everything defined but alpha? + if ( inst[ cache ] && jQuery.inArray( null, inst[ cache ].slice( 0, 3 ) ) < 0 ) { + // use the default of 1 + inst[ cache ][ 3 ] = 1; + if ( space.from ) { + inst._rgba = space.from( inst[ cache ] ); + } + } + }); + } + return this; + } + }, + is: function( compare ) { + var is = color( compare ), + same = true, + inst = this; + + each( spaces, function( _, space ) { + var localCache, + isCache = is[ space.cache ]; + if (isCache) { + localCache = inst[ space.cache ] || space.to && space.to( inst._rgba ) || []; + each( space.props, function( _, prop ) { + if ( isCache[ prop.idx ] != null ) { + same = ( isCache[ prop.idx ] === localCache[ prop.idx ] ); + return same; + } + }); + } + return same; + }); + return same; + }, + _space: function() { + var used = [], + inst = this; + each( spaces, function( spaceName, space ) { + if ( inst[ space.cache ] ) { + used.push( spaceName ); + } + }); + return used.pop(); + }, + transition: function( other, distance ) { + var end = color( other ), + spaceName = end._space(), + space = spaces[ spaceName ], + startColor = this.alpha() === 0 ? color( "transparent" ) : this, + start = startColor[ space.cache ] || space.to( startColor._rgba ), + result = start.slice(); + + end = end[ space.cache ]; + each( space.props, function( key, prop ) { + var index = prop.idx, + startValue = start[ index ], + endValue = end[ index ], + type = propTypes[ prop.type ] || {}; + + // if null, don't override start value + if ( endValue === null ) { + return; + } + // if null - use end + if ( startValue === null ) { + result[ index ] = endValue; + } else { + if ( type.mod ) { + if ( endValue - startValue > type.mod / 2 ) { + startValue += type.mod; + } else if ( startValue - endValue > type.mod / 2 ) { + startValue -= type.mod; + } + } + result[ index ] = clamp( ( endValue - startValue ) * distance + startValue, prop ); + } + }); + return this[ spaceName ]( result ); + }, + blend: function( opaque ) { + // if we are already opaque - return ourself + if ( this._rgba[ 3 ] === 1 ) { + return this; + } + + var rgb = this._rgba.slice(), + a = rgb.pop(), + blend = color( opaque )._rgba; + + return color( jQuery.map( rgb, function( v, i ) { + return ( 1 - a ) * blend[ i ] + a * v; + })); + }, + toRgbaString: function() { + var prefix = "rgba(", + rgba = jQuery.map( this._rgba, function( v, i ) { + return v == null ? ( i > 2 ? 1 : 0 ) : v; + }); + + if ( rgba[ 3 ] === 1 ) { + rgba.pop(); + prefix = "rgb("; + } + + return prefix + rgba.join() + ")"; + }, + toHslaString: function() { + var prefix = "hsla(", + hsla = jQuery.map( this.hsla(), function( v, i ) { + if ( v == null ) { + v = i > 2 ? 1 : 0; + } + + // catch 1 and 2 + if ( i && i < 3 ) { + v = Math.round( v * 100 ) + "%"; + } + return v; + }); + + if ( hsla[ 3 ] === 1 ) { + hsla.pop(); + prefix = "hsl("; + } + return prefix + hsla.join() + ")"; + }, + toHexString: function( includeAlpha ) { + var rgba = this._rgba.slice(), + alpha = rgba.pop(); + + if ( includeAlpha ) { + rgba.push( ~~( alpha * 255 ) ); + } + + return "#" + jQuery.map( rgba, function( v ) { + + // default to 0 when nulls exist + v = ( v || 0 ).toString( 16 ); + return v.length === 1 ? "0" + v : v; + }).join(""); + }, + toString: function() { + return this._rgba[ 3 ] === 0 ? "transparent" : this.toRgbaString(); + } +}); +color.fn.parse.prototype = color.fn; + +// hsla conversions adapted from: +// https://code.google.com/p/maashaack/source/browse/packages/graphics/trunk/src/graphics/colors/HUE2RGB.as?r=5021 + +function hue2rgb( p, q, h ) { + h = ( h + 1 ) % 1; + if ( h * 6 < 1 ) { + return p + (q - p) * h * 6; + } + if ( h * 2 < 1) { + return q; + } + if ( h * 3 < 2 ) { + return p + (q - p) * ((2/3) - h) * 6; + } + return p; +} + +spaces.hsla.to = function ( rgba ) { + if ( rgba[ 0 ] == null || rgba[ 1 ] == null || rgba[ 2 ] == null ) { + return [ null, null, null, rgba[ 3 ] ]; + } + var r = rgba[ 0 ] / 255, + g = rgba[ 1 ] / 255, + b = rgba[ 2 ] / 255, + a = rgba[ 3 ], + max = Math.max( r, g, b ), + min = Math.min( r, g, b ), + diff = max - min, + add = max + min, + l = add * 0.5, + h, s; + + if ( min === max ) { + h = 0; + } else if ( r === max ) { + h = ( 60 * ( g - b ) / diff ) + 360; + } else if ( g === max ) { + h = ( 60 * ( b - r ) / diff ) + 120; + } else { + h = ( 60 * ( r - g ) / diff ) + 240; + } + + // chroma (diff) == 0 means greyscale which, by definition, saturation = 0% + // otherwise, saturation is based on the ratio of chroma (diff) to lightness (add) + if ( diff === 0 ) { + s = 0; + } else if ( l <= 0.5 ) { + s = diff / add; + } else { + s = diff / ( 2 - add ); + } + return [ Math.round(h) % 360, s, l, a == null ? 1 : a ]; +}; + +spaces.hsla.from = function ( hsla ) { + if ( hsla[ 0 ] == null || hsla[ 1 ] == null || hsla[ 2 ] == null ) { + return [ null, null, null, hsla[ 3 ] ]; + } + var h = hsla[ 0 ] / 360, + s = hsla[ 1 ], + l = hsla[ 2 ], + a = hsla[ 3 ], + q = l <= 0.5 ? l * ( 1 + s ) : l + s - l * s, + p = 2 * l - q; + + return [ + Math.round( hue2rgb( p, q, h + ( 1 / 3 ) ) * 255 ), + Math.round( hue2rgb( p, q, h ) * 255 ), + Math.round( hue2rgb( p, q, h - ( 1 / 3 ) ) * 255 ), + a + ]; +}; + + +each( spaces, function( spaceName, space ) { + var props = space.props, + cache = space.cache, + to = space.to, + from = space.from; + + // makes rgba() and hsla() + color.fn[ spaceName ] = function( value ) { + + // generate a cache for this space if it doesn't exist + if ( to && !this[ cache ] ) { + this[ cache ] = to( this._rgba ); + } + if ( value === undefined ) { + return this[ cache ].slice(); + } + + var ret, + type = jQuery.type( value ), + arr = ( type === "array" || type === "object" ) ? value : arguments, + local = this[ cache ].slice(); + + each( props, function( key, prop ) { + var val = arr[ type === "object" ? key : prop.idx ]; + if ( val == null ) { + val = local[ prop.idx ]; + } + local[ prop.idx ] = clamp( val, prop ); + }); + + if ( from ) { + ret = color( from( local ) ); + ret[ cache ] = local; + return ret; + } else { + return color( local ); + } + }; + + // makes red() green() blue() alpha() hue() saturation() lightness() + each( props, function( key, prop ) { + // alpha is included in more than one space + if ( color.fn[ key ] ) { + return; + } + color.fn[ key ] = function( value ) { + var vtype = jQuery.type( value ), + fn = ( key === "alpha" ? ( this._hsla ? "hsla" : "rgba" ) : spaceName ), + local = this[ fn ](), + cur = local[ prop.idx ], + match; + + if ( vtype === "undefined" ) { + return cur; + } + + if ( vtype === "function" ) { + value = value.call( this, cur ); + vtype = jQuery.type( value ); + } + if ( value == null && prop.empty ) { + return this; + } + if ( vtype === "string" ) { + match = rplusequals.exec( value ); + if ( match ) { + value = cur + parseFloat( match[ 2 ] ) * ( match[ 1 ] === "+" ? 1 : -1 ); + } + } + local[ prop.idx ] = value; + return this[ fn ]( local ); + }; + }); +}); + +// add cssHook and .fx.step function for each named hook. +// accept a space separated string of properties +color.hook = function( hook ) { + var hooks = hook.split( " " ); + each( hooks, function( i, hook ) { + jQuery.cssHooks[ hook ] = { + set: function( elem, value ) { + var parsed, curElem, + backgroundColor = ""; + + if ( value !== "transparent" && ( jQuery.type( value ) !== "string" || ( parsed = stringParse( value ) ) ) ) { + value = color( parsed || value ); + if ( !support.rgba && value._rgba[ 3 ] !== 1 ) { + curElem = hook === "backgroundColor" ? elem.parentNode : elem; + while ( + (backgroundColor === "" || backgroundColor === "transparent") && + curElem && curElem.style + ) { + try { + backgroundColor = jQuery.css( curElem, "backgroundColor" ); + curElem = curElem.parentNode; + } catch ( e ) { + } + } + + value = value.blend( backgroundColor && backgroundColor !== "transparent" ? + backgroundColor : + "_default" ); + } + + value = value.toRgbaString(); + } + try { + elem.style[ hook ] = value; + } catch( e ) { + // wrapped to prevent IE from throwing errors on "invalid" values like 'auto' or 'inherit' + } + } + }; + jQuery.fx.step[ hook ] = function( fx ) { + if ( !fx.colorInit ) { + fx.start = color( fx.elem, hook ); + fx.end = color( fx.end ); + fx.colorInit = true; + } + jQuery.cssHooks[ hook ].set( fx.elem, fx.start.transition( fx.end, fx.pos ) ); + }; + }); + +}; + +color.hook( stepHooks ); + +jQuery.cssHooks.borderColor = { + expand: function( value ) { + var expanded = {}; + + each( [ "Top", "Right", "Bottom", "Left" ], function( i, part ) { + expanded[ "border" + part + "Color" ] = value; + }); + return expanded; + } +}; + +// Basic color names only. +// Usage of any of the other color names requires adding yourself or including +// jquery.color.svg-names.js. +colors = jQuery.Color.names = { + // 4.1. Basic color keywords + aqua: "#00ffff", + black: "#000000", + blue: "#0000ff", + fuchsia: "#ff00ff", + gray: "#808080", + green: "#008000", + lime: "#00ff00", + maroon: "#800000", + navy: "#000080", + olive: "#808000", + purple: "#800080", + red: "#ff0000", + silver: "#c0c0c0", + teal: "#008080", + white: "#ffffff", + yellow: "#ffff00", + + // 4.2.3. "transparent" color keyword + transparent: [ null, null, null, 0 ], + + _default: "#ffffff" +}; + +}); diff --git a/view/theme/frio/templates/threaded_conversation.tpl b/view/theme/frio/templates/threaded_conversation.tpl index b94155338d..3746ba0324 100644 --- a/view/theme/frio/templates/threaded_conversation.tpl +++ b/view/theme/frio/templates/threaded_conversation.tpl @@ -1,3 +1,5 @@ + + {{$live_update}} {{foreach $threads as $thread}} @@ -23,12 +25,8 @@ {{/if}} {{if $mode == display}} From 3921113e5c8e2e07cb0a7af44f184d83a97dd1dc Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Thu, 4 Aug 2016 21:53:22 +0200 Subject: [PATCH 037/352] photos - include paginate into the templates - provide a photo_album.tpl for frio --- mod/photos.php | 8 +++--- view/templates/photo_album.tpl | 2 ++ view/templates/photos_recent.tpl | 2 ++ view/theme/frio/css/style.css | 7 ++++++ view/theme/frio/templates/photo_album.tpl | 28 +++++++++++++++++++++ view/theme/frio/templates/photos_recent.tpl | 24 +++++++++++------- 6 files changed, 57 insertions(+), 14 deletions(-) create mode 100644 view/theme/frio/templates/photo_album.tpl diff --git a/mod/photos.php b/mod/photos.php index ec71cc09d8..a191dcf071 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -1307,11 +1307,10 @@ function photos_content(&$a) { '$can_post' => $can_post, '$upload' => array(t('Upload New Photos'), 'photos/' . $a->data['user']['nickname'] . '/upload/' . bin2hex($album)), '$order' => $order, - '$edit' => $edit + '$edit' => $edit, + '$paginate' => paginate($a), )); - $o .= paginate($a); - return $o; } @@ -1888,10 +1887,9 @@ function photos_content(&$a) { '$can_post' => $can_post, '$upload' => array(t('Upload New Photos'), 'photos/'.$a->data['user']['nickname'].'/upload'), '$photos' => $photos, + '$paginate' => paginate($a), )); - - $o .= paginate($a); return $o; } diff --git a/view/templates/photo_album.tpl b/view/templates/photo_album.tpl index 770eaf14cf..5416066cf0 100644 --- a/view/templates/photo_album.tpl +++ b/view/templates/photo_album.tpl @@ -17,3 +17,5 @@

{{/foreach}} + +{{$paginate}} diff --git a/view/templates/photos_recent.tpl b/view/templates/photos_recent.tpl index 614e76e245..19456187bc 100644 --- a/view/templates/photos_recent.tpl +++ b/view/templates/photos_recent.tpl @@ -10,3 +10,5 @@ {{/foreach}}
+ +{{$paginate}} diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index 773a2f305c..fbe002b17b 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -2020,6 +2020,13 @@ ul li:hover .contact-wrapper a.contact-action-link:hover { #prvmail-end { clear:both; } +/* photos */ +.photo-album-actions { + margin-bottom: 10px; +} +.photo-album-actions .photos-order-link { + float: right; +} /* poke */ #poke-desc { margin: 5px 0 30px; diff --git a/view/theme/frio/templates/photo_album.tpl b/view/theme/frio/templates/photo_album.tpl new file mode 100644 index 0000000000..1afe4c8853 --- /dev/null +++ b/view/theme/frio/templates/photo_album.tpl @@ -0,0 +1,28 @@ + +
+ +

{{$album}}

+ +
+ {{if $can_post}} + {{$upload.0}} + {{/if}} + {{if $can_post && $edit}} • {{/if}} + {{if $edit}} + {{$edit.0}} + {{/if}} + {{$order.0}} +
+
+ +
+ {{foreach $photos as $photo}} + {{include file="photo_top.tpl"}} + {{/foreach}} + +
+ + {{$paginate}} +
+ + diff --git a/view/theme/frio/templates/photos_recent.tpl b/view/theme/frio/templates/photos_recent.tpl index c8769c9ef5..683ef544a3 100644 --- a/view/theme/frio/templates/photos_recent.tpl +++ b/view/theme/frio/templates/photos_recent.tpl @@ -1,14 +1,20 @@ -

{{$title}}

-{{if $can_post}} -{{$upload.0}} -{{/if}} +
-
-{{foreach $photos as $photo}} - {{include file="photo_top.tpl"}} -{{/foreach}} +

{{$title}}

+ + {{if $can_post}} + {{$upload.0}} + {{/if}} + +
+ {{foreach $photos as $photo}} + {{include file="photo_top.tpl"}} + {{/foreach}} +
+
+ + {{$paginate}}
-
From a5a28d11fc29c12d57361b1d2875c6d60643db39 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Fri, 5 Aug 2016 20:17:06 +0200 Subject: [PATCH 038/352] frio - provide mobile login/register buttons for mobile view --- view/theme/frio/css/style.css | 7 +++++++ view/theme/frio/templates/nav.tpl | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index fbe002b17b..bd2cf90ff6 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -108,6 +108,10 @@ a#item-delete-selected { display: none; } +#toggle_mobile_link { + display: none; +} + /* * Overwriting and Extend Bootstrap */ @@ -510,6 +514,9 @@ nav.navbar a { #topbar-first .btn-enter:hover { background-color: #89a2b0 } +.navbar-fixed-top ul.nav.navbar-nav.navbar-right { + display: flex; +} /* Notification Menu */ diff --git a/view/theme/frio/templates/nav.tpl b/view/theme/frio/templates/nav.tpl index a72a29a388..94f91bb4eb 100644 --- a/view/theme/frio/templates/nav.tpl +++ b/view/theme/frio/templates/nav.tpl @@ -231,13 +231,13 @@ {{if $nav.userinfo == ''}}
+ + From c1555b623a2993c65a3dfde1a5f8294fb919bf99 Mon Sep 17 00:00:00 2001 From: rabuzarus Date: Fri, 26 Aug 2016 15:47:45 +0200 Subject: [PATCH 097/352] best_link_url: don't use redirect for pending contacts --- include/conversation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/conversation.php b/include/conversation.php index 0340ad3e4a..9d7b474af9 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -887,7 +887,7 @@ function best_link_url($item,&$sparkle,$ssl_state = false) { $clean_url = normalise_link($item['author-link']); if (local_user()) { - $r = q("SELECT `id` FROM `contact` WHERE `network` = '%s' AND `uid` = %d AND `nurl` = '%s' LIMIT 1", + $r = q("SELECT `id` FROM `contact` WHERE `network` = '%s' AND `uid` = %d AND `nurl` = '%s' AND NOT `pending` LIMIT 1", dbesc(NETWORK_DFRN), intval(local_user()), dbesc(normalise_link($clean_url))); if ($r) { $best_url = 'redir/'.$r[0]['id']; From a156d59e2a1c5ca26337a156035d55e40a712e52 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 27 Aug 2016 19:50:19 +0200 Subject: [PATCH 098/352] dbstructure: Set the version when updating manually --- include/dbstructure.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/dbstructure.php b/include/dbstructure.php index bd35d0974a..54f16a91d4 100644 --- a/include/dbstructure.php +++ b/include/dbstructure.php @@ -1071,6 +1071,7 @@ function db_definition() { "indexes" => array( "PRIMARY" => array("id"), "uid" => array("uid"), + "uid_profile" => array("uid", "profile"), "resource-id" => array("resource-id"), "guid" => array("guid"), ) @@ -1453,6 +1454,7 @@ function dbstructure_run(&$argv, &$argc) { switch ($argv[1]) { case "update": update_structure(true, true); + set_config('system','build',DB_UPDATE_VERSION); return; case "dumpsql": print_structure(db_definition()); From e46dae39379eb2dc78028cdc70535ccc6a6cb07c Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 27 Aug 2016 19:53:09 +0200 Subject: [PATCH 099/352] Removed some accidentally written code --- include/dbstructure.php | 1 - 1 file changed, 1 deletion(-) diff --git a/include/dbstructure.php b/include/dbstructure.php index 54f16a91d4..0236f57781 100644 --- a/include/dbstructure.php +++ b/include/dbstructure.php @@ -1071,7 +1071,6 @@ function db_definition() { "indexes" => array( "PRIMARY" => array("id"), "uid" => array("uid"), - "uid_profile" => array("uid", "profile"), "resource-id" => array("resource-id"), "guid" => array("guid"), ) From 6a167cf8b19eed41693eca752a3b1585cdc3a31d Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 27 Aug 2016 21:05:38 +0000 Subject: [PATCH 100/352] Prevent lowest priority calls from never being called --- include/cron.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/cron.php b/include/cron.php index 6afbeca1bd..3f28e493cf 100644 --- a/include/cron.php +++ b/include/cron.php @@ -70,7 +70,7 @@ function cron_run(&$argv, &$argc){ // run queue delivery process in the background - proc_run(PRIORITY_LOW,"include/queue.php"); + proc_run(PRIORITY_NEGLIGIBLE,"include/queue.php"); // run the process to discover global contacts in the background From 41613ec55df11d6e514ca4c5f207f81cf9cf48f2 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Mon, 29 Aug 2016 18:40:40 +0000 Subject: [PATCH 101/352] Bugfix: Fixed two bad sql queries --- include/event.php | 2 +- include/threads.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/event.php b/include/event.php index 98307e23e1..a68e1c4626 100644 --- a/include/event.php +++ b/include/event.php @@ -293,7 +293,7 @@ function event_store($arr) { `location` = '%s', `type` = '%s', `adjust` = %d, - `nofinish` = %d, + `nofinish` = %d WHERE `id` = %d AND `uid` = %d", dbesc($arr['edited']), diff --git a/include/threads.php b/include/threads.php index 0b2b26e8d2..2e02e7ada3 100644 --- a/include/threads.php +++ b/include/threads.php @@ -176,7 +176,7 @@ function delete_thread($itemid, $itemuri = "") { intval($item["uid"]) ); if (!count($r)) { - $r = q("DELETE FROM `item` WHERE `uri` = '%s' AND `uid` = 0)", + $r = q("DELETE FROM `item` WHERE `uri` = '%s' AND `uid` = 0", dbesc($itemuri) ); logger("delete_thread: Deleted shadow for item ".$itemuri." - ".print_r($result, true), LOGGER_DEBUG); From aedd2cfa6096cab93d32ac828c7d25d7030d29f4 Mon Sep 17 00:00:00 2001 From: rabuzarus Date: Wed, 31 Aug 2016 13:49:24 +0200 Subject: [PATCH 102/352] Update identity.php --- include/identity.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/identity.php b/include/identity.php index 9b75ebccdb..91b31c0784 100644 --- a/include/identity.php +++ b/include/identity.php @@ -71,8 +71,8 @@ function profile_load(&$a, $nickname, $profile = 0, $profiledata = array()) { $a->page['title'] = $a->profile['name'] . " @ " . $a->config['sitename']; -// if (!$profiledata) -// $_SESSION['theme'] = $a->profile['theme']; + if (!$profiledata && !get_pconfig(local_user(),'system','always_my_theme')) + $_SESSION['theme'] = $a->profile['theme']; $_SESSION['mobile-theme'] = $a->profile['mobile-theme']; From 9209d88c4a050dc16b9f147bbfe79dc8222694bf Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Thu, 1 Sep 2016 03:50:41 +0000 Subject: [PATCH 103/352] Set the charset for the SQL connection for new installations --- htconfig.php | 5 +++++ include/dba.php | 23 +++++++++++++++++++---- view/templates/htconfig.tpl | 5 +++++ 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/htconfig.php b/htconfig.php index fe6c0d82ee..469fa7af61 100644 --- a/htconfig.php +++ b/htconfig.php @@ -16,6 +16,11 @@ $db_user = 'mysqlusername'; $db_pass = 'mysqlpassword'; $db_data = 'mysqldatabasename'; +// Set the database connection charset to UTF8. +// Changing this value will likely corrupt the special characters. +// You have been warned. +$a->config['system']['db_charset'] = "utf8mb4"; + // Choose a legal default timezone. If you are unsure, use "America/Los_Angeles". // It can be changed later and only applies to timestamps for anonymous viewers. diff --git a/include/dba.php b/include/dba.php index b0927265be..5e84b95df5 100644 --- a/include/dba.php +++ b/include/dba.php @@ -66,6 +66,8 @@ class dba { if(! mysqli_connect_errno()) { $this->connected = true; } + if (isset($a->config["system"]["db_charset"])) + $this->db->set_charset($a->config["system"]["db_charset"]); } else { $this->mysqli = false; @@ -73,6 +75,8 @@ class dba { if($this->db && mysql_select_db($db,$this->db)) { $this->connected = true; } + if (isset($a->config["system"]["db_charset"])) + mysql_set_charset($a->config["system"]["db_charset"], $this->db); } if(! $this->connected) { $this->db = null; @@ -95,6 +99,14 @@ class dba { $this->error = ''; + // Check the connection (This can reconnect the connection - if configured) + if ($this->mysqli) + $connected = $this->db->ping(); + else + $connected = mysql_ping($this->db); + + $connstr = ($connected ? "Connected": "Disonnected"); + $stamp1 = microtime(true); if($this->mysqli) @@ -122,14 +134,17 @@ class dba { } if($this->mysqli) { - if($this->db->errno) + if($this->db->errno) { $this->error = $this->db->error; + $this->errorno = $this->db->errno; + } + } elseif(mysql_errno($this->db)) { + $this->error = mysql_error($this->db); + $this->errorno = mysql_errno($this->db); } - elseif(mysql_errno($this->db)) - $this->error = mysql_error($this->db); if(strlen($this->error)) { - logger('dba: ' . $this->error); + logger('DB Error ('.$connstr.') '.$this->errorno.': '.$this->error); } if($this->debug) { diff --git a/view/templates/htconfig.tpl b/view/templates/htconfig.tpl index cbbd14dc4e..df793197ce 100644 --- a/view/templates/htconfig.tpl +++ b/view/templates/htconfig.tpl @@ -15,6 +15,11 @@ $db_user = '{{$dbuser}}'; $db_pass = '{{$dbpass}}'; $db_data = '{{$dbdata}}'; +// Set the database connection charset to UTF8. +// Changing this value will likely corrupt the special characters. +// You have been warned. +$a->config['system']['db_charset'] = "utf8mb4"; + // email adress for the system admin $a->config['admin_email'] = '{{$adminmail}}'; From 59ff309ee5113cc4a07be3a1245d679a5952f4d4 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Thu, 1 Sep 2016 04:44:29 +0000 Subject: [PATCH 104/352] Add the new charset parameter to the database creation --- database.sql | 104 ++++++++++++++++++++-------------------- doc/Install.md | 4 +- include/dbstructure.php | 9 +++- 3 files changed, 62 insertions(+), 55 deletions(-) diff --git a/database.sql b/database.sql index b27f69c40e..95a163cfbd 100644 --- a/database.sql +++ b/database.sql @@ -16,7 +16,7 @@ CREATE TABLE IF NOT EXISTS `addon` ( `timestamp` bigint(20) NOT NULL DEFAULT 0, `plugin_admin` tinyint(1) NOT NULL DEFAULT 0, PRIMARY KEY(`id`) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; -- -- TABLE attach @@ -36,7 +36,7 @@ CREATE TABLE IF NOT EXISTS `attach` ( `deny_cid` mediumtext NOT NULL, `deny_gid` mediumtext NOT NULL, PRIMARY KEY(`id`) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; -- -- TABLE auth_codes @@ -48,7 +48,7 @@ CREATE TABLE IF NOT EXISTS `auth_codes` ( `expires` int(11) NOT NULL DEFAULT 0, `scope` varchar(250) NOT NULL DEFAULT '', PRIMARY KEY(`id`) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; -- -- TABLE cache @@ -60,7 +60,7 @@ CREATE TABLE IF NOT EXISTS `cache` ( `updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY(`k`), INDEX `updated` (`updated`) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; -- -- TABLE challenge @@ -73,7 +73,7 @@ CREATE TABLE IF NOT EXISTS `challenge` ( `type` varchar(255) NOT NULL DEFAULT '', `last_update` varchar(255) NOT NULL DEFAULT '', PRIMARY KEY(`id`) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; -- -- TABLE clients @@ -86,7 +86,7 @@ CREATE TABLE IF NOT EXISTS `clients` ( `icon` text, `uid` int(11) NOT NULL DEFAULT 0, PRIMARY KEY(`client_id`) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; -- -- TABLE config @@ -98,7 +98,7 @@ CREATE TABLE IF NOT EXISTS `config` ( `v` text NOT NULL, PRIMARY KEY(`id`), INDEX `cat_k` (`cat`(30),`k`(30)) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; -- -- TABLE contact @@ -173,7 +173,7 @@ CREATE TABLE IF NOT EXISTS `contact` ( PRIMARY KEY(`id`), INDEX `uid` (`uid`), INDEX `nurl` (`nurl`) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; -- -- TABLE conv @@ -189,7 +189,7 @@ CREATE TABLE IF NOT EXISTS `conv` ( `subject` mediumtext NOT NULL, PRIMARY KEY(`id`), INDEX `uid` (`uid`) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; -- -- TABLE deliverq @@ -200,7 +200,7 @@ CREATE TABLE IF NOT EXISTS `deliverq` ( `item` int(11) NOT NULL DEFAULT 0, `contact` int(11) NOT NULL DEFAULT 0, PRIMARY KEY(`id`) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; -- -- TABLE event @@ -227,7 +227,7 @@ CREATE TABLE IF NOT EXISTS `event` ( `deny_gid` mediumtext NOT NULL, PRIMARY KEY(`id`), INDEX `uid` (`uid`) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; -- -- TABLE fcontact @@ -252,7 +252,7 @@ CREATE TABLE IF NOT EXISTS `fcontact` ( `updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY(`id`), INDEX `addr` (`addr`) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; -- -- TABLE ffinder @@ -263,7 +263,7 @@ CREATE TABLE IF NOT EXISTS `ffinder` ( `cid` int(10) unsigned NOT NULL DEFAULT 0, `fid` int(10) unsigned NOT NULL DEFAULT 0, PRIMARY KEY(`id`) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; -- -- TABLE fserver @@ -275,7 +275,7 @@ CREATE TABLE IF NOT EXISTS `fserver` ( `key` text NOT NULL, PRIMARY KEY(`id`), INDEX `server` (`server`) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; -- -- TABLE fsuggest @@ -291,7 +291,7 @@ CREATE TABLE IF NOT EXISTS `fsuggest` ( `note` text NOT NULL, `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY(`id`) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; -- -- TABLE gcign @@ -303,7 +303,7 @@ CREATE TABLE IF NOT EXISTS `gcign` ( PRIMARY KEY(`id`), INDEX `uid` (`uid`), INDEX `gcid` (`gcid`) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; -- -- TABLE gcontact @@ -340,7 +340,7 @@ CREATE TABLE IF NOT EXISTS `gcontact` ( INDEX `nick` (`nick`), INDEX `addr` (`addr`), INDEX `updated` (`updated`) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; -- -- TABLE glink @@ -356,7 +356,7 @@ CREATE TABLE IF NOT EXISTS `glink` ( INDEX `cid_uid_gcid_zcid` (`cid`,`uid`,`gcid`,`zcid`), INDEX `gcid` (`gcid`), INDEX `zcid` (`zcid`) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; -- -- TABLE group @@ -369,7 +369,7 @@ CREATE TABLE IF NOT EXISTS `group` ( `name` varchar(255) NOT NULL DEFAULT '', PRIMARY KEY(`id`), INDEX `uid` (`uid`) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; -- -- TABLE group_member @@ -381,7 +381,7 @@ CREATE TABLE IF NOT EXISTS `group_member` ( `contact-id` int(10) unsigned NOT NULL DEFAULT 0, PRIMARY KEY(`id`), INDEX `uid_gid_contactid` (`uid`,`gid`,`contact-id`) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; -- -- TABLE gserver @@ -404,7 +404,7 @@ CREATE TABLE IF NOT EXISTS `gserver` ( `last_failure` datetime DEFAULT '0000-00-00 00:00:00', PRIMARY KEY(`id`), INDEX `nurl` (`nurl`) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; -- -- TABLE hook @@ -417,7 +417,7 @@ CREATE TABLE IF NOT EXISTS `hook` ( `priority` int(11) unsigned NOT NULL DEFAULT 0, PRIMARY KEY(`id`), INDEX `hook_file_function` (`hook`(30),`file`(60),`function`(30)) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; -- -- TABLE intro @@ -435,7 +435,7 @@ CREATE TABLE IF NOT EXISTS `intro` ( `blocked` tinyint(1) NOT NULL DEFAULT 1, `ignore` tinyint(1) NOT NULL DEFAULT 0, PRIMARY KEY(`id`) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; -- -- TABLE item @@ -543,7 +543,7 @@ CREATE TABLE IF NOT EXISTS `item` ( INDEX `uid_eventid` (`uid`,`event-id`), INDEX `uid_authorlink` (`uid`,`author-link`), INDEX `uid_ownerlink` (`uid`,`owner-link`) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; -- -- TABLE item_id @@ -559,7 +559,7 @@ CREATE TABLE IF NOT EXISTS `item_id` ( INDEX `sid` (`sid`), INDEX `service` (`service`), INDEX `iid` (`iid`) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; -- -- TABLE locks @@ -570,7 +570,7 @@ CREATE TABLE IF NOT EXISTS `locks` ( `locked` tinyint(1) NOT NULL DEFAULT 0, `created` datetime DEFAULT '0000-00-00 00:00:00', PRIMARY KEY(`id`) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; -- -- TABLE mail @@ -600,7 +600,7 @@ CREATE TABLE IF NOT EXISTS `mail` ( INDEX `reply` (`reply`), INDEX `uri` (`uri`), INDEX `parent-uri` (`parent-uri`) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; -- -- TABLE mailacct @@ -620,7 +620,7 @@ CREATE TABLE IF NOT EXISTS `mailacct` ( `pubmail` tinyint(1) NOT NULL DEFAULT 0, `last_check` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY(`id`) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; -- -- TABLE manage @@ -631,7 +631,7 @@ CREATE TABLE IF NOT EXISTS `manage` ( `mid` int(11) NOT NULL DEFAULT 0, PRIMARY KEY(`id`), INDEX `uid_mid` (`uid`,`mid`) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; -- -- TABLE notify @@ -654,7 +654,7 @@ CREATE TABLE IF NOT EXISTS `notify` ( `otype` varchar(16) NOT NULL DEFAULT '', PRIMARY KEY(`id`), INDEX `uid` (`uid`) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; -- -- TABLE notify-threads @@ -668,7 +668,7 @@ CREATE TABLE IF NOT EXISTS `notify-threads` ( PRIMARY KEY(`id`), INDEX `master-parent-item` (`master-parent-item`), INDEX `receiver-uid` (`receiver-uid`) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; -- -- TABLE oembed @@ -679,7 +679,7 @@ CREATE TABLE IF NOT EXISTS `oembed` ( `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY(`url`), INDEX `created` (`created`) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; -- -- TABLE parsed_url @@ -692,7 +692,7 @@ CREATE TABLE IF NOT EXISTS `parsed_url` ( `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY(`url`,`guessing`,`oembed`), INDEX `created` (`created`) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; -- -- TABLE pconfig @@ -705,7 +705,7 @@ CREATE TABLE IF NOT EXISTS `pconfig` ( `v` mediumtext NOT NULL, PRIMARY KEY(`id`), INDEX `uid_cat_k` (`uid`,`cat`(30),`k`(30)) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; -- -- TABLE photo @@ -737,7 +737,7 @@ CREATE TABLE IF NOT EXISTS `photo` ( INDEX `uid` (`uid`), INDEX `resource-id` (`resource-id`), INDEX `guid` (`guid`) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; -- -- TABLE poll @@ -757,7 +757,7 @@ CREATE TABLE IF NOT EXISTS `poll` ( `q9` mediumtext NOT NULL, PRIMARY KEY(`id`), INDEX `uid` (`uid`) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; -- -- TABLE poll_result @@ -769,7 +769,7 @@ CREATE TABLE IF NOT EXISTS `poll_result` ( PRIMARY KEY(`id`), INDEX `poll_id` (`poll_id`), INDEX `choice` (`choice`) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; -- -- TABLE profile @@ -818,7 +818,7 @@ CREATE TABLE IF NOT EXISTS `profile` ( `net-publish` tinyint(1) NOT NULL DEFAULT 0, PRIMARY KEY(`id`), INDEX `hometown` (`hometown`) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; -- -- TABLE profile_check @@ -831,7 +831,7 @@ CREATE TABLE IF NOT EXISTS `profile_check` ( `sec` varchar(255) NOT NULL DEFAULT '', `expire` int(11) NOT NULL DEFAULT 0, PRIMARY KEY(`id`) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; -- -- TABLE push_subscriber @@ -846,7 +846,7 @@ CREATE TABLE IF NOT EXISTS `push_subscriber` ( `last_update` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `secret` varchar(255) NOT NULL DEFAULT '', PRIMARY KEY(`id`) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; -- -- TABLE queue @@ -865,7 +865,7 @@ CREATE TABLE IF NOT EXISTS `queue` ( INDEX `last` (`last`), INDEX `network` (`network`), INDEX `batch` (`batch`) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; -- -- TABLE register @@ -878,7 +878,7 @@ CREATE TABLE IF NOT EXISTS `register` ( `password` varchar(255) NOT NULL DEFAULT '', `language` varchar(16) NOT NULL DEFAULT '', PRIMARY KEY(`id`) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; -- -- TABLE search @@ -890,7 +890,7 @@ CREATE TABLE IF NOT EXISTS `search` ( PRIMARY KEY(`id`), INDEX `uid` (`uid`), INDEX `term` (`term`) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; -- -- TABLE session @@ -903,7 +903,7 @@ CREATE TABLE IF NOT EXISTS `session` ( PRIMARY KEY(`id`), INDEX `sid` (`sid`), INDEX `expire` (`expire`) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; -- -- TABLE sign @@ -916,7 +916,7 @@ CREATE TABLE IF NOT EXISTS `sign` ( `signer` varchar(255) NOT NULL DEFAULT '', PRIMARY KEY(`id`), INDEX `iid` (`iid`) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; -- -- TABLE spam @@ -933,7 +933,7 @@ CREATE TABLE IF NOT EXISTS `spam` ( INDEX `spam` (`spam`), INDEX `ham` (`ham`), INDEX `term` (`term`) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; -- -- TABLE term @@ -958,7 +958,7 @@ CREATE TABLE IF NOT EXISTS `term` ( INDEX `uid_otype_type_term_global_created` (`uid`,`otype`,`type`,`term`,`global`,`created`), INDEX `otype_type_term_tid` (`otype`,`type`,`term`,`tid`), INDEX `guid` (`guid`) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; -- -- TABLE thread @@ -1002,7 +1002,7 @@ CREATE TABLE IF NOT EXISTS `thread` ( INDEX `wall_private_received` (`wall`,`private`,`received`), INDEX `uid_created` (`uid`,`created`), INDEX `uid_commented` (`uid`,`commented`) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; -- -- TABLE tokens @@ -1015,7 +1015,7 @@ CREATE TABLE IF NOT EXISTS `tokens` ( `scope` varchar(200) NOT NULL DEFAULT '', `uid` int(11) NOT NULL DEFAULT 0, PRIMARY KEY(`id`) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; -- -- TABLE user @@ -1065,7 +1065,7 @@ CREATE TABLE IF NOT EXISTS `user` ( `openidserver` text NOT NULL, PRIMARY KEY(`uid`), INDEX `nickname` (`nickname`) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; -- -- TABLE userd @@ -1075,7 +1075,7 @@ CREATE TABLE IF NOT EXISTS `userd` ( `username` varchar(255) NOT NULL, PRIMARY KEY(`id`), INDEX `username` (`username`) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; -- -- TABLE workerqueue @@ -1089,5 +1089,5 @@ CREATE TABLE IF NOT EXISTS `workerqueue` ( `executed` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY(`id`), INDEX `created` (`created`) -) DEFAULT CHARSET=utf8; +) DEFAULT CHARSET=utf8mb4; diff --git a/doc/Install.md b/doc/Install.md index 9af261e3a8..d92f7aefd0 100644 --- a/doc/Install.md +++ b/doc/Install.md @@ -26,12 +26,12 @@ Requirements --- * Apache with mod-rewrite enabled and "Options All" so you can use a local .htaccess file -* PHP 5.2+. The later the better. You'll need 5.3 for encryption of key exchange conversations. On a Windows environment, 5.2+ might not work as the function dns_get_record() is only available with version 5.3. +* PHP 5.5+. * PHP *command line* access with register_argc_argv set to true in the php.ini file * curl, gd, mysql, hash and openssl extensions * some form of email server or email gateway such that PHP mail() works * mcrypt (optional; used for server-to-server message encryption) -* Mysql 5.x or an equivalant alternative for MySQL (MariaDB etc.) +* Mysql 5.5.3+ or an equivalant alternative for MySQL (MariaDB, Percona Server etc.) * the ability to schedule jobs with cron (Linux/Mac) or Scheduled Tasks (Windows) (Note: other options are presented in Section 7 of this document.) * Installation into a top-level domain or sub-domain (without a directory/path component in the URL) is preferred. Directory paths will not be as convenient to use and have not been thoroughly tested. * If your hosting provider doesn't allow Unix shell access, you might have trouble getting everything to work. diff --git a/include/dbstructure.php b/include/dbstructure.php index 0236f57781..dedd916a8e 100644 --- a/include/dbstructure.php +++ b/include/dbstructure.php @@ -260,6 +260,13 @@ function db_field_command($parameters, $create = true) { function db_create_table($name, $fields, $verbose, $action, $indexes=null) { global $a, $db; + if (isset($a->config["system"]["db_charset"])) + $charset = $a->config["system"]["db_charset"]; + elseif ($verbose) + $charset = "utf8mb4"; + else + $charset = "utf8"; + $r = true; $sql = ""; @@ -282,7 +289,7 @@ function db_create_table($name, $fields, $verbose, $action, $indexes=null) { $sql = implode(",\n\t", $sql_rows); - $sql = sprintf("CREATE TABLE IF NOT EXISTS `%s` (\n\t", dbesc($name)).$sql."\n) DEFAULT CHARSET=utf8"; + $sql = sprintf("CREATE TABLE IF NOT EXISTS `%s` (\n\t", dbesc($name)).$sql."\n) DEFAULT CHARSET=".$charset; if ($verbose) echo $sql.";\n"; From 35813ab377971f0787c99353746098875304bf84 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Thu, 1 Sep 2016 06:47:36 +0000 Subject: [PATCH 105/352] Set the PHP requirements to php 5.4 --- doc/Install.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Install.md b/doc/Install.md index d92f7aefd0..e494c1edf0 100644 --- a/doc/Install.md +++ b/doc/Install.md @@ -26,7 +26,7 @@ Requirements --- * Apache with mod-rewrite enabled and "Options All" so you can use a local .htaccess file -* PHP 5.5+. +* PHP 5.4+. * PHP *command line* access with register_argc_argv set to true in the php.ini file * curl, gd, mysql, hash and openssl extensions * some form of email server or email gateway such that PHP mail() works From 3a3161950966dddfffd48336e36701a626730c72 Mon Sep 17 00:00:00 2001 From: gerhard6380 Date: Fri, 2 Sep 2016 17:01:52 +0200 Subject: [PATCH 106/352] API: change friendica_activities to include arrays of users --- include/api.php | 45 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 10 deletions(-) diff --git a/include/api.php b/include/api.php index a380845ed1..a9c5e7a468 100644 --- a/include/api.php +++ b/include/api.php @@ -2362,29 +2362,54 @@ 'attendno' => array(), 'attendmaybe' => array() ); + $items = q('SELECT * FROM item WHERE uid=%d AND `thr-parent`="%s" AND visible AND NOT deleted', intval($item['uid']), dbesc($item['uri'])); + foreach ($items as $i){ - builtin_activity_puller($i, $activities); + // not used as result should be structured like other user data + //builtin_activity_puller($i, $activities); + + // get user data and add it to the array of the activity + $user = api_get_user($a, $i['author-link']); + switch($i['verb']) { + case ACTIVITY_LIKE: + $activities['like'][] = $user; + break; + case ACTIVITY_DISLIKE: + $activities['dislike'][] = $user; + break; + case ACTIVITY_ATTEND: + $activities['attendyes'][] = $user; + break; + case ACTIVITY_ATTENDNO: + $activities['attendno'][] = $user; + break; + case ACTIVITY_ATTENDMAYBE: + $activities['attendmaybe'][] = $user; + break; + default: + break; + } } if ($type == "xml") { $xml_activities = array(); - foreach ($activities as $k => $v) + foreach ($activities as $k => $v) { + // change xml element from "like" to "friendica:like" $xml_activities["friendica:".$k] = $v; - + // add user data into xml output + $k_user = 0; + foreach ($v as $user) + $xml_activities["friendica:".$k][$k_user++.":user"] = $user; + } $activities = $xml_activities; } - $res = array(); - $uri = $item['uri']."-l"; - foreach($activities as $k => $v) { - $res[$k] = (x($v,$uri)?count($v[$uri]):0); - #$res[$k] = ( x($v,$uri) ? array_map("api_contactlink_to_array", $v[$uri]) : array() ); - } - return $res; + return $activities; + } /** From c02b1c3f36a19bb5e4fb27e2edd9c4c45a8a7b4c Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 3 Sep 2016 12:48:51 +0200 Subject: [PATCH 107/352] The "tagged with" message now works again. --- include/conversation.php | 2 +- object/Item.php | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index 9d7b474af9..e74f4c33f0 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -425,7 +425,7 @@ These Fields are not added below (yet). They are here to for bug search. `item`.`guid`, `item`.`wall`, `item`.`private`, `item`.`starred`, `item`.`title`, `item`.`body`, `item`.`file`, `item`.`event-id`, `item`.`location`, `item`.`coord`, `item`.`app`, - `item`.`rendered-hash`, `item`.`rendered-html`, + `item`.`rendered-hash`, `item`.`rendered-html`, `item`.`object`, `item`.`allow_cid`, `item`.`allow_gid`, `item`.`deny_cid`, `item`.`deny_gid`, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`, diff --git a/object/Item.php b/object/Item.php index ee40d186ce..9f01ac59b0 100644 --- a/object/Item.php +++ b/object/Item.php @@ -89,14 +89,14 @@ class Item extends BaseObject { $a = $this->get_app(); $item = $this->get_data(); - $edited = false; - if (strcmp($item['created'], $item['edited'])<>0) { - $edited = array( - 'label' => t('This entry was edited'), - 'date' => datetime_convert('UTC', date_default_timezone_get(), $item['edited'], 'r'), - 'relative' => relative_date($item['edited']) - ); - } + $edited = false; + if (strcmp($item['created'], $item['edited'])<>0) { + $edited = array( + 'label' => t('This entry was edited'), + 'date' => datetime_convert('UTC', date_default_timezone_get(), $item['edited'], 'r'), + 'relative' => relative_date($item['edited']) + ); + } $commentww = ''; $sparkle = ''; $buttons = ''; @@ -439,10 +439,10 @@ class Item extends BaseObject { } } - if ($this->is_toplevel()) { - $result['total_comments_num'] = "$total_children"; - $result['total_comments_text'] = tt('comment', 'comments', $total_children); - } + if ($this->is_toplevel()) { + $result['total_comments_num'] = "$total_children"; + $result['total_comments_text'] = tt('comment', 'comments', $total_children); + } $result['private'] = $item['private']; $result['toplevel'] = ($this->is_toplevel() ? 'toplevel_item' : ''); From 6df40b116115a9991f51b68ef3dfbdaf786b344c Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 3 Sep 2016 15:06:42 +0000 Subject: [PATCH 108/352] sQL: No "NOT NULL" on text fields. --- database.sql | 206 ++++++++++++++++++++-------------------- include/dbm.php | 4 +- include/dbstructure.php | 206 ++++++++++++++++++++-------------------- 3 files changed, 208 insertions(+), 208 deletions(-) diff --git a/database.sql b/database.sql index 95a163cfbd..03ebc5fe4a 100644 --- a/database.sql +++ b/database.sql @@ -31,10 +31,10 @@ CREATE TABLE IF NOT EXISTS `attach` ( `data` longblob NOT NULL, `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `edited` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - `allow_cid` mediumtext NOT NULL, - `allow_gid` mediumtext NOT NULL, - `deny_cid` mediumtext NOT NULL, - `deny_gid` mediumtext NOT NULL, + `allow_cid` mediumtext, + `allow_gid` mediumtext, + `deny_cid` mediumtext, + `deny_gid` mediumtext, PRIMARY KEY(`id`) ) DEFAULT CHARSET=utf8mb4; @@ -55,7 +55,7 @@ CREATE TABLE IF NOT EXISTS `auth_codes` ( -- CREATE TABLE IF NOT EXISTS `cache` ( `k` varchar(255) NOT NULL, - `v` text NOT NULL, + `v` text, `expire_mode` int(11) NOT NULL DEFAULT 0, `updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY(`k`), @@ -95,7 +95,7 @@ CREATE TABLE IF NOT EXISTS `config` ( `id` int(10) unsigned NOT NULL auto_increment, `cat` varchar(255) NOT NULL DEFAULT '', `k` varchar(255) NOT NULL DEFAULT '', - `v` text NOT NULL, + `v` text, PRIMARY KEY(`id`), INDEX `cat_k` (`cat`(30),`k`(30)) ) DEFAULT CHARSET=utf8mb4; @@ -115,29 +115,29 @@ CREATE TABLE IF NOT EXISTS `contact` ( `name` varchar(255) NOT NULL DEFAULT '', `nick` varchar(255) NOT NULL DEFAULT '', `location` varchar(255) NOT NULL DEFAULT '', - `about` text NOT NULL, - `keywords` text NOT NULL, + `about` text, + `keywords` text, `gender` varchar(32) NOT NULL DEFAULT '', `attag` varchar(255) NOT NULL DEFAULT '', `avatar` varchar(255) NOT NULL DEFAULT '', - `photo` text NOT NULL, - `thumb` text NOT NULL, - `micro` text NOT NULL, - `site-pubkey` text NOT NULL, + `photo` text, + `thumb` text, + `micro` text, + `site-pubkey` text, `issued-id` varchar(255) NOT NULL DEFAULT '', `dfrn-id` varchar(255) NOT NULL DEFAULT '', `url` varchar(255) NOT NULL DEFAULT '', `nurl` varchar(255) NOT NULL DEFAULT '', `addr` varchar(255) NOT NULL DEFAULT '', `alias` varchar(255) NOT NULL DEFAULT '', - `pubkey` text NOT NULL, - `prvkey` text NOT NULL, + `pubkey` text, + `prvkey` text, `batch` varchar(255) NOT NULL DEFAULT '', - `request` text NOT NULL, - `notify` text NOT NULL, - `poll` text NOT NULL, - `confirm` text NOT NULL, - `poco` text NOT NULL, + `request` text, + `notify` text, + `poll` text, + `confirm` text, + `poco` text, `aes_allow` tinyint(1) NOT NULL DEFAULT 0, `ret-aes` tinyint(1) NOT NULL DEFAULT 0, `usehub` tinyint(1) NOT NULL DEFAULT 0, @@ -161,15 +161,15 @@ CREATE TABLE IF NOT EXISTS `contact` ( `archive` tinyint(1) NOT NULL DEFAULT 0, `pending` tinyint(1) NOT NULL DEFAULT 1, `rating` tinyint(1) NOT NULL DEFAULT 0, - `reason` text NOT NULL, + `reason` text, `closeness` tinyint(2) NOT NULL DEFAULT 99, - `info` mediumtext NOT NULL, + `info` mediumtext, `profile-id` int(11) NOT NULL DEFAULT 0, `bdyear` varchar(4) NOT NULL DEFAULT '', `bd` date NOT NULL DEFAULT '0000-00-00', `notify_new_posts` tinyint(1) NOT NULL DEFAULT 0, `fetch_further_information` tinyint(1) NOT NULL DEFAULT 0, - `ffi_keyword_blacklist` mediumtext NOT NULL, + `ffi_keyword_blacklist` mediumtext, PRIMARY KEY(`id`), INDEX `uid` (`uid`), INDEX `nurl` (`nurl`) @@ -181,12 +181,12 @@ CREATE TABLE IF NOT EXISTS `contact` ( CREATE TABLE IF NOT EXISTS `conv` ( `id` int(10) unsigned NOT NULL auto_increment, `guid` varchar(64) NOT NULL DEFAULT '', - `recips` mediumtext NOT NULL, + `recips` mediumtext, `uid` int(11) NOT NULL DEFAULT 0, `creator` varchar(255) NOT NULL DEFAULT '', `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - `subject` mediumtext NOT NULL, + `subject` mediumtext, PRIMARY KEY(`id`), INDEX `uid` (`uid`) ) DEFAULT CHARSET=utf8mb4; @@ -214,17 +214,17 @@ CREATE TABLE IF NOT EXISTS `event` ( `edited` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `start` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `finish` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - `summary` text NOT NULL, - `desc` text NOT NULL, - `location` text NOT NULL, + `summary` text, + `desc` text, + `location` text, `type` varchar(255) NOT NULL DEFAULT '', `nofinish` tinyint(1) NOT NULL DEFAULT 0, `adjust` tinyint(1) NOT NULL DEFAULT 1, `ignore` tinyint(1) unsigned NOT NULL DEFAULT 0, - `allow_cid` mediumtext NOT NULL, - `allow_gid` mediumtext NOT NULL, - `deny_cid` mediumtext NOT NULL, - `deny_gid` mediumtext NOT NULL, + `allow_cid` mediumtext, + `allow_gid` mediumtext, + `deny_cid` mediumtext, + `deny_gid` mediumtext, PRIMARY KEY(`id`), INDEX `uid` (`uid`) ) DEFAULT CHARSET=utf8mb4; @@ -248,7 +248,7 @@ CREATE TABLE IF NOT EXISTS `fcontact` ( `priority` tinyint(1) NOT NULL DEFAULT 0, `network` varchar(32) NOT NULL DEFAULT '', `alias` varchar(255) NOT NULL DEFAULT '', - `pubkey` text NOT NULL, + `pubkey` text, `updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY(`id`), INDEX `addr` (`addr`) @@ -272,7 +272,7 @@ CREATE TABLE IF NOT EXISTS `fserver` ( `id` int(11) NOT NULL auto_increment, `server` varchar(255) NOT NULL DEFAULT '', `posturl` varchar(255) NOT NULL DEFAULT '', - `key` text NOT NULL, + `key` text, PRIMARY KEY(`id`), INDEX `server` (`server`) ) DEFAULT CHARSET=utf8mb4; @@ -288,7 +288,7 @@ CREATE TABLE IF NOT EXISTS `fsuggest` ( `url` varchar(255) NOT NULL DEFAULT '', `request` varchar(255) NOT NULL DEFAULT '', `photo` varchar(255) NOT NULL DEFAULT '', - `note` text NOT NULL, + `note` text, `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY(`id`) ) DEFAULT CHARSET=utf8mb4; @@ -321,8 +321,8 @@ CREATE TABLE IF NOT EXISTS `gcontact` ( `last_contact` datetime DEFAULT '0000-00-00 00:00:00', `last_failure` datetime DEFAULT '0000-00-00 00:00:00', `location` varchar(255) NOT NULL DEFAULT '', - `about` text NOT NULL, - `keywords` text NOT NULL, + `about` text, + `keywords` text, `gender` varchar(32) NOT NULL DEFAULT '', `birthday` varchar(32) NOT NULL DEFAULT '0000-00-00', `community` tinyint(1) NOT NULL DEFAULT 0, @@ -330,7 +330,7 @@ CREATE TABLE IF NOT EXISTS `gcontact` ( `nsfw` tinyint(1) NOT NULL DEFAULT 0, `network` varchar(255) NOT NULL DEFAULT '', `addr` varchar(255) NOT NULL DEFAULT '', - `notify` text NOT NULL, + `notify` text, `alias` varchar(255) NOT NULL DEFAULT '', `generation` tinyint(3) NOT NULL DEFAULT 0, `server_url` varchar(255) NOT NULL DEFAULT '', @@ -392,7 +392,7 @@ CREATE TABLE IF NOT EXISTS `gserver` ( `nurl` varchar(255) NOT NULL DEFAULT '', `version` varchar(255) NOT NULL DEFAULT '', `site_name` varchar(255) NOT NULL DEFAULT '', - `info` text NOT NULL, + `info` text, `register_policy` tinyint(1) NOT NULL DEFAULT 0, `poco` varchar(255) NOT NULL DEFAULT '', `noscrape` varchar(255) NOT NULL DEFAULT '', @@ -429,7 +429,7 @@ CREATE TABLE IF NOT EXISTS `intro` ( `contact-id` int(11) NOT NULL DEFAULT 0, `knowyou` tinyint(1) NOT NULL DEFAULT 0, `duplex` tinyint(1) NOT NULL DEFAULT 0, - `note` text NOT NULL, + `note` text, `hash` varchar(255) NOT NULL DEFAULT '', `datetime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `blocked` tinyint(1) NOT NULL DEFAULT 1, @@ -468,27 +468,27 @@ CREATE TABLE IF NOT EXISTS `item` ( `author-link` varchar(255) NOT NULL DEFAULT '', `author-avatar` varchar(255) NOT NULL DEFAULT '', `title` varchar(255) NOT NULL DEFAULT '', - `body` mediumtext NOT NULL, + `body` mediumtext, `app` varchar(255) NOT NULL DEFAULT '', `verb` varchar(255) NOT NULL DEFAULT '', `object-type` varchar(255) NOT NULL DEFAULT '', - `object` text NOT NULL, + `object` text, `target-type` varchar(255) NOT NULL DEFAULT '', - `target` text NOT NULL, - `postopts` text NOT NULL, + `target` text, + `postopts` text, `plink` varchar(255) NOT NULL DEFAULT '', `resource-id` varchar(255) NOT NULL DEFAULT '', `event-id` int(11) NOT NULL DEFAULT 0, - `tag` mediumtext NOT NULL, - `attach` mediumtext NOT NULL, - `inform` mediumtext NOT NULL, - `file` mediumtext NOT NULL, + `tag` mediumtext, + `attach` mediumtext, + `inform` mediumtext, + `file` mediumtext, `location` varchar(255) NOT NULL DEFAULT '', `coord` varchar(255) NOT NULL DEFAULT '', - `allow_cid` mediumtext NOT NULL, - `allow_gid` mediumtext NOT NULL, - `deny_cid` mediumtext NOT NULL, - `deny_gid` mediumtext NOT NULL, + `allow_cid` mediumtext, + `allow_gid` mediumtext, + `deny_cid` mediumtext, + `deny_gid` mediumtext, `private` tinyint(1) NOT NULL DEFAULT 0, `pubmail` tinyint(1) NOT NULL DEFAULT 0, `moderated` tinyint(1) NOT NULL DEFAULT 0, @@ -504,7 +504,7 @@ CREATE TABLE IF NOT EXISTS `item` ( `mention` tinyint(1) NOT NULL DEFAULT 0, `network` varchar(32) NOT NULL DEFAULT '', `rendered-hash` varchar(32) NOT NULL DEFAULT '', - `rendered-html` mediumtext NOT NULL, + `rendered-html` mediumtext, `global` tinyint(1) NOT NULL DEFAULT 0, PRIMARY KEY(`id`), INDEX `guid` (`guid`), @@ -585,7 +585,7 @@ CREATE TABLE IF NOT EXISTS `mail` ( `contact-id` varchar(255) NOT NULL DEFAULT '', `convid` int(11) unsigned NOT NULL DEFAULT 0, `title` varchar(255) NOT NULL DEFAULT '', - `body` mediumtext NOT NULL, + `body` mediumtext, `seen` tinyint(1) NOT NULL DEFAULT 0, `reply` tinyint(1) NOT NULL DEFAULT 0, `replied` tinyint(1) NOT NULL DEFAULT 0, @@ -613,7 +613,7 @@ CREATE TABLE IF NOT EXISTS `mailacct` ( `ssltype` varchar(16) NOT NULL DEFAULT '', `mailbox` varchar(255) NOT NULL DEFAULT '', `user` varchar(255) NOT NULL DEFAULT '', - `pass` text NOT NULL, + `pass` text, `reply_to` varchar(255) NOT NULL DEFAULT '', `action` int(11) NOT NULL DEFAULT 0, `movetofolder` varchar(255) NOT NULL DEFAULT '', @@ -644,7 +644,7 @@ CREATE TABLE IF NOT EXISTS `notify` ( `url` varchar(255) NOT NULL DEFAULT '', `photo` varchar(255) NOT NULL DEFAULT '', `date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - `msg` mediumtext NOT NULL, + `msg` mediumtext, `uid` int(11) NOT NULL DEFAULT 0, `link` varchar(255) NOT NULL DEFAULT '', `iid` int(11) NOT NULL DEFAULT 0, @@ -675,7 +675,7 @@ CREATE TABLE IF NOT EXISTS `notify-threads` ( -- CREATE TABLE IF NOT EXISTS `oembed` ( `url` varchar(255) NOT NULL, - `content` text NOT NULL, + `content` text, `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY(`url`), INDEX `created` (`created`) @@ -688,7 +688,7 @@ CREATE TABLE IF NOT EXISTS `parsed_url` ( `url` varchar(255) NOT NULL, `guessing` tinyint(1) NOT NULL DEFAULT 0, `oembed` tinyint(1) NOT NULL DEFAULT 0, - `content` text NOT NULL, + `content` text, `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY(`url`,`guessing`,`oembed`), INDEX `created` (`created`) @@ -702,7 +702,7 @@ CREATE TABLE IF NOT EXISTS `pconfig` ( `uid` int(11) NOT NULL DEFAULT 0, `cat` varchar(255) NOT NULL DEFAULT '', `k` varchar(255) NOT NULL DEFAULT '', - `v` mediumtext NOT NULL, + `v` mediumtext, PRIMARY KEY(`id`), INDEX `uid_cat_k` (`uid`,`cat`(30),`k`(30)) ) DEFAULT CHARSET=utf8mb4; @@ -719,7 +719,7 @@ CREATE TABLE IF NOT EXISTS `photo` ( `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `edited` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `title` varchar(255) NOT NULL DEFAULT '', - `desc` text NOT NULL, + `desc` text, `album` varchar(255) NOT NULL DEFAULT '', `filename` varchar(255) NOT NULL DEFAULT '', `type` varchar(128) NOT NULL DEFAULT 'image/jpeg', @@ -729,10 +729,10 @@ CREATE TABLE IF NOT EXISTS `photo` ( `data` mediumblob NOT NULL, `scale` tinyint(3) NOT NULL DEFAULT 0, `profile` tinyint(1) NOT NULL DEFAULT 0, - `allow_cid` mediumtext NOT NULL, - `allow_gid` mediumtext NOT NULL, - `deny_cid` mediumtext NOT NULL, - `deny_gid` mediumtext NOT NULL, + `allow_cid` mediumtext, + `allow_gid` mediumtext, + `deny_cid` mediumtext, + `deny_gid` mediumtext, PRIMARY KEY(`id`), INDEX `uid` (`uid`), INDEX `resource-id` (`resource-id`), @@ -745,16 +745,16 @@ CREATE TABLE IF NOT EXISTS `photo` ( CREATE TABLE IF NOT EXISTS `poll` ( `id` int(11) NOT NULL auto_increment, `uid` int(11) NOT NULL DEFAULT 0, - `q0` mediumtext NOT NULL, - `q1` mediumtext NOT NULL, - `q2` mediumtext NOT NULL, - `q3` mediumtext NOT NULL, - `q4` mediumtext NOT NULL, - `q5` mediumtext NOT NULL, - `q6` mediumtext NOT NULL, - `q7` mediumtext NOT NULL, - `q8` mediumtext NOT NULL, - `q9` mediumtext NOT NULL, + `q0` mediumtext, + `q1` mediumtext, + `q2` mediumtext, + `q3` mediumtext, + `q4` mediumtext, + `q5` mediumtext, + `q6` mediumtext, + `q7` mediumtext, + `q8` mediumtext, + `q9` mediumtext, PRIMARY KEY(`id`), INDEX `uid` (`uid`) ) DEFAULT CHARSET=utf8mb4; @@ -791,26 +791,26 @@ CREATE TABLE IF NOT EXISTS `profile` ( `hometown` varchar(255) NOT NULL DEFAULT '', `gender` varchar(32) NOT NULL DEFAULT '', `marital` varchar(255) NOT NULL DEFAULT '', - `with` text NOT NULL, + `with` text, `howlong` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `sexual` varchar(255) NOT NULL DEFAULT '', `politic` varchar(255) NOT NULL DEFAULT '', `religion` varchar(255) NOT NULL DEFAULT '', - `pub_keywords` text NOT NULL, - `prv_keywords` text NOT NULL, - `likes` text NOT NULL, - `dislikes` text NOT NULL, - `about` text NOT NULL, + `pub_keywords` text, + `prv_keywords` text, + `likes` text, + `dislikes` text, + `about` text, `summary` varchar(255) NOT NULL DEFAULT '', - `music` text NOT NULL, - `book` text NOT NULL, - `tv` text NOT NULL, - `film` text NOT NULL, - `interest` text NOT NULL, - `romance` text NOT NULL, - `work` text NOT NULL, - `education` text NOT NULL, - `contact` text NOT NULL, + `music` text, + `book` text, + `tv` text, + `film` text, + `interest` text, + `romance` text, + `work` text, + `education` text, + `contact` text, `homepage` varchar(255) NOT NULL DEFAULT '', `photo` varchar(255) NOT NULL DEFAULT '', `thumb` varchar(255) NOT NULL DEFAULT '', @@ -857,7 +857,7 @@ CREATE TABLE IF NOT EXISTS `queue` ( `network` varchar(32) NOT NULL DEFAULT '', `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `last` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - `content` mediumtext NOT NULL, + `content` mediumtext, `batch` tinyint(1) NOT NULL DEFAULT 0, PRIMARY KEY(`id`), INDEX `cid` (`cid`), @@ -898,7 +898,7 @@ CREATE TABLE IF NOT EXISTS `search` ( CREATE TABLE IF NOT EXISTS `session` ( `id` bigint(20) unsigned NOT NULL auto_increment, `sid` varchar(255) NOT NULL DEFAULT '', - `data` text NOT NULL, + `data` text, `expire` int(10) unsigned NOT NULL DEFAULT 0, PRIMARY KEY(`id`), INDEX `sid` (`sid`), @@ -911,8 +911,8 @@ CREATE TABLE IF NOT EXISTS `session` ( CREATE TABLE IF NOT EXISTS `sign` ( `id` int(10) unsigned NOT NULL auto_increment, `iid` int(10) unsigned NOT NULL DEFAULT 0, - `signed_text` mediumtext NOT NULL, - `signature` text NOT NULL, + `signed_text` mediumtext, + `signature` text, `signer` varchar(255) NOT NULL DEFAULT '', PRIMARY KEY(`id`), INDEX `iid` (`iid`) @@ -1009,7 +1009,7 @@ CREATE TABLE IF NOT EXISTS `thread` ( -- CREATE TABLE IF NOT EXISTS `tokens` ( `id` varchar(40) NOT NULL, - `secret` text NOT NULL, + `secret` text, `client_id` varchar(20) NOT NULL DEFAULT '', `expires` int(11) NOT NULL DEFAULT 0, `scope` varchar(200) NOT NULL DEFAULT '', @@ -1035,10 +1035,10 @@ CREATE TABLE IF NOT EXISTS `user` ( `default-location` varchar(255) NOT NULL DEFAULT '', `allow_location` tinyint(1) NOT NULL DEFAULT 0, `theme` varchar(255) NOT NULL DEFAULT '', - `pubkey` text NOT NULL, - `prvkey` text NOT NULL, - `spubkey` text NOT NULL, - `sprvkey` text NOT NULL, + `pubkey` text, + `prvkey` text, + `spubkey` text, + `sprvkey` text, `verified` tinyint(1) unsigned NOT NULL DEFAULT 0, `blocked` tinyint(1) unsigned NOT NULL DEFAULT 0, `blockwall` tinyint(1) unsigned NOT NULL DEFAULT 0, @@ -1058,11 +1058,11 @@ CREATE TABLE IF NOT EXISTS `user` ( `expire_notification_sent` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `service_class` varchar(32) NOT NULL DEFAULT '', `def_gid` int(11) NOT NULL DEFAULT 0, - `allow_cid` mediumtext NOT NULL, - `allow_gid` mediumtext NOT NULL, - `deny_cid` mediumtext NOT NULL, - `deny_gid` mediumtext NOT NULL, - `openidserver` text NOT NULL, + `allow_cid` mediumtext, + `allow_gid` mediumtext, + `deny_cid` mediumtext, + `deny_gid` mediumtext, + `openidserver` text, PRIMARY KEY(`uid`), INDEX `nickname` (`nickname`) ) DEFAULT CHARSET=utf8mb4; @@ -1082,7 +1082,7 @@ CREATE TABLE IF NOT EXISTS `userd` ( -- CREATE TABLE IF NOT EXISTS `workerqueue` ( `id` int(11) NOT NULL auto_increment, - `parameter` text NOT NULL, + `parameter` text, `priority` tinyint(3) unsigned NOT NULL DEFAULT 0, `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `pid` int(11) NOT NULL DEFAULT 0, diff --git a/include/dbm.php b/include/dbm.php index fdd9f40e76..72d309b22e 100644 --- a/include/dbm.php +++ b/include/dbm.php @@ -20,8 +20,8 @@ class dbm { foreach ($r AS $process) { $state = trim($process["State"]); - // Filter out all idle processes - if (!in_array($state, array("", "init", "statistics"))) { + // Filter out all non blocking processes + if (!in_array($state, array("", "init", "statistics", "updating"))) { ++$states[$state]; ++$processes; } diff --git a/include/dbstructure.php b/include/dbstructure.php index dedd916a8e..53b94b46a8 100644 --- a/include/dbstructure.php +++ b/include/dbstructure.php @@ -372,10 +372,10 @@ function db_definition() { "data" => array("type" => "longblob", "not null" => "1"), "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"), "edited" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"), - "allow_cid" => array("type" => "mediumtext", "not null" => "1"), - "allow_gid" => array("type" => "mediumtext", "not null" => "1"), - "deny_cid" => array("type" => "mediumtext", "not null" => "1"), - "deny_gid" => array("type" => "mediumtext", "not null" => "1"), + "allow_cid" => array("type" => "mediumtext"), + "allow_gid" => array("type" => "mediumtext"), + "deny_cid" => array("type" => "mediumtext"), + "deny_gid" => array("type" => "mediumtext"), ), "indexes" => array( "PRIMARY" => array("id"), @@ -396,7 +396,7 @@ function db_definition() { $database["cache"] = array( "fields" => array( "k" => array("type" => "varchar(255)", "not null" => "1", "primary" => "1"), - "v" => array("type" => "text", "not null" => "1"), + "v" => array("type" => "text"), "expire_mode" => array("type" => "int(11)", "not null" => "1", "default" => "0"), "updated" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"), ), @@ -436,7 +436,7 @@ function db_definition() { "id" => array("type" => "int(10) unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"), "cat" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "k" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), - "v" => array("type" => "text", "not null" => "1"), + "v" => array("type" => "text"), ), "indexes" => array( "PRIMARY" => array("id"), @@ -456,29 +456,29 @@ function db_definition() { "name" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "nick" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "location" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), - "about" => array("type" => "text", "not null" => "1"), - "keywords" => array("type" => "text", "not null" => "1"), + "about" => array("type" => "text"), + "keywords" => array("type" => "text"), "gender" => array("type" => "varchar(32)", "not null" => "1", "default" => ""), "attag" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "avatar" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), - "photo" => array("type" => "text", "not null" => "1"), - "thumb" => array("type" => "text", "not null" => "1"), - "micro" => array("type" => "text", "not null" => "1"), - "site-pubkey" => array("type" => "text", "not null" => "1"), + "photo" => array("type" => "text"), + "thumb" => array("type" => "text"), + "micro" => array("type" => "text"), + "site-pubkey" => array("type" => "text"), "issued-id" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "dfrn-id" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "url" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "nurl" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "addr" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "alias" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), - "pubkey" => array("type" => "text", "not null" => "1"), - "prvkey" => array("type" => "text", "not null" => "1"), + "pubkey" => array("type" => "text"), + "prvkey" => array("type" => "text"), "batch" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), - "request" => array("type" => "text", "not null" => "1"), - "notify" => array("type" => "text", "not null" => "1"), - "poll" => array("type" => "text", "not null" => "1"), - "confirm" => array("type" => "text", "not null" => "1"), - "poco" => array("type" => "text", "not null" => "1"), + "request" => array("type" => "text"), + "notify" => array("type" => "text"), + "poll" => array("type" => "text"), + "confirm" => array("type" => "text"), + "poco" => array("type" => "text"), "aes_allow" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "ret-aes" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "usehub" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), @@ -502,15 +502,15 @@ function db_definition() { "archive" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "pending" => array("type" => "tinyint(1)", "not null" => "1", "default" => "1"), "rating" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), - "reason" => array("type" => "text", "not null" => "1"), + "reason" => array("type" => "text"), "closeness" => array("type" => "tinyint(2)", "not null" => "1", "default" => "99"), - "info" => array("type" => "mediumtext", "not null" => "1"), + "info" => array("type" => "mediumtext"), "profile-id" => array("type" => "int(11)", "not null" => "1", "default" => "0"), "bdyear" => array("type" => "varchar(4)", "not null" => "1", "default" => ""), "bd" => array("type" => "date", "not null" => "1", "default" => "0000-00-00"), "notify_new_posts" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "fetch_further_information" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), - "ffi_keyword_blacklist" => array("type" => "mediumtext", "not null" => "1"), + "ffi_keyword_blacklist" => array("type" => "mediumtext"), ), "indexes" => array( "PRIMARY" => array("id"), @@ -522,12 +522,12 @@ function db_definition() { "fields" => array( "id" => array("type" => "int(10) unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"), "guid" => array("type" => "varchar(64)", "not null" => "1", "default" => ""), - "recips" => array("type" => "mediumtext", "not null" => "1"), + "recips" => array("type" => "mediumtext"), "uid" => array("type" => "int(11)", "not null" => "1", "default" => "0"), "creator" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"), "updated" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"), - "subject" => array("type" => "mediumtext", "not null" => "1"), + "subject" => array("type" => "mediumtext"), ), "indexes" => array( "PRIMARY" => array("id"), @@ -555,17 +555,17 @@ function db_definition() { "edited" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"), "start" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"), "finish" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"), - "summary" => array("type" => "text", "not null" => "1"), - "desc" => array("type" => "text", "not null" => "1"), - "location" => array("type" => "text", "not null" => "1"), + "summary" => array("type" => "text"), + "desc" => array("type" => "text"), + "location" => array("type" => "text"), "type" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "nofinish" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "adjust" => array("type" => "tinyint(1)", "not null" => "1", "default" => "1"), "ignore" => array("type" => "tinyint(1) unsigned", "not null" => "1", "default" => "0"), - "allow_cid" => array("type" => "mediumtext", "not null" => "1"), - "allow_gid" => array("type" => "mediumtext", "not null" => "1"), - "deny_cid" => array("type" => "mediumtext", "not null" => "1"), - "deny_gid" => array("type" => "mediumtext", "not null" => "1"), + "allow_cid" => array("type" => "mediumtext"), + "allow_gid" => array("type" => "mediumtext"), + "deny_cid" => array("type" => "mediumtext"), + "deny_gid" => array("type" => "mediumtext"), ), "indexes" => array( "PRIMARY" => array("id"), @@ -589,7 +589,7 @@ function db_definition() { "priority" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "network" => array("type" => "varchar(32)", "not null" => "1", "default" => ""), "alias" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), - "pubkey" => array("type" => "text", "not null" => "1"), + "pubkey" => array("type" => "text"), "updated" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"), ), "indexes" => array( @@ -613,7 +613,7 @@ function db_definition() { "id" => array("type" => "int(11)", "not null" => "1", "extra" => "auto_increment", "primary" => "1"), "server" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "posturl" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), - "key" => array("type" => "text", "not null" => "1"), + "key" => array("type" => "text"), ), "indexes" => array( "PRIMARY" => array("id"), @@ -629,7 +629,7 @@ function db_definition() { "url" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "request" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "photo" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), - "note" => array("type" => "text", "not null" => "1"), + "note" => array("type" => "text"), "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"), ), "indexes" => array( @@ -662,8 +662,8 @@ function db_definition() { "last_contact" => array("type" => "datetime", "default" => "0000-00-00 00:00:00"), "last_failure" => array("type" => "datetime", "default" => "0000-00-00 00:00:00"), "location" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), - "about" => array("type" => "text", "not null" => "1"), - "keywords" => array("type" => "text", "not null" => "1"), + "about" => array("type" => "text"), + "keywords" => array("type" => "text"), "gender" => array("type" => "varchar(32)", "not null" => "1", "default" => ""), "birthday" => array("type" => "varchar(32)", "not null" => "1", "default" => "0000-00-00"), "community" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), @@ -671,7 +671,7 @@ function db_definition() { "nsfw" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "network" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "addr" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), - "notify" => array("type" => "text", "not null" => "1"), + "notify" => array("type" => "text"), "alias" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "generation" => array("type" => "tinyint(3)", "not null" => "1", "default" => "0"), "server_url" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), @@ -733,7 +733,7 @@ function db_definition() { "nurl" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "version" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "site_name" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), - "info" => array("type" => "text", "not null" => "1"), + "info" => array("type" => "text"), "register_policy" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "poco" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "noscrape" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), @@ -770,7 +770,7 @@ function db_definition() { "contact-id" => array("type" => "int(11)", "not null" => "1", "default" => "0"), "knowyou" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "duplex" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), - "note" => array("type" => "text", "not null" => "1"), + "note" => array("type" => "text"), "hash" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "datetime" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"), "blocked" => array("type" => "tinyint(1)", "not null" => "1", "default" => "1"), @@ -809,27 +809,27 @@ function db_definition() { "author-link" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "author-avatar" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "title" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), - "body" => array("type" => "mediumtext", "not null" => "1"), + "body" => array("type" => "mediumtext"), "app" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "verb" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "object-type" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), - "object" => array("type" => "text", "not null" => "1"), + "object" => array("type" => "text"), "target-type" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), - "target" => array("type" => "text", "not null" => "1"), - "postopts" => array("type" => "text", "not null" => "1"), + "target" => array("type" => "text"), + "postopts" => array("type" => "text"), "plink" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "resource-id" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "event-id" => array("type" => "int(11)", "not null" => "1", "default" => "0"), - "tag" => array("type" => "mediumtext", "not null" => "1"), - "attach" => array("type" => "mediumtext", "not null" => "1"), - "inform" => array("type" => "mediumtext", "not null" => "1"), - "file" => array("type" => "mediumtext", "not null" => "1"), + "tag" => array("type" => "mediumtext"), + "attach" => array("type" => "mediumtext"), + "inform" => array("type" => "mediumtext"), + "file" => array("type" => "mediumtext"), "location" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "coord" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), - "allow_cid" => array("type" => "mediumtext", "not null" => "1"), - "allow_gid" => array("type" => "mediumtext", "not null" => "1"), - "deny_cid" => array("type" => "mediumtext", "not null" => "1"), - "deny_gid" => array("type" => "mediumtext", "not null" => "1"), + "allow_cid" => array("type" => "mediumtext"), + "allow_gid" => array("type" => "mediumtext"), + "deny_cid" => array("type" => "mediumtext"), + "deny_gid" => array("type" => "mediumtext"), "private" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "pubmail" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "moderated" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), @@ -845,7 +845,7 @@ function db_definition() { "mention" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "network" => array("type" => "varchar(32)", "not null" => "1", "default" => ""), "rendered-hash" => array("type" => "varchar(32)", "not null" => "1", "default" => ""), - "rendered-html" => array("type" => "mediumtext", "not null" => "1"), + "rendered-html" => array("type" => "mediumtext"), "global" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), ), "indexes" => array( @@ -926,7 +926,7 @@ function db_definition() { "contact-id" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "convid" => array("type" => "int(11) unsigned", "not null" => "1", "default" => "0"), "title" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), - "body" => array("type" => "mediumtext", "not null" => "1"), + "body" => array("type" => "mediumtext"), "seen" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "reply" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "replied" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), @@ -954,7 +954,7 @@ function db_definition() { "ssltype" => array("type" => "varchar(16)", "not null" => "1", "default" => ""), "mailbox" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "user" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), - "pass" => array("type" => "text", "not null" => "1"), + "pass" => array("type" => "text"), "reply_to" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "action" => array("type" => "int(11)", "not null" => "1", "default" => "0"), "movetofolder" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), @@ -985,7 +985,7 @@ function db_definition() { "url" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "photo" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "date" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"), - "msg" => array("type" => "mediumtext", "not null" => "1"), + "msg" => array("type" => "mediumtext"), "uid" => array("type" => "int(11)", "not null" => "1", "default" => "0"), "link" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "iid" => array("type" => "int(11)", "not null" => "1", "default" => "0"), @@ -1016,7 +1016,7 @@ function db_definition() { $database["oembed"] = array( "fields" => array( "url" => array("type" => "varchar(255)", "not null" => "1", "primary" => "1"), - "content" => array("type" => "text", "not null" => "1"), + "content" => array("type" => "text"), "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"), ), "indexes" => array( @@ -1029,7 +1029,7 @@ function db_definition() { "url" => array("type" => "varchar(255)", "not null" => "1", "primary" => "1"), "guessing" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0", "primary" => "1"), "oembed" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0", "primary" => "1"), - "content" => array("type" => "text", "not null" => "1"), + "content" => array("type" => "text"), "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"), ), "indexes" => array( @@ -1043,7 +1043,7 @@ function db_definition() { "uid" => array("type" => "int(11)", "not null" => "1", "default" => "0"), "cat" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "k" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), - "v" => array("type" => "mediumtext", "not null" => "1"), + "v" => array("type" => "mediumtext"), ), "indexes" => array( "PRIMARY" => array("id"), @@ -1060,7 +1060,7 @@ function db_definition() { "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"), "edited" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"), "title" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), - "desc" => array("type" => "text", "not null" => "1"), + "desc" => array("type" => "text"), "album" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "filename" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "type" => array("type" => "varchar(128)", "not null" => "1", "default" => "image/jpeg"), @@ -1070,10 +1070,10 @@ function db_definition() { "data" => array("type" => "mediumblob", "not null" => "1"), "scale" => array("type" => "tinyint(3)", "not null" => "1", "default" => "0"), "profile" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), - "allow_cid" => array("type" => "mediumtext", "not null" => "1"), - "allow_gid" => array("type" => "mediumtext", "not null" => "1"), - "deny_cid" => array("type" => "mediumtext", "not null" => "1"), - "deny_gid" => array("type" => "mediumtext", "not null" => "1"), + "allow_cid" => array("type" => "mediumtext"), + "allow_gid" => array("type" => "mediumtext"), + "deny_cid" => array("type" => "mediumtext"), + "deny_gid" => array("type" => "mediumtext"), ), "indexes" => array( "PRIMARY" => array("id"), @@ -1086,16 +1086,16 @@ function db_definition() { "fields" => array( "id" => array("type" => "int(11)", "not null" => "1", "extra" => "auto_increment", "primary" => "1"), "uid" => array("type" => "int(11)", "not null" => "1", "default" => "0"), - "q0" => array("type" => "mediumtext", "not null" => "1"), - "q1" => array("type" => "mediumtext", "not null" => "1"), - "q2" => array("type" => "mediumtext", "not null" => "1"), - "q3" => array("type" => "mediumtext", "not null" => "1"), - "q4" => array("type" => "mediumtext", "not null" => "1"), - "q5" => array("type" => "mediumtext", "not null" => "1"), - "q6" => array("type" => "mediumtext", "not null" => "1"), - "q7" => array("type" => "mediumtext", "not null" => "1"), - "q8" => array("type" => "mediumtext", "not null" => "1"), - "q9" => array("type" => "mediumtext", "not null" => "1"), + "q0" => array("type" => "mediumtext"), + "q1" => array("type" => "mediumtext"), + "q2" => array("type" => "mediumtext"), + "q3" => array("type" => "mediumtext"), + "q4" => array("type" => "mediumtext"), + "q5" => array("type" => "mediumtext"), + "q6" => array("type" => "mediumtext"), + "q7" => array("type" => "mediumtext"), + "q8" => array("type" => "mediumtext"), + "q9" => array("type" => "mediumtext"), ), "indexes" => array( "PRIMARY" => array("id"), @@ -1132,26 +1132,26 @@ function db_definition() { "hometown" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "gender" => array("type" => "varchar(32)", "not null" => "1", "default" => ""), "marital" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), - "with" => array("type" => "text", "not null" => "1"), + "with" => array("type" => "text"), "howlong" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"), "sexual" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "politic" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "religion" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), - "pub_keywords" => array("type" => "text", "not null" => "1"), - "prv_keywords" => array("type" => "text", "not null" => "1"), - "likes" => array("type" => "text", "not null" => "1"), - "dislikes" => array("type" => "text", "not null" => "1"), - "about" => array("type" => "text", "not null" => "1"), + "pub_keywords" => array("type" => "text"), + "prv_keywords" => array("type" => "text"), + "likes" => array("type" => "text"), + "dislikes" => array("type" => "text"), + "about" => array("type" => "text"), "summary" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), - "music" => array("type" => "text", "not null" => "1"), - "book" => array("type" => "text", "not null" => "1"), - "tv" => array("type" => "text", "not null" => "1"), - "film" => array("type" => "text", "not null" => "1"), - "interest" => array("type" => "text", "not null" => "1"), - "romance" => array("type" => "text", "not null" => "1"), - "work" => array("type" => "text", "not null" => "1"), - "education" => array("type" => "text", "not null" => "1"), - "contact" => array("type" => "text", "not null" => "1"), + "music" => array("type" => "text"), + "book" => array("type" => "text"), + "tv" => array("type" => "text"), + "film" => array("type" => "text"), + "interest" => array("type" => "text"), + "romance" => array("type" => "text"), + "work" => array("type" => "text"), + "education" => array("type" => "text"), + "contact" => array("type" => "text"), "homepage" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "photo" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "thumb" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), @@ -1198,7 +1198,7 @@ function db_definition() { "network" => array("type" => "varchar(32)", "not null" => "1", "default" => ""), "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"), "last" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"), - "content" => array("type" => "mediumtext", "not null" => "1"), + "content" => array("type" => "mediumtext"), "batch" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), ), "indexes" => array( @@ -1239,7 +1239,7 @@ function db_definition() { "fields" => array( "id" => array("type" => "bigint(20) unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"), "sid" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), - "data" => array("type" => "text", "not null" => "1"), + "data" => array("type" => "text"), "expire" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0"), ), "indexes" => array( @@ -1252,8 +1252,8 @@ function db_definition() { "fields" => array( "id" => array("type" => "int(10) unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"), "iid" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0"), - "signed_text" => array("type" => "mediumtext", "not null" => "1"), - "signature" => array("type" => "text", "not null" => "1"), + "signed_text" => array("type" => "mediumtext"), + "signature" => array("type" => "text"), "signer" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), ), "indexes" => array( @@ -1350,7 +1350,7 @@ function db_definition() { $database["tokens"] = array( "fields" => array( "id" => array("type" => "varchar(40)", "not null" => "1", "primary" => "1"), - "secret" => array("type" => "text", "not null" => "1"), + "secret" => array("type" => "text"), "client_id" => array("type" => "varchar(20)", "not null" => "1", "default" => ""), "expires" => array("type" => "int(11)", "not null" => "1", "default" => "0"), "scope" => array("type" => "varchar(200)", "not null" => "1", "default" => ""), @@ -1376,10 +1376,10 @@ function db_definition() { "default-location" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), "allow_location" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), "theme" => array("type" => "varchar(255)", "not null" => "1", "default" => ""), - "pubkey" => array("type" => "text", "not null" => "1"), - "prvkey" => array("type" => "text", "not null" => "1"), - "spubkey" => array("type" => "text", "not null" => "1"), - "sprvkey" => array("type" => "text", "not null" => "1"), + "pubkey" => array("type" => "text"), + "prvkey" => array("type" => "text"), + "spubkey" => array("type" => "text"), + "sprvkey" => array("type" => "text"), "verified" => array("type" => "tinyint(1) unsigned", "not null" => "1", "default" => "0"), "blocked" => array("type" => "tinyint(1) unsigned", "not null" => "1", "default" => "0"), "blockwall" => array("type" => "tinyint(1) unsigned", "not null" => "1", "default" => "0"), @@ -1399,11 +1399,11 @@ function db_definition() { "expire_notification_sent" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"), "service_class" => array("type" => "varchar(32)", "not null" => "1", "default" => ""), "def_gid" => array("type" => "int(11)", "not null" => "1", "default" => "0"), - "allow_cid" => array("type" => "mediumtext", "not null" => "1"), - "allow_gid" => array("type" => "mediumtext", "not null" => "1"), - "deny_cid" => array("type" => "mediumtext", "not null" => "1"), - "deny_gid" => array("type" => "mediumtext", "not null" => "1"), - "openidserver" => array("type" => "text", "not null" => "1"), + "allow_cid" => array("type" => "mediumtext"), + "allow_gid" => array("type" => "mediumtext"), + "deny_cid" => array("type" => "mediumtext"), + "deny_gid" => array("type" => "mediumtext"), + "openidserver" => array("type" => "text"), ), "indexes" => array( "PRIMARY" => array("uid"), @@ -1423,7 +1423,7 @@ function db_definition() { $database["workerqueue"] = array( "fields" => array( "id" => array("type" => "int(11)", "not null" => "1", "extra" => "auto_increment", "primary" => "1"), - "parameter" => array("type" => "text", "not null" => "1"), + "parameter" => array("type" => "text"), "priority" => array("type" => "tinyint(3) unsigned", "not null" => "1", "default" => "0"), "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"), "pid" => array("type" => "int(11)", "not null" => "1", "default" => "0"), From 1cb6043aea60d142c7bbe0f9576fcc92b4669d1a Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 4 Sep 2016 18:06:07 +0200 Subject: [PATCH 109/352] Attachments are now displayed again. --- include/conversation.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index e74f4c33f0..057526c547 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -390,7 +390,6 @@ function item_fieldlists() { /* These Fields are not added below (yet). They are here to for bug search. `item`.`type`, -`item`.`object`, `item`.`extid`, `item`.`received`, `item`.`changed`, @@ -399,7 +398,6 @@ These Fields are not added below (yet). They are here to for bug search. `item`.`target`, `item`.`resource-id`, `item`.`tag`, -`item`.`attach`, `item`.`inform`, `item`.`pubmail`, `item`.`visible`, @@ -424,7 +422,7 @@ These Fields are not added below (yet). They are here to for bug search. `item`.`verb`, `item`.`object-type`, `item`.`postopts`, `item`.`plink`, `item`.`guid`, `item`.`wall`, `item`.`private`, `item`.`starred`, `item`.`title`, `item`.`body`, `item`.`file`, `item`.`event-id`, - `item`.`location`, `item`.`coord`, `item`.`app`, + `item`.`location`, `item`.`coord`, `item`.`app`, `item`.`attach`, `item`.`rendered-hash`, `item`.`rendered-html`, `item`.`object`, `item`.`allow_cid`, `item`.`allow_gid`, `item`.`deny_cid`, `item`.`deny_gid`, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`, From 2040cb44734fa8534e1deefe9aedb37c0e6981c5 Mon Sep 17 00:00:00 2001 From: ben-utzer Date: Mon, 5 Sep 2016 00:22:39 +0200 Subject: [PATCH 110/352] Update htconfig.md typo, siehe auch https://github.com/friendica/friendica/pull/2754 --- doc/htconfig.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/htconfig.md b/doc/htconfig.md index f7266604f6..fa26236673 100644 --- a/doc/htconfig.md +++ b/doc/htconfig.md @@ -57,7 +57,7 @@ line to your .htconfig.php: * qsearch_limit - Default value is 100. * relay_server - Experimental Diaspora feature. Address of the relay server where public posts should be send to. For example https://podrelay.net * relay_subscribe (Boolean) - Enables the receiving of public posts from the relay. They will be included in the search and on the community page when it is set up to show all public items. -* relay_scope - Can be "all" or "tags". "all" means that every public post should be received. "tags" means that only posts witt selected tags should be received. +* relay_scope - Can be "all" or "tags". "all" means that every public post should be received. "tags" means that only posts with selected tags should be received. * relay_server_tags - Comma separated list of tags for the "tags" subscription (see "relay_scrope") * relay_user_tags (Boolean) - If enabled, the tags from the saved searches will used for the "tags" subscription in addition to the "relay_server_tags". * remove_multiplicated_lines (Boolean) - If enabled, multiple linefeeds in items are stripped to a single one. From 80ecb64f033f503350a01fe35d7e83cccda80c51 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Tue, 6 Sep 2016 08:30:15 +0200 Subject: [PATCH 111/352] new contributor to the docs --- util/credits.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/util/credits.txt b/util/credits.txt index aa9f6d1cde..d3c7c14f16 100644 --- a/util/credits.txt +++ b/util/credits.txt @@ -19,6 +19,7 @@ balderino Beanow Beatriz Vital Ben Roberts +ben-utzer bufalo1973 Calango Jr Carlos Solís From cb0c8335fac72478bf6d176db63732cb46fe2e26 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Tue, 6 Sep 2016 08:36:47 +0200 Subject: [PATCH 112/352] changes since 3.4.2 --- CHANGELOG | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index b393899df8..3cdf2f806b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,61 @@ +Version 3.5 + Friendica Core: + NEW Optional local directory with possible federated contacts [heluecht] + NEW Autocompletion for @-mentions and BBCode tags [rabuzarus] + NEW Added a composer derived autoloader which allows composer autoloaders in addons/libraries [fabrixxm] + NEW theme: frio [rabuzarus, heluecht, fabrixxm] + Enhance .htaccess file (nerdoc, dissolve) + Updates to the translations (DE, ES, IS, IT, RU) [translation teams] + Updates to the documentation [tobiasd, heluecht, mexcon, silke, rabuzarus, fabrixxm, Olivier Mehani, gerhard6380, ben utzer] + Extended the BBCode by [abstract] tag used for bridged postings to networks with limited character length [heluecht] + Code cleanup [heluecht, QuixOr] + Improvements to the API and Friendica specific extensions [heluecht, fabrixxm, gerhard6380] + Improvements to the RSS/Atom feed import [mexcon] + Improvements to the communication with federated networks (Diaspora, Hubzilla, OStatus) [heluecht] + Improvements on the themes (quattro, vier, frost) [rabuzarus, fabrixxm, stieben, heluecht, Quix0r, tobiasd] + Improvements to the ACL dialog [fabrixxm, rabuzarus] + Improvements to the database structure and optimization of queries [heluecht] + Improvements to the UI (contacts, hotkeys, remember me, ARIA, code hightlighting) [rabuzarus, heluecht, tobiasd] + Improvements to the background process (poller, worker) [heluecht] + Improvements to the admin panel [tobiasd, heluecht, fabrixxm] + Improvements to the performance [heluecht] + Improvements to the installation wizzard (language selection, RINO version, check required PHP modules, default theme is now vier) [tobiasd] + Improvements to the relocation of nodes and accounts [heluecht] + Improvements to the DDoS detection [heluecht] + Improvements to the calendar/events module [heluecht, rabuzarus] + Improvements to OpenID login [strk] + Improvements to the ShaShape font [andi + Reworked the implementation of the DFRN, Diaspora protocols [heluecht] + Reworked the notifications code [fabrixxm, rabuzarus, heluecht] + Reworked the p/config code [fabrixxm, rabuzarus] + Reworked XML generation [heluecht] + Removed now unused simplepie from library [heluecht] + + Friendica Addons + Updated to the translations (DE, ES, IS, NL, PT BR), [translation teams] + Piwik [tobiasd] + Twitter Connector [heluecht] + Pumpio Connector [heluecht] + Rendertime [heluecht] + wppost [heluecht] + showmore [rabuzarus] + fromgplus [heluecht] + app.net Connector [heluecht] + GNU Social Connector [heluecht] + LDAP [Olivier Mehani] + smileybutton [rabuzarus] + retriver [mexon] + mailstream [mexon] + NEW notifyall (port from Hubzilla) [rabuzarus] + DEPRECATED cal (now in core), FB Connector, FB Post Connector, FB Sync + + Closed Issues + 683, 786, 796, 922, 1261, 1576, 1701, 1769, 1970, 1145, 1728, 2063, + 2059, 2078, 2079, 2133, 2165, 2194, 2229, 2230, 2241, 2254, 2242, + 2270, 2277, 2339, 2320, 2345, 2352, 2358, 2367, 2373, 2376, 2378, + 2385, 2395, 2402, 2406, 2433, 2472, 2485, 2492, 2506, 2512, 2516, + 2539, 2540, 2893, 2597, 2611, 2617, 2629, 2645, 2687, 2716 + Version 3.4.3 What's new for the users: Updates to the documentation (silke, tobiasd, annando, rebeka-catalina) From af2929492648dda7ba96ed5c3622cb19b295d8d9 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Tue, 6 Sep 2016 08:39:47 +0200 Subject: [PATCH 113/352] one missing issue --- CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 3cdf2f806b..480c3e3dc6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -54,7 +54,7 @@ Version 3.5 2059, 2078, 2079, 2133, 2165, 2194, 2229, 2230, 2241, 2254, 2242, 2270, 2277, 2339, 2320, 2345, 2352, 2358, 2367, 2373, 2376, 2378, 2385, 2395, 2402, 2406, 2433, 2472, 2485, 2492, 2506, 2512, 2516, - 2539, 2540, 2893, 2597, 2611, 2617, 2629, 2645, 2687, 2716 + 2539, 2540, 2893, 2597, 2611, 2617, 2629, 2645, 2687, 2716, 2757 Version 3.4.3 What's new for the users: From ced8923323039c1052d214c23a13726837a5f309 Mon Sep 17 00:00:00 2001 From: rabuzarus Date: Tue, 6 Sep 2016 16:21:14 +0200 Subject: [PATCH 114/352] frio: show attachment icons in posts --- view/theme/frio/css/font-awesome.custom.css | 21 +++++++++++++++++++++ view/theme/frio/css/style.css | 18 ++++++++++++++++-- view/theme/frio/templates/head.tpl | 1 + 3 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 view/theme/frio/css/font-awesome.custom.css diff --git a/view/theme/frio/css/font-awesome.custom.css b/view/theme/frio/css/font-awesome.custom.css new file mode 100644 index 0000000000..2b16636994 --- /dev/null +++ b/view/theme/frio/css/font-awesome.custom.css @@ -0,0 +1,21 @@ +/* +@fiel view/theme/frio/css/font-awesome.custom.css +@brief This file applies Font Awesome icons to some friendica standard classes +*/ + +.icon:before { + font-family: FontAwesome; + font-weight: normal; + font-style: normal; + display: inline-block; + text-decoration: inherit; + vertical-align: top; + font-size: 1.4em; +} +/* media icons */ +.icon.type-image:before { content: "\f1c5"; } +.icon.type-video:before { content: "\f1c8"; } +.icon.type-audio:before { content: "\f1c7"; } +.icon.type-text:before { content: "\f0f6"; } +.icon.type-application:before { content: "\f016"; } +.icon.type-unkn:before { content: "\f016"; } \ No newline at end of file diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index ca0b4653c4..9a31a0caa7 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -1404,6 +1404,15 @@ section #jotOpen { .wall-item-body > a > img { border-radius: 3px; } +.wall-item-body .body-attach > a { + color: #555; + display: inline-block; +} +.wall-item-body .body-attach > a div { + color: #555; + width: 20px; +} + .shared-wrapper, .vevent { margin-left: 50px; @@ -1486,7 +1495,8 @@ blockquote.shared_content { /* wall item hover effects */ .wall-item-container .wall-item-links, -.wall-item-container .wall-item-actions { +.wall-item-container .wall-item-actions, +.wall-item-container .body-attach > a { opacity: 0.3; -webkit-transition: all 0.25s ease-in-out; -moz-transition: all 0.25s ease-in-out; @@ -1495,7 +1505,8 @@ blockquote.shared_content { transition: all 0.25s ease-in-out; } .wall-item-container:hover .wall-item-links, -.wall-item-container:hover .wall-item-actions { +.wall-item-container:hover .wall-item-actions, +.wall-item-container:hover .body-attach > a { opacity: 0.6; -webkit-transition: all 0.25s ease-in-out; -moz-transition: all 0.25s ease-in-out; @@ -1503,6 +1514,9 @@ blockquote.shared_content { -ms-transition: all 0.25s ease-in-out; transition: all 0.25s ease-in-out; } +.wall-item-container .wall-item-body .body-attach > a:hover { + opacity: 1; +} /* /* Comments diff --git a/view/theme/frio/templates/head.tpl b/view/theme/frio/templates/head.tpl index 72d7cbf077..5b132f35f0 100644 --- a/view/theme/frio/templates/head.tpl +++ b/view/theme/frio/templates/head.tpl @@ -30,6 +30,7 @@ {{* own css files *}} + From 37b4b0205d9338ea0d9338d045057ca4d240f9af Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Wed, 28 Sep 2016 11:59:54 -0400 Subject: [PATCH 159/352] [frio] Remove shared content horizontal margins --- view/theme/frio/css/style.css | 2 -- 1 file changed, 2 deletions(-) diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index 9a31a0caa7..063258b92e 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -1415,8 +1415,6 @@ section #jotOpen { .shared-wrapper, .vevent { - margin-left: 50px; - margin-right: 50px; padding: 10px; box-shadow: 0 0 0 1.5px rgba(0, 0, 0, .1) inset, 0 1px 1px rgba(0, 0, 0, .05); } From 01a8671b66fa95fb2ff7c8472aa9c7616f6e286b Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Wed, 28 Sep 2016 12:58:44 -0400 Subject: [PATCH 160/352] Revert "[frio] Increase center column width" This reverts commit 0c383ad9ffd7df05898ad5da4058fae5f4ea0901. --- view/theme/frio/php/default.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/theme/frio/php/default.php b/view/theme/frio/php/default.php index 5ea69d7c83..bfc11a3580 100644 --- a/view/theme/frio/php/default.php +++ b/view/theme/frio/php/default.php @@ -73,7 +73,7 @@ else "; if(x($page,'right_aside')) echo $page['right_aside']; echo" -
+
argv[0]; echo "-content-wrapper\">"; if(x($page,'content')) echo $page['content']; echo"
From f64bd451cabd141c4105d28ecd9f9152e93326d3 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Wed, 28 Sep 2016 13:08:58 -0400 Subject: [PATCH 161/352] [frio] Increase available width for shared content - Added a bottom margin to the shared header - Removed padding and horizontal margins for the shared content --- view/theme/frio/css/style.css | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index 063258b92e..e685e0910d 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -1431,13 +1431,15 @@ section #jotOpen { } .shared_header { margin-left: 0px; - margin-top: 0px; + margin-top: 0px; padding-top: 0px; + margin-bottom: 10px; border-top: none; color: inherit; } blockquote.shared_content { - margin-left: 20px; + padding: 0px; + margin-left: 0px; color: inherit; } .wall-item-tags, From 7de64afc4563aa2b620a8469dbd1d47a9c5b6559 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Wed, 28 Sep 2016 14:01:12 -0400 Subject: [PATCH 162/352] Fix abnormal font size for shared posts - Use normal font size for shared content --- view/theme/frio/css/style.css | 1 + 1 file changed, 1 insertion(+) diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index e685e0910d..4344fbe858 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -1441,6 +1441,7 @@ blockquote.shared_content { padding: 0px; margin-left: 0px; color: inherit; + font-size: inherit; } .wall-item-tags, .itemedited { From ed5e46892d09c9729b2c9a8a55114f1f98e7035e Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Wed, 28 Sep 2016 14:25:41 -0400 Subject: [PATCH 163/352] Set block quote size to current text-size --- view/theme/frio/css/style.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index 4344fbe858..fb6bb7a899 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -60,6 +60,9 @@ section hr { iframe, img { max-width: 100%; } +blockquote { + font-size: inherit; +} .clear { clear: both; } @@ -1441,7 +1444,6 @@ blockquote.shared_content { padding: 0px; margin-left: 0px; color: inherit; - font-size: inherit; } .wall-item-tags, .itemedited { From 34acfa1706a244a63b7741aa4d74a3d55bc6541f Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Wed, 28 Sep 2016 20:51:56 -0400 Subject: [PATCH 164/352] [frio] Fix whitespace style.css --- view/theme/frio/css/style.css | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index 7795a7e433..cd13ee02fc 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -3,7 +3,7 @@ To change this license header, choose License Headers in Project Properties. To change this template file, choose Tools | Templates and open the template in the editor. */ -/* +/* Created on : 17.02.2016, 23:55:45 Author : rabuzarus */ @@ -174,7 +174,7 @@ a#item-delete-selected { background: $btn_primary_hover_color; border-color: none; } - + .btn-link { /* color: #6fdbe8;*/ color: $link_color; @@ -287,7 +287,7 @@ header #banner { whitespace: nowrap; padding-left: 55px; } -header #banner #logo-img, +header #banner #logo-img, .navbar-brand #logo-img { /*mask: url('network#m1');*/ /*mask-image: url('img/friendica-25.png');*/ @@ -419,7 +419,7 @@ nav.navbar .nav>li>a:focus{ top: 4px; right: -2px; background-color: #ff8989; - + /* text-transform: uppercase; display: inline-block; padding: 3px 5px 4px; @@ -1093,7 +1093,7 @@ aside #group-sidebar li .group-edit-tool:first-child { width: 90px;*/ } #contact-block contact-block-link { - + } #contact-block .contact-block-img { height: 75px; @@ -1648,7 +1648,7 @@ img.acpopup-img { .wall-item-container.thread_level_6, .wall-item-container.thread_level_7 { margin-left: 15px; - + } /* Menubar Tabs */ #tabmenu, @@ -1681,7 +1681,7 @@ ul.tabs li { transition: all .15s ease; } /*ul.tabs.visible-xs > li.active { - min-width: 150px; This is a workaround to make the topbar-second dropdown better visible on mobile. We need something better here + min-width: 150px; This is a workaround to make the topbar-second dropdown better visible on mobile. We need something better here }*/ ul.tabs li a { margin-left: 10px; @@ -1895,7 +1895,7 @@ ul.viewcontact_wrapper > li { } .contact-wrapper .contact-photo-image-wrapper img.contact-photo.xl { height: 80px; - width: 80px; + width: 80px; } .contact-wrapper .contact-photo-image-wrapper img.contact-photo-xs { height: 48px; @@ -1912,7 +1912,7 @@ ul.viewcontact_wrapper > li { margin-top: -20px; } .contact-wrapper .media-body .contact-entry-name h4.media-heading a { - font-weight: bold !important; + font-weight: bold !important; color: $link_color; font-size: 15px !important; } @@ -2272,7 +2272,7 @@ ul.notif-network-list > li:hover .intro-action-buttons { /* Search Page */ -/* This is a little bit hacky. Since the search page is used for diferent +/* This is a little bit hacky. Since the search page is used for diferent content types we can't apply the generic-page-wrapper class. So we apply the css of the generic-page-wrapper class to the ul element with some little modifications to emulate a standard page template */ @@ -2381,7 +2381,7 @@ main .nav-tabs>li.active>a:hover { #contact-list ul.dropdown-menu.textcomplete-dropdown.media-list > li:first-child { display: none; } -#contact-list ul.dropdown-menu.textcomplete-dropdown.media-list +#contact-list ul.dropdown-menu.textcomplete-dropdown.media-list .textcomplete-item > a { padding: 0 !important; border-left: none; From b99b0ad931dc5b0f3aaf19bebb17c572e835ea7f Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Wed, 28 Sep 2016 20:53:25 -0400 Subject: [PATCH 165/352] [frio] Capitalize a few terms for consistency - Changed the translation term "permissions" because only frio is using it - Changed the vote links style because it is shared with other themes --- include/conversation.php | 2 +- view/theme/frio/css/style.css | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/include/conversation.php b/include/conversation.php index 3415a927c9..b0126e7567 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1252,7 +1252,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { '$placeholdercategory' => (feature_enabled(local_user(),'categories') ? t('Categories (comma-separated list)') : ''), '$wait' => t('Please wait'), '$permset' => t('Permission settings'), - '$shortpermset' => t('permissions'), + '$shortpermset' => t('Permissions'), '$ptyp' => (($notes_cid) ? 'note' : 'wall'), '$content' => $x['content'], '$post_id' => $x['post_id'], diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index cd13ee02fc..27a52633bc 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -1498,6 +1498,7 @@ blockquote.shared_content { .wall-item-actions .button-likes { padding-left: 0px; padding-right: 0px; + text-transform: capitalize; } /* wall item hover effects */ From 24969d79d81646952d2a57485fa0ab6fe1ff36c5 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Wed, 28 Sep 2016 20:59:54 -0400 Subject: [PATCH 166/352] [frio] Capitalize dropdown menu links --- view/theme/frio/css/style.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index 27a52633bc..73796356e7 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -794,7 +794,8 @@ nav.navbar a { color: $nav_icon_color; font-weight: 400; font-size: 13px; - padding: 4px 15px + padding: 4px 15px; + text-transform: capitalize; } .nav-pills .dropdown-menu li a i, .nav-tabs .dropdown-menu li a i, From a05a425448cca7d6aea5c3ee02bed8570ef6bfca Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Wed, 28 Sep 2016 21:09:03 -0400 Subject: [PATCH 167/352] [frio] Capitalize Jot tabs title - Revert translation term change for "permissions" --- include/conversation.php | 2 +- view/theme/frio/css/style.css | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/include/conversation.php b/include/conversation.php index b0126e7567..3415a927c9 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1252,7 +1252,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { '$placeholdercategory' => (feature_enabled(local_user(),'categories') ? t('Categories (comma-separated list)') : ''), '$wait' => t('Please wait'), '$permset' => t('Permission settings'), - '$shortpermset' => t('Permissions'), + '$shortpermset' => t('permissions'), '$ptyp' => (($notes_cid) ? 'note' : 'wall'), '$content' => $x['content'], '$post_id' => $x['post_id'], diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index 73796356e7..18b7514503 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -1123,6 +1123,7 @@ section #jotOpen { #jot-modal .modal-header a, #profile-jot-submit-wrapper a { color: #555; + text-transform: capitalize; } #jot-modal .modal-header { border-bottom: none; From 62a2d0603decdc2f567ed3d915450565a88e4c66 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Wed, 28 Sep 2016 23:17:49 -0400 Subject: [PATCH 168/352] Add HTML entity decoding to browser notifications --- js/main.js | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/js/main.js b/js/main.js index 2d0b2da36a..72bef88490 100644 --- a/js/main.js +++ b/js/main.js @@ -18,23 +18,28 @@ } } - function openClose(theID) { - if(document.getElementById(theID).style.display == "block") { - document.getElementById(theID).style.display = "none" - } - else { - document.getElementById(theID).style.display = "block" - } - } + function openClose(theID) { + if(document.getElementById(theID).style.display == "block") { + document.getElementById(theID).style.display = "none" + } + else { + document.getElementById(theID).style.display = "block" + } + } - function openMenu(theID) { - document.getElementById(theID).style.display = "block" - } + function openMenu(theID) { + document.getElementById(theID).style.display = "block" + } - function closeMenu(theID) { - document.getElementById(theID).style.display = "none" - } + function closeMenu(theID) { + document.getElementById(theID).style.display = "none" + } + function decodeHtml(html) { + var txt = document.createElement("textarea"); + txt.innerHTML = html; + return txt.value; + } var src = null; @@ -275,7 +280,7 @@ if (notification_lastitem!== null && notification_id > notification_lastitem) { if (getNotificationPermission()==="granted") { var notification = new Notification(document.title, { - body: e.text().replace('→ ','').format(e.attr('name')), + body: decodeHtml(e.text().replace('→ ','').format(e.attr('name'))), icon: e.attr('photo'), }); notification['url'] = e.attr('href'); @@ -513,7 +518,7 @@ $(".comment-edit-form textarea").editor_autocomplete(baseurl+"/acl"); /* autocomplete bbcode */ $(".comment-edit-form textarea").bbco_autocomplete('bbcode'); - + // setup videos, since VideoJS won't take care of any loaded via AJAX if(typeof videojs != 'undefined') videojs.autoSetup(); }); From 6b318ed30494dcb2a500fca59b5ff7e88a75dc84 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Thu, 29 Sep 2016 06:31:42 +0000 Subject: [PATCH 169/352] We should only use utf8mb4 for dumpsql and new installations --- include/dbstructure.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/dbstructure.php b/include/dbstructure.php index 411def5d0d..89c439f8a4 100644 --- a/include/dbstructure.php +++ b/include/dbstructure.php @@ -262,7 +262,7 @@ function db_create_table($name, $fields, $verbose, $action, $indexes=null) { if (isset($a->config["system"]["db_charset"])) $charset = $a->config["system"]["db_charset"]; - elseif ($verbose) + elseif (!$action) // Used for dumpsql $charset = "utf8mb4"; else $charset = "utf8"; From aa985502c99d96aa5d7fb5af49870b9ffa806c4c Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 29 Sep 2016 23:16:17 -0400 Subject: [PATCH 170/352] Fix Issue #2813 - Remove adding a notification for each admin on register approval request - Fix wrong display of the above notification that is removed anyway - Fix comments --- js/main.js | 10 +++++----- mod/register.php | 18 ------------------ 2 files changed, 5 insertions(+), 23 deletions(-) diff --git a/js/main.js b/js/main.js index 72bef88490..79b5aae2bc 100644 --- a/js/main.js +++ b/js/main.js @@ -264,13 +264,13 @@ var html = notifications_tpl.format( e.attr('href'), // {0} // link to the source e.attr('photo'), // {1} // photo of the contact - text, // {2} // preformatet text (autor + text) + text, // {2} // preformatted text (autor + text) e.attr('date'), // {3} // date of notification (time ago) - seenclass, // {4} // vistiting status of the notification - new Date(e.attr('timestamp')*1000), // {5} //date of notification + seenclass, // {4} // visited status of the notification + new Date(e.attr('timestamp')*1000), // {5} // date of notification e.attr('url'), // {6} // profile url of the contact - e.text().format(""), // {7} // clean status text - contact // {8} //preformatat author (name + profile url) + e.text().format(contact), // {7} // preformatted html (text including author profile url) + '' // {8} // Deprecated ); nnm.append(html); }); diff --git a/mod/register.php b/mod/register.php index 6fc5887ef5..62b6a5f033 100644 --- a/mod/register.php +++ b/mod/register.php @@ -132,24 +132,6 @@ function register_post(&$a) { $admin_mail_list ); - - foreach ($adminlist as $admin) { - notification(array( - 'type' => NOTIFY_SYSTEM, - 'event' => 'SYSTEM_REGISTER_REQUEST', - 'source_name' => $user['username'], - 'source_mail' => $user['email'], - 'source_nick' => $user['nickname'], - 'source_link' => $a->get_baseurl()."/admin/users/", - 'link' => $a->get_baseurl()."/admin/users/", - 'source_photo' => $a->get_baseurl() . "/photo/avatar/".$user['uid'].".jpg", - 'to_email' => $admin['email'], - 'uid' => $admin['uid'], - 'language' => ($admin['language']?$admin['language']:'en')) - ); - } - - info( t('Your registration is pending approval by the site owner.') . EOL ) ; goaway(z_root()); From f4c2e2244d78534f1ce9e90238620b7caa13ef2a Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 29 Sep 2016 23:46:43 -0400 Subject: [PATCH 171/352] Fix #2814 - [frio] Add a wrapping `a` tag around the notification text - Add an event listener preventing popup menus to close when they are themselves clicked --- js/main.js | 2 ++ view/theme/frio/templates/nav.tpl | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/js/main.js b/js/main.js index 72bef88490..aa6a48fcb6 100644 --- a/js/main.js +++ b/js/main.js @@ -130,6 +130,7 @@ function close_last_popup_menu() { if(last_popup_menu) { last_popup_menu.hide(); + last_popup_menu.off('click', function(e) {e.stopPropagation()}); last_popup_button.removeClass("selected"); last_popup_menu = null; last_popup_button = null; @@ -152,6 +153,7 @@ last_popup_button = null; } else { last_popup_menu = menu; + last_popup_menu.on('click', function(e) {e.stopPropagation()}); last_popup_button = parent; $('#nav-notifications-menu').perfectScrollbar('update'); } diff --git a/view/theme/frio/templates/nav.tpl b/view/theme/frio/templates/nav.tpl index 94f91bb4eb..497b8db979 100644 --- a/view/theme/frio/templates/nav.tpl +++ b/view/theme/frio/templates/nav.tpl @@ -9,7 +9,7 @@ {{if $nav.remote}}
{{else}} - {{* #logo-img is the the placeholder to insert a mask (friendica logo) into this div + {{* #logo-img is the the placeholder to insert a mask (friendica logo) into this div For Firefox we have to call the paths of the mask (look at the bottom of this file). Because for FF we need relative paths we apply them with js after the page is loaded (look at theme.js *}}
@@ -276,13 +276,13 @@ {{*The second part of the notifications dropdown menu. It handles the notifications *}} {{if $nav.notifications}} From f0382bb159244b8f9d9243f737e673b0375ca7c8 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Fri, 30 Sep 2016 08:57:16 -0400 Subject: [PATCH 172/352] Restore admin notification email on register approval - Reverted changes to mod/register.php - Added "show_in_notification_page" flag to prevent `notify` DB insertion --- include/enotify.php | 2 +- mod/register.php | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/include/enotify.php b/include/enotify.php index bed00c5eaf..4973bedc24 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -49,7 +49,7 @@ function notification($params) { // with $params['show_in_notification_page'] == false, the notification isn't inserted into // the database, and an email is sent if applicable. // default, if not specified: true - $show_in_notification_page = ((x($params, 'show_in_notification_page')) ? $params['show_in_notification_page']:True); + $show_in_notification_page = ((x($params, 'show_in_notification_page')) ? $params['show_in_notification_page']:true); $additional_mail_header = ""; $additional_mail_header .= "Precedence: list\n"; diff --git a/mod/register.php b/mod/register.php index 62b6a5f033..0d29b3f9e5 100644 --- a/mod/register.php +++ b/mod/register.php @@ -132,6 +132,23 @@ function register_post(&$a) { $admin_mail_list ); + foreach ($adminlist as $admin) { + notification(array( + 'type' => NOTIFY_SYSTEM, + 'event' => 'SYSTEM_REGISTER_REQUEST', + 'source_name' => $user['username'], + 'source_mail' => $user['email'], + 'source_nick' => $user['nickname'], + 'source_link' => $a->get_baseurl()."/admin/users/", + 'link' => $a->get_baseurl()."/admin/users/", + 'source_photo' => $a->get_baseurl() . "/photo/avatar/".$user['uid'].".jpg", + 'to_email' => $admin['email'], + 'uid' => $admin['uid'], + 'language' => ($admin['language']?$admin['language']:'en'), + 'show_in_notification_page' => false + )); + } + info( t('Your registration is pending approval by the site owner.') . EOL ) ; goaway(z_root()); From f9678bb6c3b178e50e7848f6008ad8cc0230ddc3 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Fri, 30 Sep 2016 09:22:00 -0400 Subject: [PATCH 173/352] Remove extraneous comments - If needed, the version control system can be used to restore this code --- include/Core/Config.php | 46 ---------------------------------------- include/Core/PConfig.php | 42 ------------------------------------ 2 files changed, 88 deletions(-) diff --git a/include/Core/Config.php b/include/Core/Config.php index 8e387ca6f0..761d7f490e 100644 --- a/include/Core/Config.php +++ b/include/Core/Config.php @@ -90,29 +90,6 @@ class Config { } } - // If APC is enabled then fetch the data from there, else try XCache - /*if (function_exists("apc_fetch") AND function_exists("apc_exists")) - if (apc_exists($family."|".$key)) { - $val = apc_fetch($family."|".$key); - $a->config[$family][$key] = $val; - - if ($val === '!!') - return false; - else - return $val; - } - elseif (function_exists("xcache_fetch") AND function_exists("xcache_isset")) - if (xcache_isset($family."|".$key)) { - $val = xcache_fetch($family."|".$key); - $a->config[$family][$key] = $val; - - if ($val === '!!') - return false; - else - return $val; - } - */ - $ret = q("SELECT `v` FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1", dbesc($family), dbesc($key) @@ -122,22 +99,10 @@ class Config { $val = (preg_match("|^a:[0-9]+:{.*}$|s", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']); $a->config[$family][$key] = $val; - // If APC is enabled then store the data there, else try XCache - /*if (function_exists("apc_store")) - apc_store($family."|".$key, $val, 600); - elseif (function_exists("xcache_set")) - xcache_set($family."|".$key, $val, 600);*/ - return $val; } else { $a->config[$family][$key] = '!!'; - - // If APC is enabled then store the data there, else try XCache - /*if (function_exists("apc_store")) - apc_store($family."|".$key, '!!', 600); - elseif (function_exists("xcache_set")) - xcache_set($family."|".$key, '!!', 600);*/ } return $default_value; } @@ -192,12 +157,6 @@ class Config { $a->config[$family][$key] = $value; - // If APC is enabled then store the data there, else try XCache - /*if (function_exists("apc_store")) - apc_store($family."|".$key, $value, 600); - elseif (function_exists("xcache_set")) - xcache_set($family."|".$key, $value, 600);*/ - if($ret) return $value; return $ret; @@ -224,11 +183,6 @@ class Config { dbesc($family), dbesc($key) ); - // If APC is enabled then delete the data from there, else try XCache - /*if (function_exists("apc_delete")) - apc_delete($family."|".$key); - elseif (function_exists("xcache_unset")) - xcache_unset($family."|".$key);*/ return $ret; } diff --git a/include/Core/PConfig.php b/include/Core/PConfig.php index ab351ef2c2..bf563d06e0 100644 --- a/include/Core/PConfig.php +++ b/include/Core/PConfig.php @@ -83,29 +83,6 @@ class PConfig { } } - // If APC is enabled then fetch the data from there, else try XCache - /*if (function_exists("apc_fetch") AND function_exists("apc_exists")) - if (apc_exists($uid."|".$family."|".$key)) { - $val = apc_fetch($uid."|".$family."|".$key); - $a->config[$uid][$family][$key] = $val; - - if ($val === '!!') - return false; - else - return $val; - } - elseif (function_exists("xcache_get") AND function_exists("xcache_isset")) - if (xcache_isset($uid."|".$family."|".$key)) { - $val = xcache_get($uid."|".$family."|".$key); - $a->config[$uid][$family][$key] = $val; - - if ($val === '!!') - return false; - else - return $val; - }*/ - - $ret = q("SELECT `v` FROM `pconfig` WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1", intval($uid), dbesc($family), @@ -116,22 +93,10 @@ class PConfig { $val = (preg_match("|^a:[0-9]+:{.*}$|s", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']); $a->config[$uid][$family][$key] = $val; - // If APC is enabled then store the data there, else try XCache - /*if (function_exists("apc_store")) - apc_store($uid."|".$family."|".$key, $val, 600); - elseif (function_exists("xcache_set")) - xcache_set($uid."|".$family."|".$key, $val, 600);*/ - return $val; } else { $a->config[$uid][$family][$key] = '!!'; - - // If APC is enabled then store the data there, else try XCache - /*if (function_exists("apc_store")) - apc_store($uid."|".$family."|".$key, '!!', 600); - elseif (function_exists("xcache_set")) - xcache_set($uid."|".$family."|".$key, '!!', 600);*/ } return $default_value; } @@ -182,13 +147,6 @@ class PConfig { $a->config[$uid][$family][$key] = $value; - // If APC is enabled then store the data there, else try XCache - /*if (function_exists("apc_store")) - apc_store($uid."|".$family."|".$key, $value, 600); - elseif (function_exists("xcache_set")) - xcache_set($uid."|".$family."|".$key, $value, 600);*/ - - if($ret) return $value; return $ret; From 76382147aec6fb64fd08f46b82b0db7434a0daf8 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Fri, 30 Sep 2016 09:22:35 -0400 Subject: [PATCH 174/352] Fix Issue #2816 - Fix wrong variable name in Config and PConfig --- include/Core/Config.php | 4 ++-- include/Core/PConfig.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/Core/Config.php b/include/Core/Config.php index 761d7f490e..5703558cf3 100644 --- a/include/Core/Config.php +++ b/include/Core/Config.php @@ -2,7 +2,7 @@ namespace Friendica\Core; /** * @file include/Core/Config.php - * + * * @brief Contains the class with methods for system configuration */ @@ -74,7 +74,7 @@ class Config { global $a; - if(! $instore) { + if(! $refresh) { // Looking if the whole family isn't set if(isset($a->config[$family])) { if($a->config[$family] === '!!') { diff --git a/include/Core/PConfig.php b/include/Core/PConfig.php index bf563d06e0..2bc08667a7 100644 --- a/include/Core/PConfig.php +++ b/include/Core/PConfig.php @@ -67,7 +67,7 @@ class PConfig { global $a; - if(! $instore) { + if(! $refresh) { // Looking if the whole family isn't set if(isset($a->config[$uid][$family])) { if($a->config[$uid][$family] === '!!') { @@ -134,7 +134,7 @@ class PConfig { dbesc($key), dbesc($dbvalue) ); - if($ret) + if($ret) return $value; return $ret; } From 5a5284b94e7dc604a2d66ebf9adebe9183163509 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Fri, 30 Sep 2016 10:45:47 -0400 Subject: [PATCH 175/352] Fix #2817 - Move translation folders under `view/lang` --- view/{ => lang}/bg/messages.po | 0 view/{ => lang}/bg/strings.php | 0 view/{ => lang}/ca/messages.po | 0 view/{ => lang}/ca/strings.php | 0 view/{ => lang}/cs/messages.po | 0 view/{ => lang}/cs/strings.php | 0 view/{ => lang}/de/messages.po | 0 view/{ => lang}/de/strings.php | 0 view/{ => lang}/eo/messages.po | 0 view/{ => lang}/eo/strings.php | 0 view/{ => lang}/es/messages.po | 0 view/{ => lang}/es/strings.php | 0 view/{ => lang}/fr/messages.po | 0 view/{ => lang}/fr/strings.php | 0 view/{ => lang}/is/messages.po | 0 view/{ => lang}/is/strings.php | 0 view/{ => lang}/it/messages.po | 0 view/{ => lang}/it/strings.php | 0 view/{ => lang}/nb-no/messages.po | 0 view/{ => lang}/nb-no/strings.php | 0 view/{ => lang}/nl/messages.po | 0 view/{ => lang}/nl/strings.php | 0 view/{ => lang}/pl/messages.po | 0 view/{ => lang}/pl/strings.php | 0 view/{ => lang}/pt-br/messages.po | 0 view/{ => lang}/pt-br/strings.php | 0 view/{ => lang}/ro/messages.po | 0 view/{ => lang}/ro/strings.php | 0 view/{ => lang}/ru/messages.po | 0 view/{ => lang}/ru/strings.php | 0 view/{ => lang}/sv/messages.po | 0 view/{ => lang}/sv/strings.php | 0 view/{ => lang}/zh-cn/messages.po | 0 view/{ => lang}/zh-cn/strings.php | 0 34 files changed, 0 insertions(+), 0 deletions(-) rename view/{ => lang}/bg/messages.po (100%) rename view/{ => lang}/bg/strings.php (100%) rename view/{ => lang}/ca/messages.po (100%) rename view/{ => lang}/ca/strings.php (100%) rename view/{ => lang}/cs/messages.po (100%) rename view/{ => lang}/cs/strings.php (100%) rename view/{ => lang}/de/messages.po (100%) rename view/{ => lang}/de/strings.php (100%) rename view/{ => lang}/eo/messages.po (100%) rename view/{ => lang}/eo/strings.php (100%) rename view/{ => lang}/es/messages.po (100%) rename view/{ => lang}/es/strings.php (100%) rename view/{ => lang}/fr/messages.po (100%) rename view/{ => lang}/fr/strings.php (100%) rename view/{ => lang}/is/messages.po (100%) rename view/{ => lang}/is/strings.php (100%) rename view/{ => lang}/it/messages.po (100%) rename view/{ => lang}/it/strings.php (100%) rename view/{ => lang}/nb-no/messages.po (100%) rename view/{ => lang}/nb-no/strings.php (100%) rename view/{ => lang}/nl/messages.po (100%) rename view/{ => lang}/nl/strings.php (100%) rename view/{ => lang}/pl/messages.po (100%) rename view/{ => lang}/pl/strings.php (100%) rename view/{ => lang}/pt-br/messages.po (100%) rename view/{ => lang}/pt-br/strings.php (100%) rename view/{ => lang}/ro/messages.po (100%) rename view/{ => lang}/ro/strings.php (100%) rename view/{ => lang}/ru/messages.po (100%) rename view/{ => lang}/ru/strings.php (100%) rename view/{ => lang}/sv/messages.po (100%) rename view/{ => lang}/sv/strings.php (100%) rename view/{ => lang}/zh-cn/messages.po (100%) rename view/{ => lang}/zh-cn/strings.php (100%) diff --git a/view/bg/messages.po b/view/lang/bg/messages.po similarity index 100% rename from view/bg/messages.po rename to view/lang/bg/messages.po diff --git a/view/bg/strings.php b/view/lang/bg/strings.php similarity index 100% rename from view/bg/strings.php rename to view/lang/bg/strings.php diff --git a/view/ca/messages.po b/view/lang/ca/messages.po similarity index 100% rename from view/ca/messages.po rename to view/lang/ca/messages.po diff --git a/view/ca/strings.php b/view/lang/ca/strings.php similarity index 100% rename from view/ca/strings.php rename to view/lang/ca/strings.php diff --git a/view/cs/messages.po b/view/lang/cs/messages.po similarity index 100% rename from view/cs/messages.po rename to view/lang/cs/messages.po diff --git a/view/cs/strings.php b/view/lang/cs/strings.php similarity index 100% rename from view/cs/strings.php rename to view/lang/cs/strings.php diff --git a/view/de/messages.po b/view/lang/de/messages.po similarity index 100% rename from view/de/messages.po rename to view/lang/de/messages.po diff --git a/view/de/strings.php b/view/lang/de/strings.php similarity index 100% rename from view/de/strings.php rename to view/lang/de/strings.php diff --git a/view/eo/messages.po b/view/lang/eo/messages.po similarity index 100% rename from view/eo/messages.po rename to view/lang/eo/messages.po diff --git a/view/eo/strings.php b/view/lang/eo/strings.php similarity index 100% rename from view/eo/strings.php rename to view/lang/eo/strings.php diff --git a/view/es/messages.po b/view/lang/es/messages.po similarity index 100% rename from view/es/messages.po rename to view/lang/es/messages.po diff --git a/view/es/strings.php b/view/lang/es/strings.php similarity index 100% rename from view/es/strings.php rename to view/lang/es/strings.php diff --git a/view/fr/messages.po b/view/lang/fr/messages.po similarity index 100% rename from view/fr/messages.po rename to view/lang/fr/messages.po diff --git a/view/fr/strings.php b/view/lang/fr/strings.php similarity index 100% rename from view/fr/strings.php rename to view/lang/fr/strings.php diff --git a/view/is/messages.po b/view/lang/is/messages.po similarity index 100% rename from view/is/messages.po rename to view/lang/is/messages.po diff --git a/view/is/strings.php b/view/lang/is/strings.php similarity index 100% rename from view/is/strings.php rename to view/lang/is/strings.php diff --git a/view/it/messages.po b/view/lang/it/messages.po similarity index 100% rename from view/it/messages.po rename to view/lang/it/messages.po diff --git a/view/it/strings.php b/view/lang/it/strings.php similarity index 100% rename from view/it/strings.php rename to view/lang/it/strings.php diff --git a/view/nb-no/messages.po b/view/lang/nb-no/messages.po similarity index 100% rename from view/nb-no/messages.po rename to view/lang/nb-no/messages.po diff --git a/view/nb-no/strings.php b/view/lang/nb-no/strings.php similarity index 100% rename from view/nb-no/strings.php rename to view/lang/nb-no/strings.php diff --git a/view/nl/messages.po b/view/lang/nl/messages.po similarity index 100% rename from view/nl/messages.po rename to view/lang/nl/messages.po diff --git a/view/nl/strings.php b/view/lang/nl/strings.php similarity index 100% rename from view/nl/strings.php rename to view/lang/nl/strings.php diff --git a/view/pl/messages.po b/view/lang/pl/messages.po similarity index 100% rename from view/pl/messages.po rename to view/lang/pl/messages.po diff --git a/view/pl/strings.php b/view/lang/pl/strings.php similarity index 100% rename from view/pl/strings.php rename to view/lang/pl/strings.php diff --git a/view/pt-br/messages.po b/view/lang/pt-br/messages.po similarity index 100% rename from view/pt-br/messages.po rename to view/lang/pt-br/messages.po diff --git a/view/pt-br/strings.php b/view/lang/pt-br/strings.php similarity index 100% rename from view/pt-br/strings.php rename to view/lang/pt-br/strings.php diff --git a/view/ro/messages.po b/view/lang/ro/messages.po similarity index 100% rename from view/ro/messages.po rename to view/lang/ro/messages.po diff --git a/view/ro/strings.php b/view/lang/ro/strings.php similarity index 100% rename from view/ro/strings.php rename to view/lang/ro/strings.php diff --git a/view/ru/messages.po b/view/lang/ru/messages.po similarity index 100% rename from view/ru/messages.po rename to view/lang/ru/messages.po diff --git a/view/ru/strings.php b/view/lang/ru/strings.php similarity index 100% rename from view/ru/strings.php rename to view/lang/ru/strings.php diff --git a/view/sv/messages.po b/view/lang/sv/messages.po similarity index 100% rename from view/sv/messages.po rename to view/lang/sv/messages.po diff --git a/view/sv/strings.php b/view/lang/sv/strings.php similarity index 100% rename from view/sv/strings.php rename to view/lang/sv/strings.php diff --git a/view/zh-cn/messages.po b/view/lang/zh-cn/messages.po similarity index 100% rename from view/zh-cn/messages.po rename to view/lang/zh-cn/messages.po diff --git a/view/zh-cn/strings.php b/view/lang/zh-cn/strings.php similarity index 100% rename from view/zh-cn/strings.php rename to view/lang/zh-cn/strings.php From 8fc558b8e65024c1e1e9a95d598a2c40b0679600 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Fri, 30 Sep 2016 10:46:56 -0400 Subject: [PATCH 176/352] Fix #2817 - Change all references to language folders --- README.translate.md | 10 +++--- doc/translations.md | 10 +++--- include/pgettext.php | 12 ++++---- include/text.php | 20 ++++++------ util/README | 72 ++++++++++++++++++++++---------------------- util/make_credits.py | 2 +- util/typo.php | 10 +++--- 7 files changed, 68 insertions(+), 68 deletions(-) diff --git a/README.translate.md b/README.translate.md index 728a56ab30..861e98440a 100644 --- a/README.translate.md +++ b/README.translate.md @@ -24,12 +24,12 @@ If you want to get your work into the source tree yourself, feel free to do so a The process is simple and friendica ships with all the tools necessary. The location of the translated files in the source tree is - /view/LNG-CODE/ + /view/lang/LNG-CODE/ where LNG-CODE is the language code used, e.g. de for German or fr for French. The translated strings come as a "message.po" file from transifex which needs to be translated into the PHP file friendica uses. To do so, place the file in the directory mentioned above and use the "po2php" utility from the util directory of your friendica installation. -Assuming you want to convert the German localization which is placed in view/de/message.po you would do the following. +Assuming you want to convert the German localization which is placed in view/lang/de/message.po you would do the following. 1. Navigate at the command prompt to the base directory of your friendica installation @@ -37,9 +37,9 @@ Assuming you want to convert the German localization which is placed in view/de/ 2. Execute the po2php script, which will place the translation in the strings.php file that is used by friendica. - $> php util/po2php.php view/de/messages.po + $> php util/po2php.php view/lang/de/messages.po - The output of the script will be placed at view/de/strings.php where + The output of the script will be placed at view/lang/de/strings.php where friendica is expecting it, so you can test your translation immediately. 3. Visit your friendica page to check if it still works in the language you @@ -50,7 +50,7 @@ Assuming you want to convert the German localization which is placed in view/de/ not give any output if the file is ok but might give a hint for searching the bug in the file. - $> php view/de/strings.php + $> php view/lang/de/strings.php 4. commit the two files with a meaningful commit message to your git repository, push it to your fork of the friendica repository at github and diff --git a/doc/translations.md b/doc/translations.md index 728a56ab30..861e98440a 100644 --- a/doc/translations.md +++ b/doc/translations.md @@ -24,12 +24,12 @@ If you want to get your work into the source tree yourself, feel free to do so a The process is simple and friendica ships with all the tools necessary. The location of the translated files in the source tree is - /view/LNG-CODE/ + /view/lang/LNG-CODE/ where LNG-CODE is the language code used, e.g. de for German or fr for French. The translated strings come as a "message.po" file from transifex which needs to be translated into the PHP file friendica uses. To do so, place the file in the directory mentioned above and use the "po2php" utility from the util directory of your friendica installation. -Assuming you want to convert the German localization which is placed in view/de/message.po you would do the following. +Assuming you want to convert the German localization which is placed in view/lang/de/message.po you would do the following. 1. Navigate at the command prompt to the base directory of your friendica installation @@ -37,9 +37,9 @@ Assuming you want to convert the German localization which is placed in view/de/ 2. Execute the po2php script, which will place the translation in the strings.php file that is used by friendica. - $> php util/po2php.php view/de/messages.po + $> php util/po2php.php view/lang/de/messages.po - The output of the script will be placed at view/de/strings.php where + The output of the script will be placed at view/lang/de/strings.php where friendica is expecting it, so you can test your translation immediately. 3. Visit your friendica page to check if it still works in the language you @@ -50,7 +50,7 @@ Assuming you want to convert the German localization which is placed in view/de/ not give any output if the file is ok but might give a hint for searching the bug in the file. - $> php view/de/strings.php + $> php view/lang/de/strings.php 4. commit the two files with a meaningful commit message to your git repository, push it to your fork of the friendica repository at github and diff --git a/include/pgettext.php b/include/pgettext.php index f72cbb08a7..3c389ce2e5 100644 --- a/include/pgettext.php +++ b/include/pgettext.php @@ -41,7 +41,7 @@ function get_browser_language() { if(isset($langs) && count($langs)) { foreach ($langs as $lang => $v) { - if(file_exists("view/$lang") && is_dir("view/$lang")) { + if(file_exists("view/lang/$lang") && is_dir("view/lang/$lang")) { $preferred = $lang; break; } @@ -112,8 +112,8 @@ function load_translation_table($lang) { } } - if(file_exists("view/$lang/strings.php")) { - include("view/$lang/strings.php"); + if(file_exists("view/lang/$lang/strings.php")) { + include("view/lang/$lang/strings.php"); } }} @@ -171,11 +171,11 @@ function string_plural_select_default($n) { */ function get_avaiable_languages() { $lang_choices = array(); - $langs = glob('view/*/strings.php'); /**/ + $langs = glob('view/lang/*/strings.php'); /**/ if(is_array($langs) && count($langs)) { - if(! in_array('view/en/strings.php',$langs)) - $langs[] = 'view/en/'; + if(! in_array('view/lang/en/strings.php',$langs)) + $langs[] = 'view/lang/en/'; asort($langs); foreach($langs as $l) { $t = explode("/",$l); diff --git a/include/text.php b/include/text.php index 2276f6688d..72fce41861 100644 --- a/include/text.php +++ b/include/text.php @@ -581,14 +581,14 @@ function get_intltext_template($s) { if(! isset($lang)) $lang = 'en'; - if(file_exists("view/$lang$engine/$s")) { + if(file_exists("view/lang/$lang$engine/$s")) { $stamp1 = microtime(true); - $content = file_get_contents("view/$lang$engine/$s"); + $content = file_get_contents("view/lang/$lang$engine/$s"); $a->save_timestamp($stamp1, "file"); return $content; - } elseif(file_exists("view/en$engine/$s")) { + } elseif(file_exists("view/lang/en$engine/$s")) { $stamp1 = microtime(true); - $content = file_get_contents("view/en$engine/$s"); + $content = file_get_contents("view/lang/en$engine/$s"); $a->save_timestamp($stamp1, "file"); return $content; } else { @@ -928,11 +928,11 @@ function contact_block() { * string 'thumb' => The contact picture * string 'click' => js code which is performed when clicking on the contact * @param boolean $redirect If true try to use the redir url if it's possible - * @param string $class CSS class for the + * @param string $class CSS class for the * @param boolean $textmode If true display the contacts as text links * if false display the contacts as picture links - - * @return string Formatted html + + * @return string Formatted html */ function micropro($contact, $redirect = false, $class = '', $textmode = false) { @@ -2087,7 +2087,7 @@ function formatBytes($bytes, $precision = 2) { /** * @brief translate and format the networkname of a contact - * + * * @param string $network * Networkname of the contact (e.g. dfrn, rss and so on) * @param sting $url @@ -2132,7 +2132,7 @@ function text_highlight($s,$lang) { $s = trim(html_entity_decode($s,ENT_COMPAT)); $s = str_replace(" ","\t",$s); - // The highlighter library insists on an opening php tag for php code blocks. If + // The highlighter library insists on an opening php tag for php code blocks. If // it isn't present, nothing is highlighted. So we're going to see if it's present. // If not, we'll add it, and then quietly remove it after we get the processed output back. @@ -2141,7 +2141,7 @@ function text_highlight($s,$lang) { $s = 'string["%d message sent"] = Array( @@ -82,12 +82,12 @@ Xgettext and .po workflow This script runs xgettext on source tree, extracting strings from t() and tt() functions, and creates a util/messages.po file. - $ cd util; ./run_xgettext.sh + $ cd util; ./run_xgettext.sh -2. copy util/messages.po to view//messages.po - Replace with the language you are working on - e.g. 'es', 'fr', 'de', etc. +2. copy util/messages.po to view/lang//messages.po + Replace with the language you are working on - e.g. 'es', 'fr', 'de', etc. -3. open view//messages.po with a text editor and fill in infos in +3. open view/lang//messages.po with a text editor and fill in infos in "Last-Translator: FULL NAME " "Language-Team: LANGUAGE \n" "Language: \n" @@ -97,30 +97,30 @@ Xgettext and .po workflow "Language-Team: Pirate Friendika \n" "Language: pi\n" ) - + For the line "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" - read GNU gettext manual at + read GNU gettext manual at http://www.gnu.org/software/hello/manual/gettext/Plural-forms.html - + 4. You could then translate the strings in text editor, but I suggest to use one of the many .po editors out there, like QtLinguist - -5. run - $ php util/po2php.php view//messages.po + +5. run + $ php util/po2php.php view/lang//messages.po to create the strings.php file - + When strings are added or modified in source, you could run - $ cd util; ./run_xgettext.sh ../view//messages.po + $ cd util; ./run_xgettext.sh ../view/lang//messages.po to extract strings from source files and join them with the existing .po file: new strings are added, the existing are not overwritten. - + If you already translated Friendica using strings.php, you could import your old translation to messages.po. Run: -$ php util/php2po.php view//strings.php +$ php util/php2po.php view/lang//strings.php + + +You may also use the util/string_translator.php web interface to translate the string file, but it is disabled for website security reasons. The web server will need write permission to your language directories and the "Deny ..." line in util/.htaccess will need to be modified or commented to use the utility. -You may also use the util/string_translator.php web interface to translate the string file, but it is disabled for website security reasons. The web server will need write permission to your language directories and the "Deny ..." line in util/.htaccess will need to be modified or commented to use the utility. - - diff --git a/util/make_credits.py b/util/make_credits.py index abd6d53001..9575f10ffb 100755 --- a/util/make_credits.py +++ b/util/make_credits.py @@ -67,7 +67,7 @@ os.chdir(path) # get the translators print('> getting translators') intrans = False -for f in glob.glob(path+'/view/*/messages.po'): +for f in glob.glob(path+'/view/lang/*/messages.po'): i = open(f, 'r') l = i.readlines() i.close() diff --git a/util/typo.php b/util/typo.php index 0e2177c706..d68ac2ac9b 100644 --- a/util/typo.php +++ b/util/typo.php @@ -1,6 +1,6 @@ config,'php_path')) @@ -29,7 +29,7 @@ foreach($files as $file) { passthru("$phpath -l $file", $ret); $ret===0 or die(); } - + echo "Directory: object\n"; $files = glob('object/*.php'); foreach($files as $file) { @@ -53,7 +53,7 @@ echo 'util/strings.php' . "\n"; passthru("$phpath -l util/strings.php", $ret); $ret===0 or die(); - $files = glob('view/*/strings.php'); + $files = glob('view/lang/*/strings.php'); foreach($files as $file) { passthru("$phpath -l $file", $ret); $ret===0 or die(); } From 76b1b109e5fc332bd2fdb545f244c3b697accf7e Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Fri, 30 Sep 2016 23:26:22 -0400 Subject: [PATCH 177/352] Fix Issue #2823 - Ugly scrollbars in oembed iframes and broken resizing - Fix _resizeIframe function, shorten the timeout between calls - Simplify the oembed iframe generation code and reduce the minimum iframe height to 200px - Add smooth CSS transition for iframe resizing --- include/oembed.php | 41 ++++++++++++++++++++++++----------------- js/main.js | 13 +++++-------- view/global.css | 1 + 3 files changed, 30 insertions(+), 25 deletions(-) diff --git a/include/oembed.php b/include/oembed.php index c362ab45e6..9c1b3d431f 100755 --- a/include/oembed.php +++ b/include/oembed.php @@ -209,25 +209,32 @@ function oembed_format_object($j){ return mb_convert_encoding($ret, 'HTML-ENTITIES', mb_detect_encoding($ret)); } -function oembed_iframe($src,$width,$height) { - - if(! $width || strstr($width,'%')) - $width = '640'; - if(! $height || strstr($height,'%')) { - $height = '300'; - $resize = 'onload="resizeIframe(this);"'; - } else - $resize = ''; - - // try and leave some room for the description line. - $height = intval($height) + 80; - $width = intval($width) + 40; +/** + * Generates the iframe HTML for an oembed attachment. Width and height are given + * by the remote, and are regularly too small for the generated iframe. + * + * The width is entirely discarded for the actual width of the post, while fixed + * height is used as a starting point before the inevitable resizing. + * + * Since the iframe is automatically resized on load, there are no need for ugly + * and impractical scrollbars. + * + * @param string $src Original remote URL to embed + * @param string $width + * @param string $height + * @return string + * + * @see oembed_format_object() + */ +function oembed_iframe($src, $width, $height) { + if (!$height || strstr($height,'%')) { + $height = '200'; + } + $width = '100%'; $a = get_app(); - - $s = $a->get_baseurl()."/oembed/".base64url_encode($src); - return ''; - + $s = $a->get_baseurl() . '/oembed/'.base64url_encode($src); + return ''; } diff --git a/js/main.js b/js/main.js index aa6a48fcb6..9f06a833e0 100644 --- a/js/main.js +++ b/js/main.js @@ -5,17 +5,14 @@ function _resizeIframe(obj, desth) { var h = obj.style.height; - var ch = obj.contentWindow.document.body.scrollHeight + 'px'; - if (h==ch) { + var ch = obj.contentWindow.document.body.scrollHeight; + if (h == (ch + 'px')) { return; } - //console.log("_resizeIframe", obj, desth, ch); - if (desth!=ch) { - setTimeout(_resizeIframe, 500, obj, ch); - } else { - if (ch>0) obj.style.height = ch; - setTimeout(_resizeIframe, 1000, obj, ch); + if (desth == ch && ch>0) { + obj.style.height = ch + 'px'; } + setTimeout(_resizeIframe, 100, obj, ch); } function openClose(theID) { diff --git a/view/global.css b/view/global.css index 8f0b06507c..40919542de 100644 --- a/view/global.css +++ b/view/global.css @@ -115,6 +115,7 @@ span.connector { .embed_rich { display: block; + transition: height .75s; } /* Shared Messages */ From efd574ab83019a9410c623c3ebcc310904d1a0f7 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 1 Oct 2016 08:21:37 +0000 Subject: [PATCH 178/352] Support of utf8mb4 --- include/dbstructure.php | 60 +++++++++++++++++++++++++---------------- 1 file changed, 37 insertions(+), 23 deletions(-) diff --git a/include/dbstructure.php b/include/dbstructure.php index 89c439f8a4..21545153b8 100644 --- a/include/dbstructure.php +++ b/include/dbstructure.php @@ -79,7 +79,11 @@ function table_structure($table) { continue; $column = $index["Column_name"]; - if ($index["Sub_part"] != "") + // On utf8mb4 a varchar index can only have a length of 191 + // To avoid the need to add this to every index definition we just ignore it here. + // Exception are primary indexes + // Since there are some combindex primary indexes we use the limit of 180 here. + if (($index["Sub_part"] != "") AND (($index["Sub_part"] < 180) OR ($index["Key_name"] == "PRIMARY"))) $column .= "(".$index["Sub_part"].")"; $indexdata[$index["Key_name"]][] = $column; @@ -104,7 +108,7 @@ function table_structure($table) { return(array("fields"=>$fielddata, "indexes"=>$indexdata)); } -function print_structure($database) { +function print_structure($database, $charset) { echo "-- ------------------------------------------\n"; echo "-- ".FRIENDICA_PLATFORM." ".FRIENDICA_VERSION." (".FRIENDICA_CODENAME,")\n"; echo "-- DB_UPDATE_VERSION ".DB_UPDATE_VERSION."\n"; @@ -113,7 +117,7 @@ function print_structure($database) { echo "--\n"; echo "-- TABLE $name\n"; echo "--\n"; - db_create_table($name, $structure['fields'], true, false, $structure["indexes"]); + db_create_table($name, $structure['fields'], $charset, true, false, $structure["indexes"]); echo "\n"; } @@ -122,6 +126,11 @@ function print_structure($database) { function update_structure($verbose, $action, $tables=null, $definition=null) { global $a, $db; + if (isset($a->config["system"]["db_charset"])) + $charset = $a->config["system"]["db_charset"]; + else + $charset = "utf8"; + $errors = false; logger('updating structure', LOGGER_DEBUG); @@ -140,7 +149,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) { // Get the definition if (is_null($definition)) - $definition = db_definition(); + $definition = db_definition($charset); // Compare it @@ -148,7 +157,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) { $is_new_table = False; $sql3=""; if (!isset($database[$name])) { - $r = db_create_table($name, $structure["fields"], $verbose, $action, $structure['indexes']); + $r = db_create_table($name, $structure["fields"], $charset, $verbose, $action, $structure['indexes']); if(false === $r) { $errors .= t('Errors encountered creating database tables.').$name.EOL; } @@ -257,16 +266,9 @@ function db_field_command($parameters, $create = true) { return($fieldstruct); } -function db_create_table($name, $fields, $verbose, $action, $indexes=null) { +function db_create_table($name, $fields, $charset, $verbose, $action, $indexes=null) { global $a, $db; - if (isset($a->config["system"]["db_charset"])) - $charset = $a->config["system"]["db_charset"]; - elseif (!$action) // Used for dumpsql - $charset = "utf8mb4"; - else - $charset = "utf8"; - $r = true; $sql = ""; @@ -322,11 +324,6 @@ function db_create_index($indexname, $fieldnames, $method="ADD") { killme(); } - - if ($indexname == "PRIMARY") { - return sprintf("%s PRIMARY KEY(`%s`)", $method, implode("`,`", $fieldnames)); - } - $names = ""; foreach ($fieldnames AS $fieldname) { if ($names != "") @@ -338,12 +335,27 @@ function db_create_index($indexname, $fieldnames, $method="ADD") { $names .= "`".dbesc($fieldname)."`"; } + if ($indexname == "PRIMARY") { + //return sprintf("%s PRIMARY KEY(`%s`)", $method, implode("`,`", $fieldnames)); + return sprintf("%s PRIMARY KEY(%s)", $method, $names); + } + $sql = sprintf("%s INDEX `%s` (%s)", $method, dbesc($indexname), $names); return($sql); } -function db_definition() { +function db_index_suffix($charset, $reduce = 0) { + if ($charset != "utf8mb4") + return ""; + + // On utf8mb4 indexes can only have a length of 191 + $indexlength = 191 - $reduce; + + return "(".$indexlength.")"; +} + +function db_definition($charset) { $database = array(); @@ -401,7 +413,7 @@ function db_definition() { "updated" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"), ), "indexes" => array( - "PRIMARY" => array("k"), + "PRIMARY" => array("k".db_index_suffix($charset)), "updated" => array("updated"), ) ); @@ -1022,7 +1034,7 @@ function db_definition() { "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"), ), "indexes" => array( - "PRIMARY" => array("url"), + "PRIMARY" => array("url".db_index_suffix($charset)), "created" => array("created"), ) ); @@ -1035,7 +1047,7 @@ function db_definition() { "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"), ), "indexes" => array( - "PRIMARY" => array("url", "guessing", "oembed"), + "PRIMARY" => array("url".db_index_suffix($charset), "guessing", "oembed"), "created" => array("created"), ) ); @@ -1478,7 +1490,9 @@ function dbstructure_run(&$argv, &$argc) { set_config('system','build',DB_UPDATE_VERSION); return; case "dumpsql": - print_structure(db_definition()); + // For the dump that is used to create the database.sql we always assume utfmb4 + $charset = "utf8mb4"; + print_structure(db_definition($charset), $charset); return; } } From f4f09f08b5da91bf339d4dea434d61b3dc4a66f6 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 1 Oct 2016 08:33:09 +0000 Subject: [PATCH 179/352] Removed unneeded line --- include/dbstructure.php | 1 - 1 file changed, 1 deletion(-) diff --git a/include/dbstructure.php b/include/dbstructure.php index 21545153b8..0c933c6648 100644 --- a/include/dbstructure.php +++ b/include/dbstructure.php @@ -336,7 +336,6 @@ function db_create_index($indexname, $fieldnames, $method="ADD") { } if ($indexname == "PRIMARY") { - //return sprintf("%s PRIMARY KEY(`%s`)", $method, implode("`,`", $fieldnames)); return sprintf("%s PRIMARY KEY(%s)", $method, $names); } From 7aa4f5297db47d7287ea47943771c013761761cd Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sat, 1 Oct 2016 15:55:18 +0200 Subject: [PATCH 180/352] when the admin creates a new account, use the system language for this accounts --- mod/admin.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/mod/admin.php b/mod/admin.php index 4dc6064a7d..8fb0df24c4 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -1127,18 +1127,20 @@ function admin_page_dbsync(&$a) { * @param App $a */ function admin_page_users_post(&$a){ - $pending = (x($_POST, 'pending') ? $_POST['pending'] : array()); - $users = (x($_POST, 'user') ? $_POST['user'] : array()); - $nu_name = (x($_POST, 'new_user_name') ? $_POST['new_user_name'] : ''); - $nu_nickname = (x($_POST, 'new_user_nickname') ? $_POST['new_user_nickname'] : ''); - $nu_email = (x($_POST, 'new_user_email') ? $_POST['new_user_email'] : ''); + $pending = (x($_POST, 'pending') ? $_POST['pending'] : array()); + $users = (x($_POST, 'user') ? $_POST['user'] : array()); + $nu_name = (x($_POST, 'new_user_name') ? $_POST['new_user_name'] : ''); + $nu_nickname = (x($_POST, 'new_user_nickname') ? $_POST['new_user_nickname'] : ''); + $nu_email = (x($_POST, 'new_user_email') ? $_POST['new_user_email'] : ''); + $nu_language = get_config('system', 'language'); check_form_security_token_redirectOnErr('/admin/users', 'admin_users'); if(!($nu_name==="") && !($nu_email==="") && !($nu_nickname==="")) { require_once('include/user.php'); - $result = create_user(array('username'=>$nu_name, 'email'=>$nu_email, 'nickname'=>$nu_nickname, 'verified'=>1)); + $result = create_user(array('username'=>$nu_name, 'email'=>$nu_email, + 'nickname'=>$nu_nickname, 'verified'=>1, 'language'=>$nu_language)); if(! $result['success']) { notice($result['message']); return; From 5cfca894c1c891dec0f96eb2d86aefdea1ff1ec5 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sat, 1 Oct 2016 15:55:56 +0200 Subject: [PATCH 181/352] On registration use the browser preferred language for the new account --- mod/register.php | 1 + 1 file changed, 1 insertion(+) diff --git a/mod/register.php b/mod/register.php index 6fc5887ef5..4f5652f2f7 100644 --- a/mod/register.php +++ b/mod/register.php @@ -52,6 +52,7 @@ function register_post(&$a) { $arr['blocked'] = $blocked; $arr['verified'] = $verified; + $arr['language'] = get_browser_language(); $result = create_user($arr); From aba8313b210499440eb2237baa42a503ad4d4cc3 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sat, 1 Oct 2016 15:57:37 +0200 Subject: [PATCH 182/352] don't save browser selected language on login --- include/security.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/include/security.php b/include/security.php index 2d6db95f4f..b52ddeb2df 100644 --- a/include/security.php +++ b/include/security.php @@ -79,11 +79,9 @@ function authenticate_success($user_record, $login_initial = false, $interactive header('X-Account-Management-Status: active; name="' . $a->user['username'] . '"; id="' . $a->user['nickname'] .'"'); if($login_initial || $login_refresh) { - $l = get_browser_language(); - q("UPDATE `user` SET `login_date` = '%s', `language` = '%s' WHERE `uid` = %d", + q("UPDATE `user` SET `login_date` = '%s' WHERE `uid` = %d", dbesc(datetime_convert()), - dbesc($l), intval($_SESSION['uid']) ); From 8b972510fe2463fe2cd20db70e1fd6d0d05bdee6 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sat, 1 Oct 2016 16:07:23 +0200 Subject: [PATCH 183/352] with translations now in /view/lang/lng shift the array index along --- include/pgettext.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/pgettext.php b/include/pgettext.php index 3c389ce2e5..b400baa3cf 100644 --- a/include/pgettext.php +++ b/include/pgettext.php @@ -179,7 +179,7 @@ function get_avaiable_languages() { asort($langs); foreach($langs as $l) { $t = explode("/",$l); - $lang_choices[$t[1]] = $t[1]; + $lang_choices[$t[2]] = $t[2]; } } return $lang_choices; From 21b30373425391347d462d771ff87ad99147c830 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Sat, 1 Oct 2016 21:16:23 +0200 Subject: [PATCH 184/352] frio: improve readabillity for code blocks --- view/theme/frio/css/style.css | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index 18b7514503..84e8b6e7d8 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -1422,6 +1422,7 @@ section #jotOpen { width: 20px; } +/* wall-item content elements */ .shared-wrapper, .vevent { padding: 10px; @@ -1451,6 +1452,12 @@ blockquote.shared_content { margin-left: 0px; color: inherit; } +code > .hl-main { + padding: 10px 10px 1px 0; +} +.hl-main ol { + line-height: 1.7; +} .wall-item-tags, .itemedited { margin-top: 10px; @@ -1500,7 +1507,7 @@ blockquote.shared_content { .wall-item-actions .button-likes { padding-left: 0px; padding-right: 0px; - text-transform: capitalize; + text-transform: capitalize; } /* wall item hover effects */ From 60a0235af0dfb0a85613fbcf96d48906179f06c4 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 1 Oct 2016 20:03:27 +0000 Subject: [PATCH 185/352] The account type is now read and displayed --- include/Contact.php | 51 ++++++++++++++++++++++++++++++++++++++------ include/dfrn.php | 14 +++++++++++- include/identity.php | 11 ++-------- mod/allfriends.php | 2 +- mod/cal.php | 5 +---- mod/common.php | 2 +- mod/contacts.php | 15 ++++--------- mod/directory.php | 10 +-------- mod/dirfind.php | 2 +- mod/hovercard.php | 3 +-- mod/match.php | 2 +- mod/network.php | 5 +++-- mod/photos.php | 5 +---- mod/suggest.php | 3 +-- mod/videos.php | 5 +---- mod/viewcontacts.php | 2 +- 16 files changed, 78 insertions(+), 59 deletions(-) diff --git a/include/Contact.php b/include/Contact.php index 004d3aa287..f1e8bbe6d6 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -208,22 +208,22 @@ function get_contact_details_by_url($url, $uid = -1, $default = array()) { $uid = local_user(); // Fetch contact data from the contact table for the given user - $r = q("SELECT `id`, `id` AS `cid`, 0 AS `gid`, 0 AS `zid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, - `xmpp`, `keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `bd` AS `birthday`, `self` + $r = q("SELECT `id`, `id` AS `cid`, 0 AS `gid`, 0 AS `zid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`, + `keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, `self` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d", dbesc(normalise_link($url)), intval($uid)); // Fetch the data from the contact table with "uid=0" (which is filled automatically) if (!$r) - $r = q("SELECT `id`, 0 AS `cid`, `id` AS `zid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, - `xmpp`, `keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `bd` AS `birthday`, 0 AS `self` + $r = q("SELECT `id`, 0 AS `cid`, `id` AS `zid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`, + `keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, 0 AS `self` FROM `contact` WHERE `nurl` = '%s' AND `uid` = 0", dbesc(normalise_link($url))); // Fetch the data from the gcontact table if (!$r) - $r = q("SELECT 0 AS `id`, 0 AS `cid`, `id` AS `gid`, 0 AS `zid`, 0 AS `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, - '' AS `xmpp`, `keywords`, `gender`, `photo`, `photo` AS `thumb`, `photo` AS `micro`, `community` AS `forum`, 0 AS `prv`, `community`, `birthday`, 0 AS `self` + $r = q("SELECT 0 AS `id`, 0 AS `cid`, `id` AS `gid`, 0 AS `zid`, 0 AS `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, '' AS `xmpp`, + `keywords`, `gender`, `photo`, `photo` AS `thumb`, `photo` AS `micro`, `community` AS `forum`, 0 AS `prv`, `community`, 0 AS `contact-type`, `birthday`, 0 AS `self` FROM `gcontact` WHERE `nurl` = '%s'", dbesc(normalise_link($url))); @@ -683,4 +683,43 @@ function formatted_location($profile) { return $location; } + +/** + * @brief Returns the account type name + * + * The function be called with either the profile or the contct array + * + * @param array $contact contact or profile array + */ +function account_type($contact) { + + if((isset($contact['page-flags']) && (intval($contact['page-flags']) == PAGE_COMMUNITY)) + || (isset($contact['page-flags']) && (intval($contact['page-flags']) == PAGE_PRVGROUP)) + || (isset($contact['forum']) && intval($contact['forum'])) + || (isset($contact['prv']) && intval($contact['prv'])) + || (isset($contact['community']) && intval($contact['community']))) + $type = ACCOUNT_TYPE_COMMUNITY; + else + $type = ACCOUNT_TYPE_PERSON; + + if (isset($contact["contact-type"])) + $type = $contact["contact-type"]; + if (isset($contact["account-type"])) + $type = $contact["account-type"]; + + if ($type != 0) + switch($type) { + case ACCOUNT_TYPE_ORGANISATION: + $account_type = t("Organisation"); + break; + case ACCOUNT_TYPE_NEWS: + $account_type = t('News'); + break; + case ACCOUNT_TYPE_COMMUNITY: + $account_type = t("Forum"); + break; + } + + return $account_type; +} ?> diff --git a/include/dfrn.php b/include/dfrn.php index e9cfb228f6..c5d00e8a67 100644 --- a/include/dfrn.php +++ b/include/dfrn.php @@ -2492,7 +2492,19 @@ class dfrn { logger("Import DFRN message for user ".$importer["uid"]." from contact ".$importer["id"], LOGGER_DEBUG); - // is it a public forum? Private forums aren't supported by now with this method + // The account type is new since 3.5.1 + if ($xpath->query("/atom:feed/dfrn:account_type")->length > 0) { + $accounttype = intval($xpath->evaluate("/atom:feed/dfrn:account_type/text()", $context)->item(0)->nodeValue); + + if ($accounttype != $importer["contact-type"]) + q("UPDATE `contact` SET `contact-type` = %d WHERE `id` = %d", + intval($accounttype), + intval($importer["id"]) + ); + } + + // is it a public forum? Private forums aren't supported with this method + // This is deprecated since 3.5.1 $forum = intval($xpath->evaluate("/atom:feed/dfrn:community/text()", $context)->item(0)->nodeValue); if ($forum != $importer["forum"]) diff --git a/include/identity.php b/include/identity.php index def50a98fc..b3dbea8fc6 100644 --- a/include/identity.php +++ b/include/identity.php @@ -310,15 +310,8 @@ function profile_sidebar($profile, $block = 0) { ); } - // check if profile is a forum - if((intval($profile['page-flags']) == PAGE_COMMUNITY) - || (intval($profile['page-flags']) == PAGE_PRVGROUP) - || (isset($profile['forum']) && intval($profile['forum'])) - || (isset($profile['prv']) && intval($profile['prv'])) - || (isset($profile['community']) && intval($profile['community']))) - $account_type = t('Forum'); - else - $account_type = ""; + // Fetch the account type + $account_type = account_type($profile); if((x($profile,'address') == 1) || (x($profile,'location') == 1) diff --git a/mod/allfriends.php b/mod/allfriends.php index 498b9d7dbf..03f78e696e 100644 --- a/mod/allfriends.php +++ b/mod/allfriends.php @@ -76,7 +76,7 @@ function allfriends_content(&$a) { 'details' => $contact_details['location'], 'tags' => $contact_details['keywords'], 'about' => $contact_details['about'], - 'account_type' => (($contact_details['community']) ? t('Forum') : ''), + 'account_type' => account_type($contact_details), 'network' => network_to_name($contact_details['network'], $contact_details['url']), 'photo_menu' => $photo_menu, 'conntxt' => t('Connect'), diff --git a/mod/cal.php b/mod/cal.php index ab20617257..78907da06a 100644 --- a/mod/cal.php +++ b/mod/cal.php @@ -40,10 +40,7 @@ function cal_init(&$a) { $profile = get_profiledata_by_nick($nick, $a->profile_uid); - if((intval($profile['page-flags']) == PAGE_COMMUNITY) || (intval($profile['page-flags']) == PAGE_PRVGROUP)) - $account_type = t('Forum'); - else - $account_type = ""; + $account_type = account_type($profile); $tpl = get_markup_template("vcard-widget.tpl"); diff --git a/mod/common.php b/mod/common.php index 9b2c69f6d7..063eafe67b 100644 --- a/mod/common.php +++ b/mod/common.php @@ -120,7 +120,7 @@ function common_content(&$a) { 'details' => $contact_details['location'], 'tags' => $contact_details['keywords'], 'about' => $contact_details['about'], - 'account_type' => (($contact_details['community']) ? t('Forum') : ''), + 'account_type' => account_type($contact_details), 'network' => network_to_name($contact_details['network'], $contact_details['url']), 'photo_menu' => $photo_menu, 'id' => ++$id, diff --git a/mod/contacts.php b/mod/contacts.php index be8135f5cb..410cced8e6 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -38,7 +38,7 @@ function contacts_init(&$a) { if (($a->data['contact']['network'] != "") AND ($a->data['contact']['network'] != NETWORK_DFRN)) { $networkname = format_network_name($a->data['contact']['network'],$a->data['contact']['url']); - } else + } else $networkname = ''; $vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"),array( @@ -48,7 +48,7 @@ function contacts_init(&$a) { '$addr' => (($a->data['contact']['addr'] != "") ? ($a->data['contact']['addr']) : ""), '$network_name' => $networkname, '$network' => t('Network:'), - 'account_type' => (($a->data['contact']['forum'] || $a->data['contact']['prv']) ? t('Forum') : '') + '$account_type' => account_type($a->data['contact']) )); $finpeople_widget = ''; $follow_widget = ''; @@ -623,7 +623,7 @@ function contacts_content(&$a) { '$url' => $url, '$profileurllabel' => t('Profile URL'), '$profileurl' => $contact['url'], - 'account_type' => (($contact['forum'] || $contact['prv']) ? t('Forum') : ''), + '$account_type' => account_type($contact), '$location' => bbcode($contact["location"]), '$location_label' => t("Location:"), '$xmpp' => bbcode($contact["xmpp"]), @@ -910,8 +910,6 @@ function contact_posts($a, $contact_id) { function _contact_detail_for_template($rr){ - $community = ''; - switch($rr['rel']) { case CONTACT_IS_FRIEND: $dir_icon = 'images/lrarrow.gif'; @@ -937,11 +935,6 @@ function _contact_detail_for_template($rr){ $sparkle = ''; } - //test if contact is a forum page - if (isset($rr['forum']) OR isset($rr['prv'])) - $community = ($rr['forum'] OR $rr['prv']); - - return array( 'img_hover' => sprintf( t('Visit %s\'s profile [%s]'),$rr['name'],$rr['url']), 'edit_hover' => t('Edit contact'), @@ -952,7 +945,7 @@ function _contact_detail_for_template($rr){ 'thumb' => proxy_url($rr['thumb'], false, PROXY_SIZE_THUMB), 'name' => htmlentities($rr['name']), 'username' => htmlentities($rr['name']), - 'account_type' => ($community ? t('Forum') : ''), + 'account_type' => account_type($rr), 'sparkle' => $sparkle, 'itemurl' => (($rr['addr'] != "") ? $rr['addr'] : $rr['url']), 'url' => $url, diff --git a/mod/directory.php b/mod/directory.php index a6a9cb8ab2..06aeec622f 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -99,7 +99,6 @@ function directory_content(&$a) { foreach($r as $rr) { - $community = ''; $itemurl= ''; $itemurl = (($rr['addr'] != "") ? $rr['addr'] : $rr['profile_url']); @@ -128,13 +127,6 @@ function directory_content(&$a) { // if(strlen($rr['gender'])) // $details .= '
' . t('Gender: ') . $rr['gender']; - - // show if account is a community account - /// @TODO The other page types should be also respected, but first we need a good - /// translatiion and systemwide consistency for displaying the page type - if((intval($rr['page-flags']) == PAGE_COMMUNITY) OR (intval($rr['page-flags']) == PAGE_PRVGROUP)) - $community = true; - $profile = $rr; if((x($profile,'address') == 1) @@ -171,7 +163,7 @@ function directory_content(&$a) { 'img_hover' => $rr['name'], 'name' => $rr['name'], 'details' => $details, - 'account_type' => ($community ? t('Forum') : ''), + 'account_type' => account_type($rr), 'profile' => $profile, 'location' => $location_e, 'tags' => $rr['pub_keywords'], diff --git a/mod/dirfind.php b/mod/dirfind.php index 52e1617554..215731978c 100644 --- a/mod/dirfind.php +++ b/mod/dirfind.php @@ -220,7 +220,7 @@ function dirfind_content(&$a, $prefix = "") { 'details' => $contact_details['location'], 'tags' => $contact_details['keywords'], 'about' => $contact_details['about'], - 'account_type' => (($contact_details['community']) ? t('Forum') : ''), + 'account_type' => account_type($contact_details), 'network' => network_to_name($jj->network, $jj->url), 'id' => ++$id, ); diff --git a/mod/hovercard.php b/mod/hovercard.php index 9bd91f0d5a..65b75b3211 100644 --- a/mod/hovercard.php +++ b/mod/hovercard.php @@ -77,10 +77,9 @@ function hovercard_content() { // 'server_url' => $contact["server_url"], 'bd' => (($contact["birthday"] == "0000-00-00") ? "" : $contact["birthday"]), // 'generation' => $contact["generation"], - 'account_type' => ($contact['community'] ? t("Forum") : ""), + 'account_type' => account_type($contact), 'actions' => $actions, ); - if($datatype == "html") { $t = get_markup_template("hovercard.tpl"); diff --git a/mod/match.php b/mod/match.php index 8341911577..33e07c91ce 100644 --- a/mod/match.php +++ b/mod/match.php @@ -81,7 +81,7 @@ function match_content(&$a) { 'details' => $contact_details['location'], 'tags' => $contact_details['keywords'], 'about' => $contact_details['about'], - 'account_type' => (($contact_details['community']) ? t('Forum') : ''), + 'account_type' => account_type($contact_details), 'thumb' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB), 'inttxt' => ' ' . t('is interested in:'), 'conntxt' => t('Connect'), diff --git a/mod/network.php b/mod/network.php index 6ebedbcae8..f4af489db9 100644 --- a/mod/network.php +++ b/mod/network.php @@ -502,7 +502,7 @@ function network_content(&$a, $update = 0) { } elseif($cid) { - $r = q("SELECT `id`,`name`,`network`,`writable`,`nurl`, `forum`, `prv`, `addr`, `thumb`, `location` FROM `contact` WHERE `id` = %d + $r = q("SELECT `id`,`name`,`network`,`writable`,`nurl`, `forum`, `prv`, `contact-type`, `addr`, `thumb`, `location` FROM `contact` WHERE `id` = %d AND `blocked` = 0 AND `pending` = 0 LIMIT 1", intval($cid) ); @@ -514,10 +514,11 @@ function network_content(&$a, $update = 0) { 'name' => htmlentities($r[0]['name']), 'itemurl' => (($r[0]['addr']) ? ($r[0]['addr']) : ($r[0]['nurl'])), 'thumb' => proxy_url($r[0]['thumb'], false, PROXY_SIZE_THUMB), - 'account_type' => (($r[0]['forum']) || ($r[0]['prv']) ? t('Forum') : ''), 'details' => $r[0]['location'], ); + $entries[0]["account_type"] = account_type($r[0]); + $o = replace_macros(get_markup_template("viewcontact_template.tpl"),array( 'contacts' => $entries, 'id' => 'network', diff --git a/mod/photos.php b/mod/photos.php index a191dcf071..741181b2e9 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -38,10 +38,7 @@ function photos_init(&$a) { $profile = get_profiledata_by_nick($nick, $a->profile_uid); - if((intval($profile['page-flags']) == PAGE_COMMUNITY) || (intval($profile['page-flags']) == PAGE_PRVGROUP)) - $account_type = t('Forum'); - else - $account_type = ""; + $account_type = account_type($profile); $tpl = get_markup_template("vcard-widget.tpl"); diff --git a/mod/suggest.php b/mod/suggest.php index 00033b2d24..4399450ecc 100644 --- a/mod/suggest.php +++ b/mod/suggest.php @@ -95,7 +95,7 @@ function suggest_content(&$a) { 'details' => $contact_details['location'], 'tags' => $contact_details['keywords'], 'about' => $contact_details['about'], - 'account_type' => (($contact_details['community']) ? t('Forum') : ''), + 'account_type' => account_type($contact_details), 'ignlnk' => $ignlnk, 'ignid' => $rr['id'], 'conntxt' => t('Connect'), @@ -113,7 +113,6 @@ function suggest_content(&$a) { $o .= replace_macros($tpl,array( '$title' => t('Friend Suggestions'), '$contacts' => $entries, - )); return $o; diff --git a/mod/videos.php b/mod/videos.php index e5a0887bb9..fb742eb015 100644 --- a/mod/videos.php +++ b/mod/videos.php @@ -33,10 +33,7 @@ function videos_init(&$a) { $profile = get_profiledata_by_nick($nick, $a->profile_uid); - if((intval($profile['page-flags']) == PAGE_COMMUNITY) || (intval($profile['page-flags']) == PAGE_PRVGROUP)) - $account_type = t('Forum'); - else - $account_type = ""; + $account_type = account_type($profile); $tpl = get_markup_template("vcard-widget.tpl"); diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php index 2eae8fec8e..19dd8b7f95 100644 --- a/mod/viewcontacts.php +++ b/mod/viewcontacts.php @@ -102,7 +102,7 @@ function viewcontacts_content(&$a) { 'details' => $contact_details['location'], 'tags' => $contact_details['keywords'], 'about' => $contact_details['about'], - 'account_type' => (($contact_details['community']) ? t('Forum') : ''), + 'account_type' => account_type($contact_details), 'url' => $url, 'sparkle' => '', 'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']), From 9dee3cc809ab7319e4ce67ccadaf0ac492dc9613 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 1 Oct 2016 20:20:27 +0000 Subject: [PATCH 186/352] Some small changes --- include/Contact.php | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/include/Contact.php b/include/Contact.php index f1e8bbe6d6..936589be98 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -687,12 +687,13 @@ function formatted_location($profile) { /** * @brief Returns the account type name * - * The function be called with either the profile or the contct array + * The function can be called with either the user or the contact array * - * @param array $contact contact or profile array + * @param array $contact contact or user array */ function account_type($contact) { + // There are several fields that indicate that the contact or user is a forum if((isset($contact['page-flags']) && (intval($contact['page-flags']) == PAGE_COMMUNITY)) || (isset($contact['page-flags']) && (intval($contact['page-flags']) == PAGE_PRVGROUP)) || (isset($contact['forum']) && intval($contact['forum'])) @@ -702,23 +703,26 @@ function account_type($contact) { else $type = ACCOUNT_TYPE_PERSON; + // The field is named differently in the user and the contact record if (isset($contact["contact-type"])) $type = $contact["contact-type"]; if (isset($contact["account-type"])) $type = $contact["account-type"]; - if ($type != 0) - switch($type) { - case ACCOUNT_TYPE_ORGANISATION: - $account_type = t("Organisation"); - break; - case ACCOUNT_TYPE_NEWS: - $account_type = t('News'); - break; - case ACCOUNT_TYPE_COMMUNITY: - $account_type = t("Forum"); - break; - } + switch($type) { + case ACCOUNT_TYPE_ORGANISATION: + $account_type = t("Organisation"); + break; + case ACCOUNT_TYPE_NEWS: + $account_type = t('News'); + break; + case ACCOUNT_TYPE_COMMUNITY: + $account_type = t("Forum"); + break; + default: + $account_type = ""; + break; + } return $account_type; } From 2a93c5b816b0762699e0fc5691669109a10aaa16 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 1 Oct 2016 20:27:49 +0000 Subject: [PATCH 187/352] Little fix to the utf8mb4: Now here's the changed database.sql --- database.sql | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/database.sql b/database.sql index ecd2be1529..a482b106cf 100644 --- a/database.sql +++ b/database.sql @@ -58,7 +58,7 @@ CREATE TABLE IF NOT EXISTS `cache` ( `v` text, `expire_mode` int(11) NOT NULL DEFAULT 0, `updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - PRIMARY KEY(`k`), + PRIMARY KEY(`k`(191)), INDEX `updated` (`updated`) ) DEFAULT CHARSET=utf8mb4; @@ -679,7 +679,7 @@ CREATE TABLE IF NOT EXISTS `oembed` ( `url` varchar(255) NOT NULL, `content` text, `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - PRIMARY KEY(`url`), + PRIMARY KEY(`url`(191)), INDEX `created` (`created`) ) DEFAULT CHARSET=utf8mb4; @@ -692,7 +692,7 @@ CREATE TABLE IF NOT EXISTS `parsed_url` ( `oembed` tinyint(1) NOT NULL DEFAULT 0, `content` text, `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - PRIMARY KEY(`url`,`guessing`,`oembed`), + PRIMARY KEY(`url`(191),`guessing`,`oembed`), INDEX `created` (`created`) ) DEFAULT CHARSET=utf8mb4; From f302f66dcdbd5f7eb0a1a5deb0e8642cf4457abc Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 1 Oct 2016 18:19:43 -0400 Subject: [PATCH 188/352] Fix Issue #2800 - Prevent internal links to switch to Safari in standalone mode Add a event delegation to keep internal links inside the standalone window. Fixes 1. of #2800 --- view/templates/head.tpl | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/view/templates/head.tpl b/view/templates/head.tpl index 70add44c2f..fe14a29dcd 100644 --- a/view/templates/head.tpl +++ b/view/templates/head.tpl @@ -18,12 +18,16 @@ - + + +