diff --git a/boot.php b/boot.php index 5a563c9914..7a186ad664 100644 --- a/boot.php +++ b/boot.php @@ -11,7 +11,7 @@ require_once('include/cache.php'); require_once('library/Mobile_Detect/Mobile_Detect.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.0.1421' ); +define ( 'FRIENDICA_VERSION', '3.0.1449' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1154 ); @@ -253,6 +253,7 @@ define ( 'ACTIVITY_TAG', NAMESPACE_ACTIVITY_SCHEMA . 'tag' ); define ( 'ACTIVITY_FAVORITE', NAMESPACE_ACTIVITY_SCHEMA . 'favorite' ); define ( 'ACTIVITY_POKE', NAMESPACE_ZOT . '/activity/poke' ); +define ( 'ACTIVITY_MOOD', NAMESPACE_ZOT . '/activity/mood' ); define ( 'ACTIVITY_OBJ_COMMENT', NAMESPACE_ACTIVITY_SCHEMA . 'comment' ); define ( 'ACTIVITY_OBJ_NOTE', NAMESPACE_ACTIVITY_SCHEMA . 'note' ); @@ -354,6 +355,19 @@ if(! class_exists('App')) { public $category; + // Allow themes to control internal parameters + // by changing App values in theme.php + // + // Possibly should make these part of the plugin + // system, but it seems like overkill to invoke + // all the plugin machinery just to change a couple + // of values + public $sourcename = ''; + public $videowidth = 425; + public $videoheight = 350; + public $force_max_items = 0; + public $theme_thread_allow = true; + private $scheme; private $hostname; private $baseurl; @@ -458,6 +472,7 @@ if(! class_exists('App')) { $this->argc = count($this->argv); if((array_key_exists('0',$this->argv)) && strlen($this->argv[0])) { $this->module = str_replace(".", "_", $this->argv[0]); + $this->module = str_replace("-", "_", $this->module); } else { $this->argc = 1; @@ -465,16 +480,6 @@ if(! class_exists('App')) { $this->module = 'home'; } - /** - * Special handling for the webfinger/lrdd host XRD file - */ - - if($this->cmd === '.well-known/host-meta') { - $this->argc = 1; - $this->argv = array('hostxrd'); - $this->module = 'hostxrd'; - } - /** * See if there is any page number information, and initialise * pagination @@ -722,9 +727,13 @@ if(! function_exists('check_config')) { // than the currently visited url, store the current value accordingly. // "Radically different" ignores common variations such as http vs https // and www.example.com vs example.com. + // We will only change the url to an ip address if there is no existing setting - if((! x($url)) || (! link_compare($url,$a->get_baseurl()))) + if(! x($url)) $url = set_config('system','url',$a->get_baseurl()); + if((! link_compare($url,$a->get_baseurl())) && (! preg_match("/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/",$a->get_hostname))) + $url = set_config('system','url',$a->get_baseurl()); + if($build != DB_UPDATE_VERSION) { $stored = intval($build); @@ -887,6 +896,10 @@ if(! function_exists('login')) { $tpl = get_markup_template("logout.tpl"); } else { + $a->page['htmlhead'] .= replace_macros(get_markup_template("login_head.tpl"),array( + '$baseurl' => $a->get_baseurl(true) + )); + $tpl = get_markup_template("login.tpl"); $_SESSION['return_url'] = $a->query_string; } @@ -1454,7 +1467,10 @@ if(! function_exists('proc_run')) { $args[$x] = escapeshellarg($args[$x]); $cmdline = implode($args," "); - proc_close(proc_open($cmdline." &",array(),$foo)); + if(get_config('system','proc_windows')) + proc_close(proc_open('start /b ' . $cmdline,array(),$foo)); + else + proc_close(proc_open($cmdline." &",array(),$foo)); } } diff --git a/database.sql b/database.sql index fa4f1bd58b..6ba4921cb7 100644 --- a/database.sql +++ b/database.sql @@ -606,7 +606,7 @@ CREATE TABLE IF NOT EXISTS `item_id` ( -- Table structure for table `locks` -- -CREATE TABLE `locks` ( +CREATE TABLE IF NOT EXISTS `locks` ( `id` int(11) NOT NULL AUTO_INCREMENT, `name` char(128) NOT NULL, `locked` tinyint(1) NOT NULL DEFAULT '0', diff --git a/doc/Groups-and-Privacy.md b/doc/Groups-and-Privacy.md index 09c6a7349b..6e860b20d1 100644 --- a/doc/Groups-and-Privacy.md +++ b/doc/Groups-and-Privacy.md @@ -4,7 +4,9 @@ Groups and Privacy * [Home](help) -Groups are merely collections of friends. But Friendica uses these to unlock some very powerful features. +Groups are merely collections of friends. But Friendica uses these to unlock some very powerful features. + +**Setting Up Groups** To create a group, visit your Friendica "Contacts" page and select "Create a new group". Give the group a name. @@ -14,6 +16,8 @@ You will have two boxes on this page. The top box is the roster of current group If you click on a photo of a person who isn't in the group, they will be put into the group. If you click on a photo of a person who is in the group, they will be removed from it. +**Access Control** + Once you have created a group, you may use it in any access control list. This is the little lock icon beneath the status update box on your home page. If you click this you can select who can see and who can *not* see the post you are about to make. These can be individual people or groups. On your "Network" page you will find posts and conversation from everybody in your network. You may select an individual group on this page to show conversations pertaining only to members of that group. @@ -22,32 +26,44 @@ But wait, there's more... If you look carefully when visiting a group from your Network page, the lock icon under the status update box has an exclamation mark next to it. This is meant to draw attention to that lock. Click the lock. You will see that since you are only viewing a certain group of people, your status updates while on that screen default to only being seen by that same group of people. This is how you keep your future employers from seeing what you write to your drinking buddies. You can over-ride this setting, but this makes it easy to separate your conversations into different friend circles. +**Default Post Privacy** + +By default, Friendica assumes that you want all of your posts to be private. Therefore, when you sign up, Friendica creates a group for you that it will automatically add all of your contacts to. All of your posts are restricted to that group by default. + +Note that this behavior can be overridden by your site admin, in which case your posts will be "public" (i.e. visible to the entire Internet) by default. + +If you want your posts to be "public" by default, you can change your default post permissions on your Settings page. You also have the option there to change which groups you post to by default, or to change which group your new contacts get placed into by default. + +**Privacy Concerns To Be Aware Of** + These private conversations work best when your friends are Friendica members. We know who else can see the conversations - nobody, *unless* your friends cut and paste the messages and send them to others. This is a trust issue you need to be aware of. No software in the world can prevent your friends from leaking your confidential and trusted communications. Only a wise choice of friends. But it isn't as clear cut when dealing with status.net, identi.ca and other network providers. You are encouraged to be **very** cautious when other network members are in a group because it's entirely possible for your private messages to end up in a public newsfeed. If you look at the Contact Edit page for any person, we will tell you whether or not they are members of an insecure network where you should exercise caution. -On your "Settings" page, you may create a set of default permissions which apply to every post that you create. - Once you have created a post, you can not change the permissions assigned. Within seconds it has been delivered to lots of people - and perhaps everybody it was addressed to. If you mistakenly created a message and wish you could take it back, the best you can do is to delete it. We will send out a delete notification to everybody who received the message - and this should wipe out the message with the same speed it was initially propagated. In most cases it will be completely wiped from the Internet - in under a minute. Again, this applies to Friendica networks. Once a message spreads to other networks, it may not be removed quickly and in some cases it may not be removed at all. -In case you haven't yet figured this out, we are encouraging you to encourage your friends to use Friendica - because all these privacy features work much better within a privacy-aware network. Many of the other social networks Friendica can connect to have no privacy controls. +In case you haven't yet figured this out, we are encouraging you to encourage your friends to use Friendica - because all these privacy features work much better within a privacy-aware network. Many of the other social networks Friendica can connect to have no privacy controls. -Profiles, Privacy, and Photos +Profiles, Photos, and Privacy ============================= The decentralised nature of Friendica (many websites exchanging information rather than one website which controls everything) has some implications with privacy as it relates to people on other sites. There are things you should be aware of, so you can decide best how to interact privately. +**Photos** + Sharing photos privately is a problem. We can only share them __privately__ with Friendica members. In order to share with other people, we need to prove who they are. We can prove the identity of Friendica members, as we have a mechanism to do so. Your friends on other networks will be blocked from viewing these private photos because we cannot prove that they should be allowed to see them. Our developers are working on solutions to allow access to your friends - no matter what network they are on. However we take privacy seriously and don't behave like some networks that __pretend__ your photos are private, but make them available to others without proof of identity. +**Profiles** + Your profile and "wall" may also be visited by your friends from other networks, and you can block access to these by web visitors that Friendica doesn't know. Be aware that this could include some of your friends on other networks. This may produce undesired results when posting a long status message to (for instance) Twitter and even Facebook. When Friendica sends a post to these networks which exceeds the service length limit, we truncate it and provide a link to the original. The original is a link back to your Friendica profile. As Friendica cannot prove who they are, it may not be possible for these people to view your post in full. For people in this situation we would recommend providing a "Twitter-length" summary, with more detail for friends that can see the post in full. -Blocking your profile or entire Friendica site from unknown web visitors also has serious implications for communicating with StatusNet/identi.ca members. These networks communicate with others via public protocols that are not authenticated. In order to view your posts, these networks have to access them as an "unknown web visitor". If we allowed this, it would mean anybody could in fact see your posts, and you've instructed Friendica not to allow this. So be aware that the act of blocking your profile to unknown visitors also has the effect of blocking outbound communication with public networks (such as identi.ca) and feed readers such as Google Reader. \ No newline at end of file +Blocking your profile or entire Friendica site from unknown web visitors also has serious implications for communicating with StatusNet/identi.ca members. These networks communicate with others via public protocols that are not authenticated. In order to view your posts, these networks have to access them as an "unknown web visitor". If we allowed this, it would mean anybody could in fact see your posts, and you've instructed Friendica not to allow this. So be aware that the act of blocking your profile to unknown visitors also has the effect of blocking outbound communication with public networks (such as identi.ca) and feed readers such as Google Reader. diff --git a/doc/network.md b/doc/network.md index afb0923950..08ddca290e 100644 --- a/doc/network.md +++ b/doc/network.md @@ -2,7 +2,7 @@ This is your Network Tab. If you get lost, you can click This is a bit like the Newsfeed at Facebook or the Stream at Diaspora. It's where all the posts from your contacts, groups, and feeds will appear. If you're new, you won't see anything in this page, unless you posted your status in the last step. If you've already added a few friends, you'll be able to see their posts. Here, you can comment, like, or dislike posts, or click on somebody's name to visit their profile page where you can write on their wall. -Now we need to fill it up, the first step, is to add people you already know from Facebook. +Now we need to fill it up, the first step, is to make some new friends. diff --git a/doc/peopleyouknow.md b/doc/peopleyouknow.md deleted file mode 100644 index ae0c9ef598..0000000000 --- a/doc/peopleyouknow.md +++ /dev/null @@ -1,13 +0,0 @@ -This is your connector settings page. If you get lost, you can click this link to bring yourself back here. - -This is the bit that makes Friendica unique. You can connect to anybody on the internet from your Friendica account using this page! The available connectors varies depending on which plugins you have installed, but for now, we'll walk you through Facebook. Note that not all servers have the Facebook connector installed. If you can't find it in the list below, don't worry, we'll look at ways of connecting to more people in the following pages. - -The biggest of all social networks is Facebook. Fortunately, this connector is really easy. Scroll down the page, and click Facebook Connector Settings. Enter your Facebook user name and password and let the application (the connector) do everything the options suggest. You can fine tune this or experiment with the other connectors too. If you need help, you can always ask at Friendica Support or see the instructions here. - -When you're ready, we can move on to making new friends. - - - - - - diff --git a/include/Photo.php b/include/Photo.php index 1f751c77f3..74d4c746d6 100644 --- a/include/Photo.php +++ b/include/Photo.php @@ -247,7 +247,7 @@ class Photo { if($this->is_imagick()) { $this->image->setFirstIterator(); do { - $this->image->rotateImage(new ImagickPixel(), $degrees); + $this->image->rotateImage(new ImagickPixel(), -$degrees); // ImageMagick rotates in the opposite direction of imagerotate() } while ($this->image->nextImage()); return; } diff --git a/include/Scrape.php b/include/Scrape.php index b784650cd1..85c6367889 100644 --- a/include/Scrape.php +++ b/include/Scrape.php @@ -394,7 +394,10 @@ function probe_url($url, $mode = PROBE_NORMAL) { } if($link['@attributes']['rel'] === 'diaspora-public-key') { $diaspora_key = base64_decode(unamp($link['@attributes']['href'])); - $pubkey = rsatopem($diaspora_key); + if(strstr($diaspora_key,'RSA ')) + $pubkey = rsatopem($diaspora_key); + else + $pubkey = $diaspora_key; $diaspora = true; } } diff --git a/include/api.php b/include/api.php index 7d230629b0..456d984de1 100644 --- a/include/api.php +++ b/include/api.php @@ -755,6 +755,15 @@ $ret = api_format_items($r,$user_info); + // We aren't going to try to figure out at the item, group, and page + // level which items you've seen and which you haven't. If you're looking + // at the network timeline just mark everything seen. + + $r = q("UPDATE `item` SET `unseen` = 0 + WHERE `unseen` = 1 AND `uid` = %d", + intval($user_info['uid']) + ); + $data = array('$statuses' => $ret); switch($type){ diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index 9ede42f6c7..75fe1ef35d 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -8,65 +8,6 @@ require_once("include/bbcode.php"); require_once("include/markdownify/markdownify.php"); -function get_bb_tag_pos($s, $name, $occurance = 1) { - - if($occurance < 1) - $occurance = 1; - - $start_open = -1; - for($i = 1; $i <= $occurance; $i++) { - if( $start_open !== false) - $start_open = strpos($s, '[' . $name, $start_open + 1); // allow [name= type tags - } - - if( $start_open === false) - return false; - - $start_equal = strpos($s, '=', $start_open); - $start_close = strpos($s, ']', $start_open); - - if( $start_close === false) - return false; - - $start_close++; - - $end_open = strpos($s, '[/' . $name . ']', $start_close); - - if( $end_open === false) - return false; - - $res = array( 'start' => array('open' => $start_open, 'close' => $start_close), - 'end' => array('open' => $end_open, 'close' => $end_open + strlen('[/' . $name . ']')) ); - if( $start_equal !== false) - $res['start']['equal'] = $start_equal + 1; - - return $res; -} - -function bb_tag_preg_replace($pattern, $replace, $name, $s) { - - $string = $s; - - $occurance = 1; - $pos = get_bb_tag_pos($string, $name, $occurance); - while($pos !== false && $occurance < 1000) { - - $start = substr($string, 0, $pos['start']['open']); - $subject = substr($string, $pos['start']['open'], $pos['end']['close'] - $pos['start']['open']); - $end = substr($string, $pos['end']['close']); - if($end === false) - $end = ''; - - $subject = preg_replace($pattern, $replace, $subject); - $string = $start . $subject . $end; - - $occurance++; - $pos = get_bb_tag_pos($string, $name, $occurance); - } - - return $string; -} - // we don't want to support a bbcode specific markdown interpreter // and the markdown library we have is pretty good, but provides HTML output. // So we'll use that to convert to HTML, then convert the HTML back to bbcode, @@ -113,7 +54,7 @@ function diaspora2bb($s) { //$s = preg_replace("/([^\]\=]|^)(https?\:\/\/)(vimeo|youtu|www\.youtube|soundcloud)([a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1[url=$2$3$4]$2$3$4[/url]',$s); $s = bb_tag_preg_replace("/\[url\=?(.*?)\]https?:\/\/www.youtube.com\/watch\?v\=(.*?)\[\/url\]/ism",'[youtube]$2[/youtube]','url',$s); $s = bb_tag_preg_replace("/\[url\=https?:\/\/www.youtube.com\/watch\?v\=(.*?)\].*?\[\/url\]/ism",'[youtube]$1[/youtube]','url',$s); - $s = bb_tag_preg_replace("/\[url\=?(.*?)\]https?:\/ \/vimeo.com\/([0-9]+)(.*?)\[\/url\]/ism",'[vimeo]$2[/vimeo]','url',$s); + $s = bb_tag_preg_replace("/\[url\=?(.*?)\]https?:\/\/vimeo.com\/([0-9]+)(.*?)\[\/url\]/ism",'[vimeo]$2[/vimeo]','url',$s); $s = bb_tag_preg_replace("/\[url\=https?:\/\/vimeo.com\/([0-9]+)\](.*?)\[\/url\]/ism",'[vimeo]$1[/vimeo]','url',$s); // remove duplicate adjacent code tags $s = preg_replace("/(\[code\])+(.*?)(\[\/code\])+/ism","[code]$2[/code]", $s); @@ -196,6 +137,14 @@ function bb2diaspora($Text,$preserve_nl = false, $fordiaspora = true) { // The bbcode parser now handles youtube-links (and the other stuff) correctly. // Additionally the html code is now fixed so that lists are now working. + /** + * Transform #tags, strip off the [url] and replace spaces with underscore + */ + $Text = preg_replace_callback('/#\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', create_function('$match', + 'return \'#\'. str_replace(\' \', \'_\', $match[2]);' + ), $Text); + + // Converting images with size parameters to simple images. Markdown doesn't know it. $Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $Text); @@ -213,6 +162,22 @@ function bb2diaspora($Text,$preserve_nl = false, $fordiaspora = true) { $md = new Markdownify(false, false, false); $Text = $md->parseString($Text); + // The Markdownify converter converts underscores '_' in URLs to '\_', which + // messes up the URL. Manually fix these + $count = 1; + $pos = bb_find_open_close($Text, '[', ']', $count); + while($pos !== false) { + $start = substr($Text, 0, $pos['start']); + $subject = substr($Text, $pos['start'], $pos['end'] - $pos['start'] + 1); + $end = substr($Text, $pos['end'] + 1); + + $subject = str_replace('\_', '_', $subject); + $Text = $start . $subject . $end; + + $count++; + $pos = bb_find_open_close($Text, '[', ']', $count); + } + // If the text going into bbcode() has a plain URL in it, i.e. // with no [url] tags around it, it will come out of parseString() // looking like: , which gets removed by strip_tags(). diff --git a/include/bbcode.php b/include/bbcode.php index 97e9d76f83..5a6505740e 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -64,6 +64,89 @@ function bb_unspacefy_and_trim($st) { return $unspacefied; } +function bb_find_open_close($s, $open, $close, $occurance = 1) { + + if($occurance < 1) + $occurance = 1; + + $start_pos = -1; + for($i = 1; $i <= $occurance; $i++) { + if( $start_pos !== false) + $start_pos = strpos($s, $open, $start_pos + 1); + } + + if( $start_pos === false) + return false; + + $end_pos = strpos($s, $close, $start_pos); + + if( $end_pos === false) + return false; + + $res = array( 'start' => $start_pos, 'end' => $end_pos ); + + return $res; +} + +function get_bb_tag_pos($s, $name, $occurance = 1) { + + if($occurance < 1) + $occurance = 1; + + $start_open = -1; + for($i = 1; $i <= $occurance; $i++) { + if( $start_open !== false) + $start_open = strpos($s, '[' . $name, $start_open + 1); // allow [name= type tags + } + + if( $start_open === false) + return false; + + $start_equal = strpos($s, '=', $start_open); + $start_close = strpos($s, ']', $start_open); + + if( $start_close === false) + return false; + + $start_close++; + + $end_open = strpos($s, '[/' . $name . ']', $start_close); + + if( $end_open === false) + return false; + + $res = array( 'start' => array('open' => $start_open, 'close' => $start_close), + 'end' => array('open' => $end_open, 'close' => $end_open + strlen('[/' . $name . ']')) ); + if( $start_equal !== false) + $res['start']['equal'] = $start_equal + 1; + + return $res; +} + +function bb_tag_preg_replace($pattern, $replace, $name, $s) { + + $string = $s; + + $occurance = 1; + $pos = get_bb_tag_pos($string, $name, $occurance); + while($pos !== false && $occurance < 1000) { + + $start = substr($string, 0, $pos['start']['open']); + $subject = substr($string, $pos['start']['open'], $pos['end']['close'] - $pos['start']['open']); + $end = substr($string, $pos['end']['close']); + if($end === false) + $end = ''; + + $subject = preg_replace($pattern, $replace, $subject); + $string = $start . $subject . $end; + + $occurance++; + $pos = get_bb_tag_pos($string, $name, $occurance); + } + + return $string; +} + if(! function_exists('bb_extract_images')) { function bb_extract_images($body) { @@ -340,9 +423,14 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) { $Text = preg_replace("/\[img\](.*?)\[\/img\]/ism", '' . t('Image/photo') . '', $Text); + + $Text = preg_replace("/\[crypt\](.*?)\[\/crypt\]/ism",'
' . t('Encrypted content') . '
', $Text); + $Text = preg_replace("/\[crypt=(.*?)\](.*?)\[\/crypt\]/ism",'
' . t('Encrypted content') . '
', $Text); + + // Try to Oembed if ($tryoembed) { - $Text = preg_replace("/\[video\](.*?\.(ogg|ogv|oga|ogm|webm|mp4))\[\/video\]/ism", '', $Text); + $Text = preg_replace("/\[video\](.*?\.(ogg|ogv|oga|ogm|webm|mp4))\[\/video\]/ism", '', $Text); $Text = preg_replace("/\[audio\](.*?\.(ogg|ogv|oga|ogm|webm|mp4|mp3))\[\/audio\]/ism", '', $Text); $Text = preg_replace_callback("/\[video\](.*?)\[\/video\]/ism", 'tryoembed', $Text); @@ -356,7 +444,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) { if ($tryoembed) - $Text = preg_replace("/\[iframe\](.*?)\[\/iframe\]/ism", '', $Text); + $Text = preg_replace("/\[iframe\](.*?)\[\/iframe\]/ism", '', $Text); else $Text = preg_replace("/\[iframe\](.*?)\[\/iframe\]/ism", '$1', $Text); @@ -372,7 +460,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) { $Text = preg_replace("/\[youtube\]https?:\/\/youtu.be\/(.*?)\[\/youtube\]/ism",'[youtube]$1[/youtube]',$Text); if ($tryoembed) - $Text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", '', $Text); + $Text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", '', $Text); else $Text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", "http://www.youtube.com/watch?v=$1", $Text); @@ -386,7 +474,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) { $Text = preg_replace("/\[vimeo\]https?:\/\/vimeo.com\/([0-9]+)(.*?)\[\/vimeo\]/ism",'[vimeo]$1[/vimeo]',$Text); if ($tryoembed) - $Text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", '', $Text); + $Text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", '', $Text); else $Text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", "http://vimeo.com/$1", $Text); @@ -424,6 +512,8 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) { $Text = preg_replace('/\[\&\;([#a-z0-9]+)\;\]/','&$1;',$Text); + $Text = preg_replace('/\&\#039\;/','\'',$Text); + $Text = preg_replace('/\"\;/','"',$Text); // fix any escaped ampersands that may have been converted into links $Text = preg_replace("/\<(.*?)(src|href)=(.*?)\&\;(.*?)\>/ism",'<$1$2=$3&$4>',$Text); diff --git a/include/config.php b/include/config.php index 1f2a70e5a1..44606e329a 100644 --- a/include/config.php +++ b/include/config.php @@ -68,7 +68,7 @@ function get_config($family, $key, $instore = false) { ); if(count($ret)) { // manage array value - $val = (preg_match("|^a:[0-9]+:{.*}$|", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']); + $val = (preg_match("|^a:[0-9]+:{.*}$|s", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']); $a->config[$family][$key] = $val; return $val; } @@ -162,7 +162,7 @@ function get_pconfig($uid,$family, $key, $instore = false) { ); if(count($ret)) { - $val = (preg_match("|^a:[0-9]+:{.*}$|", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']); + $val = (preg_match("|^a:[0-9]+:{.*}$|s", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']); $a->config[$uid][$family][$key] = $val; return $val; } diff --git a/include/conversation.php b/include/conversation.php index 9047a97796..1fc0642856 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1,5 +1,8 @@ 0) { + foreach($item['children'] as $child) { + if($child['verb'] === ACTIVITY_LIKE || $child['verb'] === ACTIVITY_DISLIKE) { + $total --; + } + $total += count_descendants($child); + } + } + + return $total; +} + +/** + * Recursively prepare a thread for HTML + */ + +function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $profile_owner, $alike, $dlike, $thread_level=1) { + $result = array(); + + $wall_template = 'wall_thread.tpl'; + $wallwall_template = 'wallwall_thread.tpl'; + $items_seen = 0; + $nb_items = count($items); + + $total_children = $nb_items; + + foreach($items as $item) { + if($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) { + // Don't count it as a visible item + $nb_items--; + $total_children --; + } + if($item['verb'] === ACTIVITY_LIKE || $item['verb'] === ACTIVITY_DISLIKE) { + $nb_items --; + $total_children --; + + } + } + + foreach($items as $item) { + // prevent private email reply to public conversation from leaking. + if($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) { + continue; + } + + if($item['verb'] === ACTIVITY_LIKE || $item['verb'] === ACTIVITY_DISLIKE) { + continue; + } + + $items_seen++; + + $comment = ''; + $template = $wall_template; + $commentww = ''; + $sparkle = ''; + $owner_url = $owner_photo = $owner_name = ''; + $buttons = ''; + $dropping = false; + $star = false; + $isstarred = "unstarred"; + $photo = $item['photo']; + $thumb = $item['thumb']; + $indent = ''; + $osparkle = ''; + $lastcollapsed = false; + $firstcollapsed = false; + $total_children += count_descendants($item); + + $toplevelpost = (($item['id'] == $item['parent']) ? true : false); + $item_writeable = (($item['writable'] || $item['self']) ? true : false); + $show_comment_box = ((($page_writeable) && ($item_writeable)) ? true : false); + $lock = ((($item['private'] == 1) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) + || strlen($item['deny_cid']) || strlen($item['deny_gid'])))) + ? t('Private Message') + : false); + $redirect_url = $a->get_baseurl($ssl_state) . '/redir/' . $item['cid'] ; + $shareable = ((($profile_owner == local_user()) && ($item['private'] != 1)) ? true : false); + if(local_user() && link_compare($a->contact['url'],$item['author-link'])) + $edpost = array($a->get_baseurl($ssl_state)."/editpost/".$item['id'], t("Edit")); + else + $edpost = false; + if((intval($item['contact-id']) && $item['contact-id'] == remote_user()) || ($item['uid'] == local_user())) + $dropping = true; + + $drop = array( + 'dropping' => $dropping, + 'select' => t('Select'), + 'delete' => t('Delete'), + ); + + $filer = (($profile_owner == local_user()) ? t("save to folder") : false); + + $diff_author = ((link_compare($item['url'],$item['author-link'])) ? false : true); + $profile_name = (((strlen($item['author-name'])) && $diff_author) ? $item['author-name'] : $item['name']); + if($item['author-link'] && (! $item['author-name'])) + $profile_name = $item['author-link']; + + $sp = false; + $profile_link = best_link_url($item,$sp); + if($profile_link === 'mailbox') + $profile_link = ''; + if($sp) + $sparkle = ' sparkle'; + else + $profile_link = zrl($profile_link); + + $normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']); + if(($normalised != 'mailbox') && (x($a->contacts,$normalised))) + $profile_avatar = $a->contacts[$normalised]['thumb']; + else + $profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $a->get_cached_avatar_image($thumb)); + + $locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => ''); + call_hooks('render_location',$locate); + $location = ((strlen($locate['html'])) ? $locate['html'] : render_location_google($locate)); + + $tags=array(); + foreach(explode(',',$item['tag']) as $tag){ + $tag = trim($tag); + if ($tag!="") $tags[] = bbcode($tag); + } + + $like = ((x($alike,$item['uri'])) ? format_like($alike[$item['uri']],$alike[$item['uri'] . '-l'],'like',$item['uri']) : ''); + $dislike = ((x($dlike,$item['uri'])) ? format_like($dlike[$item['uri']],$dlike[$item['uri'] . '-l'],'dislike',$item['uri']) : ''); + + if($toplevelpost) { + if((! $item['self']) && ($mode !== 'profile')) { + if($item['wall']) { + + // On the network page, I am the owner. On the display page it will be the profile owner. + // This will have been stored in $a->page_contact by our calling page. + // Put this person as the wall owner of the wall-to-wall notice. + + $owner_url = zrl($a->page_contact['url']); + $owner_photo = $a->page_contact['thumb']; + $owner_name = $a->page_contact['name']; + $template = $wallwall_template; + $commentww = 'ww'; + } + else if($item['owner-link']) { + + $owner_linkmatch = (($item['owner-link']) && link_compare($item['owner-link'],$item['author-link'])); + $alias_linkmatch = (($item['alias']) && link_compare($item['alias'],$item['author-link'])); + $owner_namematch = (($item['owner-name']) && $item['owner-name'] == $item['author-name']); + if((! $owner_linkmatch) && (! $alias_linkmatch) && (! $owner_namematch)) { + + // The author url doesn't match the owner (typically the contact) + // and also doesn't match the contact alias. + // The name match is a hack to catch several weird cases where URLs are + // all over the park. It can be tricked, but this prevents you from + // seeing "Bob Smith to Bob Smith via Wall-to-wall" and you know darn + // well that it's the same Bob Smith. + + // But it could be somebody else with the same name. It just isn't highly likely. + + + $owner_url = $item['owner-link']; + $owner_photo = $item['owner-avatar']; + $owner_name = $item['owner-name']; + $template = $wallwall_template; + $commentww = 'ww'; + // If it is our contact, use a friendly redirect link + if((link_compare($item['owner-link'],$item['url'])) + && ($item['network'] === NETWORK_DFRN)) { + $owner_url = $redirect_url; + $osparkle = ' sparkle'; + } + else + $owner_url = zrl($owner_url); + } + } + } + if($profile_owner == local_user()) { + $isstarred = (($item['starred']) ? "starred" : "unstarred"); + + $star = array( + 'do' => t("add star"), + 'undo' => t("remove star"), + 'toggle' => t("toggle star status"), + 'classdo' => (($item['starred']) ? "hidden" : ""), + 'classundo' => (($item['starred']) ? "" : "hidden"), + 'starred' => t('starred'), + 'tagger' => t("add tag"), + 'classtagger' => "", + ); + } + } else { + $indent = 'comment'; + // Collapse comments + if(($nb_items > 2) || ($thread_level > 2)) { + if($items_seen == 1) { + $firstcollapsed = true; + } + if($thread_level > 2) { + if($items_seen == $nb_items) + $lastcollapsed = true; + } + else if($items_seen == ($nb_items - 2)) { + $lastcollapsed = true; + } + } + } + + if(intval(get_config('system','thread_allow')) && $a->theme_thread_allow) { + $comments_threaded = true; + } + else { + $comments_threaded = false; + } + + if($page_writeable) { + $buttons = array( + 'like' => array( t("I like this \x28toggle\x29"), t("like")), + 'dislike' => array( t("I don't like this \x28toggle\x29"), t("dislike")), + ); + if ($shareable) $buttons['share'] = array( t('Share this'), t('share')); + + + if($show_comment_box) { + $qc = $qcomment = null; + + if(in_array('qcomment',$a->plugins)) { + $qc = ((local_user()) ? get_pconfig(local_user(),'qcomment','words') : null); + $qcomment = (($qc) ? explode("\n",$qc) : null); + } + $comment = replace_macros($cmnt_tpl,array( + '$return_path' => '', + '$threaded' => $comments_threaded, + '$jsreload' => (($mode === 'display') ? $_SESSION['return_url'] : ''), + '$type' => (($mode === 'profile') ? 'wall-comment' : 'net-comment'), + '$id' => $item['item_id'], + '$parent' => $item['item_id'], + '$qcomment' => $qcomment, + '$profile_uid' => $profile_owner, + '$mylink' => $a->contact['url'], + '$mytitle' => t('This is you'), + '$myphoto' => $a->contact['thumb'], + '$comment' => t('Comment'), + '$submit' => t('Submit'), + '$edbold' => t('Bold'), + '$editalic' => t('Italic'), + '$eduline' => t('Underline'), + '$edquote' => t('Quote'), + '$edcode' => t('Code'), + '$edimg' => t('Image'), + '$edurl' => t('Link'), + '$edvideo' => t('Video'), + '$preview' => t('Preview'), + '$indent' => $indent, + '$sourceapp' => t($a->sourcename), + '$ww' => (($mode === 'network') ? $commentww : '') + )); + } + } + + if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0) + $indent .= ' shiny'; + + localize_item($item); + + $body = prepare_body($item,true); + + $tmp_item = array( + // collapse comments in template. I don't like this much... + 'comment_firstcollapsed' => $firstcollapsed, + 'comment_lastcollapsed' => $lastcollapsed, + // template to use to render item (wall, walltowall, search) + 'template' => $template, + + 'type' => implode("",array_slice(explode("/",$item['verb']),-1)), + 'tags' => $tags, + 'body' => template_escape($body), + 'text' => strip_tags(template_escape($body)), + 'id' => $item['item_id'], + 'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])), + 'olinktitle' => sprintf( t('View %s\'s profile @ %s'), $owner_name, ((strlen($item['owner-link'])) ? $item['owner-link'] : $item['url'])), + 'to' => t('to'), + 'wall' => t('Wall-to-Wall'), + 'vwall' => t('via Wall-To-Wall:'), + 'profile_url' => $profile_link, + 'item_photo_menu' => item_photo_menu($item), + 'name' => template_escape($profile_name), + 'thumb' => $profile_avatar, + 'osparkle' => $osparkle, + 'sparkle' => $sparkle, + 'title' => template_escape($item['title']), + 'localtime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'r'), + + 'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])), + 'lock' => $lock, + 'location' => template_escape($location), + 'indent' => $indent, + 'owner_url' => $owner_url, + 'owner_photo' => $owner_photo, + 'owner_name' => template_escape($owner_name), + 'plink' => get_plink($item), + 'edpost' => $edpost, + 'isstarred' => $isstarred, + 'star' => $star, + 'filer' => $filer, + 'drop' => $drop, + 'vote' => $buttons, + 'like' => $like, + 'dislike' => $dislike, + 'comment' => $comment, + 'previewing' => $previewing, + 'wait' => t('Please wait'), + 'thread_level' => $thread_level, + ); + + $arr = array('item' => $item, 'output' => $tmp_item); + call_hooks('display_item', $arr); + + $item_result = $arr['output']; + if($firstcollapsed) { + $item_result['num_comments'] = sprintf( tt('%d comment','%d comments',$total_children),$total_children ); + $item_result['hide_text'] = t('show more'); + } + + $item_result['children'] = array(); + if(count($item['children'])) { + $item_result['children'] = prepare_threads_body($a, $item['children'], $cmnt_tpl, $page_writeable, $mode, $profile_owner, $alike, $dlike, ($thread_level + 1)); + } + $item_result['private'] = $item['private']; + $item_result['toplevel'] = ($toplevelpost ? 'toplevel_item' : ''); + + /* + * I don't like this very much... + */ + if(get_config('system','thread_allow') && $a->theme_thread_allow) { + $item_result['flatten'] = false; + $item_result['threaded'] = true; + } + else { + $item_result['flatten'] = true; + $item_result['threaded'] = false; + if(!$toplevelpost) { + $item_result['comment'] = false; + } + } + + $result[] = $item_result; + } + + return $result; +} + /** * "Render" a conversation or list of items for HTML display. * There are two major forms of display: @@ -348,6 +726,9 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { $page_writeable = false; } + $page_dropping = ((local_user() && local_user() == $profile_owner) ? true : false); + + if($update) $return_url = $_SESSION['return_url']; else @@ -372,7 +753,9 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { // array with html for each thread (parent+comments) $threads = array(); $threadsid = -1; - + + $page_template = get_markup_template("conversation.tpl"); + if($items && count($items)) { if($mode === 'network-new' || $mode === 'search' || $mode === 'community') { @@ -467,6 +850,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { 'title' => template_escape($item['title']), 'body' => template_escape($body), 'text' => strip_tags(template_escape($body)), + 'localtime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'r'), 'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])), 'location' => template_escape($location), 'indent' => '', @@ -485,6 +869,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { 'conv' => (($preview) ? '' : array('href'=> $a->get_baseurl($ssl_state) . '/display/' . $nickname . '/' . $item['id'], 'title'=> t('View in context'))), 'previewing' => $previewing, 'wait' => t('Please wait'), + 'thread_level' => 1, ); $arr = array('item' => $item, 'output' => $tmp_item); @@ -499,371 +884,33 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { else { // Normal View + $page_template = get_markup_template("threaded_conversation.tpl"); + // get all the topmost parents + // this shouldn't be needed, as we should have only them in ou array + // But for now, this array respects the old style, just in case - // Figure out how many comments each parent has - // (Comments all have gravity of 6) - // Store the result in the $comments array - - $comments = array(); + $threads = array(); foreach($items as $item) { - if((intval($item['gravity']) == 6) && ($item['id'] != $item['parent'])) { - if(! x($comments,$item['parent'])) - $comments[$item['parent']] = 1; - else - $comments[$item['parent']] += 1; - } elseif(! x($comments,$item['parent'])) - $comments[$item['parent']] = 0; // avoid notices later on - } - // map all the like/dislike activities for each parent item - // Store these in the $alike and $dlike arrays - - foreach($items as $item) { like_puller($a,$item,$alike,'like'); like_puller($a,$item,$dlike,'dislike'); + + if($item['id'] == $item['parent']) { + $threads[] = $item; + } } - $comments_collapsed = false; - $comments_seen = 0; - $comment_lastcollapsed = false; - $comment_firstcollapsed = false; - $blowhard = 0; - $blowhard_count = 0; - - - foreach($items as $item) { - - $comment = ''; - $template = $tpl; - $commentww = ''; - $sparkle = ''; - $owner_url = $owner_photo = $owner_name = ''; - - // We've already parsed out like/dislike for special treatment. We can ignore them now - - if(((activity_match($item['verb'],ACTIVITY_LIKE)) - || (activity_match($item['verb'],ACTIVITY_DISLIKE))) - && ($item['id'] != $item['parent'])) - continue; - - $toplevelpost = (($item['id'] == $item['parent']) ? true : false); - - - // Take care of author collapsing and comment collapsing - // (author collapsing is currently disabled) - // If a single author has more than 3 consecutive top-level posts, squash the remaining ones. - // If there are more than two comments, squash all but the last 2. - - if($toplevelpost) { - - $item_writeable = (($item['writable'] || $item['self']) ? true : false); - - $comments_seen = 0; - $comments_collapsed = false; - $comment_lastcollapsed = false; - $comment_firstcollapsed = false; - - $threadsid++; - $threads[$threadsid]['id'] = $item['item_id']; - $threads[$threadsid]['private'] = $item['private']; - $threads[$threadsid]['items'] = array(); - - } - else { - - // prevent private email reply to public conversation from leaking. - if($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) - continue; - - $comments_seen ++; - $comment_lastcollapsed = false; - $comment_firstcollapsed = false; - } - - $override_comment_box = ((($page_writeable) && ($item_writeable)) ? true : false); - $show_comment_box = ((($page_writeable) && ($item_writeable) && ($comments_seen == $comments[$item['parent']])) ? true : false); - - - if(($comments[$item['parent']] > 2) && ($comments_seen <= ($comments[$item['parent']] - 2)) && ($item['gravity'] == 6)) { - - if (!$comments_collapsed){ - $threads[$threadsid]['num_comments'] = sprintf( tt('%d comment','%d comments',$comments[$item['parent']]),$comments[$item['parent']] ); - $threads[$threadsid]['hide_text'] = t('show more'); - $comments_collapsed = true; - $comment_firstcollapsed = true; - } - } - if(($comments[$item['parent']] > 2) && ($comments_seen == ($comments[$item['parent']] - 1))) { - - $comment_lastcollapsed = true; - } - - $redirect_url = $a->get_baseurl($ssl_state) . '/redir/' . $item['cid'] ; - - $lock = ((($item['private'] == 1) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) - || strlen($item['deny_cid']) || strlen($item['deny_gid'])))) - ? t('Private Message') - : false); - - - // Top-level wall post not written by the wall owner (wall-to-wall) - // First figure out who owns it. - - $osparkle = ''; - - if(($toplevelpost) && (! $item['self']) && ($mode !== 'profile')) { - - if($item['wall']) { - - // On the network page, I am the owner. On the display page it will be the profile owner. - // This will have been stored in $a->page_contact by our calling page. - // Put this person as the wall owner of the wall-to-wall notice. - - $owner_url = zrl($a->page_contact['url']); - $owner_photo = $a->page_contact['thumb']; - $owner_name = $a->page_contact['name']; - $template = $wallwall; - $commentww = 'ww'; - } - - if((! $item['wall']) && $item['owner-link']) { - - $owner_linkmatch = (($item['owner-link']) && link_compare($item['owner-link'],$item['author-link'])); - $alias_linkmatch = (($item['alias']) && link_compare($item['alias'],$item['author-link'])); - $owner_namematch = (($item['owner-name']) && $item['owner-name'] == $item['author-name']); - if((! $owner_linkmatch) && (! $alias_linkmatch) && (! $owner_namematch)) { - - // The author url doesn't match the owner (typically the contact) - // and also doesn't match the contact alias. - // The name match is a hack to catch several weird cases where URLs are - // all over the park. It can be tricked, but this prevents you from - // seeing "Bob Smith to Bob Smith via Wall-to-wall" and you know darn - // well that it's the same Bob Smith. - - // But it could be somebody else with the same name. It just isn't highly likely. - - - $owner_url = $item['owner-link']; - $owner_photo = $item['owner-avatar']; - $owner_name = $item['owner-name']; - $template = $wallwall; - $commentww = 'ww'; - // If it is our contact, use a friendly redirect link - if((link_compare($item['owner-link'],$item['url'])) - && ($item['network'] === NETWORK_DFRN)) { - $owner_url = $redirect_url; - $osparkle = ' sparkle'; - } - else - $owner_url = zrl($owner_url); - } - } - } - - $likebuttons = ''; - $shareable = ((($profile_owner == local_user()) && ($item['private'] != 1)) ? true : false); - - if($page_writeable) { -/* if($toplevelpost) { */ - $likebuttons = array( - 'like' => array( t("I like this \x28toggle\x29"), t("like")), - 'dislike' => array( t("I don't like this \x28toggle\x29"), t("dislike")), - ); - if ($shareable) $likebuttons['share'] = array( t('Share this'), t('share')); -/* } */ - - $qc = $qcomment = null; - - if(in_array('qcomment',$a->plugins)) { - $qc = ((local_user()) ? get_pconfig(local_user(),'qcomment','words') : null); - $qcomment = (($qc) ? explode("\n",$qc) : null); - } - - if(($show_comment_box) || (($show_comment_box == false) && ($override_comment_box == false) && ($item['last-child']))) { - $comment = replace_macros($cmnt_tpl,array( - '$return_path' => '', - '$jsreload' => (($mode === 'display') ? $_SESSION['return_url'] : ''), - '$type' => (($mode === 'profile') ? 'wall-comment' : 'net-comment'), - '$id' => $item['item_id'], - '$parent' => $item['parent'], - '$qcomment' => $qcomment, - '$profile_uid' => $profile_owner, - '$mylink' => $a->contact['url'], - '$mytitle' => t('This is you'), - '$myphoto' => $a->contact['thumb'], - '$comment' => t('Comment'), - '$submit' => t('Submit'), - '$edbold' => t('Bold'), - '$editalic' => t('Italic'), - '$eduline' => t('Underline'), - '$edquote' => t('Quote'), - '$edcode' => t('Code'), - '$edimg' => t('Image'), - '$edurl' => t('Link'), - '$edvideo' => t('Video'), - '$preview' => t('Preview'), - '$ww' => (($mode === 'network') ? $commentww : '') - )); - } - } - - if(local_user() && link_compare($a->contact['url'],$item['author-link'])) - $edpost = array($a->get_baseurl($ssl_state)."/editpost/".$item['id'], t("Edit")); - else - $edpost = false; - - $drop = ''; - $dropping = false; - - if((intval($item['contact-id']) && $item['contact-id'] == remote_user()) || ($item['uid'] == local_user())) - $dropping = true; - - $drop = array( - 'dropping' => $dropping, - 'select' => t('Select'), - 'delete' => t('Delete'), - ); - - $star = false; - $filer = false; - - $isstarred = "unstarred"; - if ($profile_owner == local_user()) { - if($toplevelpost) { - $isstarred = (($item['starred']) ? "starred" : "unstarred"); - - $star = array( - 'do' => t("add star"), - 'undo' => t("remove star"), - 'toggle' => t("toggle star status"), - 'classdo' => (($item['starred']) ? "hidden" : ""), - 'classundo' => (($item['starred']) ? "" : "hidden"), - 'starred' => t('starred'), - 'tagger' => t("add tag"), - 'classtagger' => "", - ); - } - $filer = t("save to folder"); - } - - - $photo = $item['photo']; - $thumb = $item['thumb']; - - // Post was remotely authored. - - $diff_author = ((link_compare($item['url'],$item['author-link'])) ? false : true); - - $profile_name = (((strlen($item['author-name'])) && $diff_author) ? $item['author-name'] : $item['name']); - - if($item['author-link'] && (! $item['author-name'])) - $profile_name = $item['author-link']; - - $sp = false; - $profile_link = best_link_url($item,$sp); - if($profile_link === 'mailbox') - $profile_link = ''; - if($sp) - $sparkle = ' sparkle'; - else - $profile_link = zrl($profile_link); - - $normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']); - if(($normalised != 'mailbox') && (x($a->contacts,$normalised))) - $profile_avatar = $a->contacts[$normalised]['thumb']; - else - $profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $a->get_cached_avatar_image($thumb)); - - $like = ((x($alike,$item['uri'])) ? format_like($alike[$item['uri']],$alike[$item['uri'] . '-l'],'like',$item['uri']) : ''); - $dislike = ((x($dlike,$item['uri'])) ? format_like($dlike[$item['uri']],$dlike[$item['uri'] . '-l'],'dislike',$item['uri']) : ''); - - $locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => ''); - call_hooks('render_location',$locate); - - $location = ((strlen($locate['html'])) ? $locate['html'] : render_location_google($locate)); - - $indent = (($toplevelpost) ? '' : ' comment'); - - if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0) - $indent .= ' shiny'; - - // - localize_item($item); - - - $tags=array(); - foreach(explode(',',$item['tag']) as $tag){ - $tag = trim($tag); - if ($tag!="") $tags[] = bbcode($tag); - } - - // Build the HTML - - $body = prepare_body($item,true); - //$tmp_item = replace_macros($template, - $tmp_item = array( - // collapse comments in template. I don't like this much... - 'comment_firstcollapsed' => $comment_firstcollapsed, - 'comment_lastcollapsed' => $comment_lastcollapsed, - // template to use to render item (wall, walltowall, search) - 'template' => $template, - - 'type' => implode("",array_slice(explode("/",$item['verb']),-1)), - 'tags' => $tags, - 'body' => template_escape($body), - 'text' => strip_tags(template_escape($body)), - 'id' => $item['item_id'], - 'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])), - 'olinktitle' => sprintf( t('View %s\'s profile @ %s'), $owner-name, ((strlen($item['owner-link'])) ? $item['owner-link'] : $item['url'])), - 'to' => t('to'), - 'wall' => t('Wall-to-Wall'), - 'vwall' => t('via Wall-To-Wall:'), - 'profile_url' => $profile_link, - 'item_photo_menu' => item_photo_menu($item), - 'name' => template_escape($profile_name), - 'thumb' => $profile_avatar, - 'osparkle' => $osparkle, - 'sparkle' => $sparkle, - 'title' => template_escape($item['title']), - 'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])), - 'lock' => $lock, - 'location' => template_escape($location), - 'indent' => $indent, - 'owner_url' => $owner_url, - 'owner_photo' => $owner_photo, - 'owner_name' => template_escape($owner_name), - 'plink' => get_plink($item), - 'edpost' => $edpost, - 'isstarred' => $isstarred, - 'star' => $star, - 'filer' => $filer, - 'drop' => $drop, - 'vote' => $likebuttons, - 'like' => $like, - 'dislike' => $dislike, - 'comment' => $comment, - 'previewing' => $previewing, - 'wait' => t('Please wait'), - - ); - - - $arr = array('item' => $item, 'output' => $tmp_item); - call_hooks('display_item', $arr); - - $threads[$threadsid]['items'][] = $arr['output']; - } + $threads = prepare_threads_body($a, $threads, $cmnt_tpl, $page_writeable, $mode, $profile_owner, $alike, $dlike); } } - - $page_template = get_markup_template("conversation.tpl"); + $o = replace_macros($page_template, array( '$baseurl' => $a->get_baseurl($ssl_state), '$mode' => $mode, '$user' => $a->user, '$threads' => $threads, - '$dropping' => ($dropping?t('Delete Selected Items'):False), + '$dropping' => ($page_dropping?t('Delete Selected Items'):False), )); return $o; @@ -1163,7 +1210,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { '$bang' => $x['bang'], '$profile_uid' => $x['profile_uid'], '$preview' => t('Preview'), - '$mobileapp' => t('Friendica mobile web'), + '$sourceapp' => t($a->sourcename), )); @@ -1176,12 +1223,55 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { } +function get_item_children($arr, $parent) { + $children = array(); + foreach($arr as $item) { + if($item['id'] != $item['parent']) { + if(get_config('system','thread_allow')) { + // Fallback to parent-uri if thr-parent is not set + $thr_parent = $item['thr-parent']; + if($thr_parent == '') + $thr_parent = $item['parent-uri']; + + if($thr_parent == $parent['uri']) { + $item['children'] = get_item_children($arr, $item); + $children[] = $item; + } + } + else if($item['parent'] == $parent['id']) { + $children[] = $item; + } + } + } + return $children; +} + +function sort_item_children($items) { + $result = $items; + usort($result,'sort_thr_created_rev'); + foreach($result as $k => $i) { + if(count($result[$k]['children'])) { + $result[$k]['children'] = sort_item_children($result[$k]['children']); + } + } + return $result; +} + +function add_children_to_list($children, &$arr) { + foreach($children as $y) { + $arr[] = $y; + if(count($y['children'])) + add_children_to_list($y['children'], $arr); + } +} + function conv_sort($arr,$order) { if((!(is_array($arr) && count($arr)))) return array(); $parents = array(); + $children = array(); foreach($arr as $x) if($x['id'] == $x['parent']) @@ -1194,21 +1284,22 @@ function conv_sort($arr,$order) { if(count($parents)) foreach($parents as $i=>$_x) - $parents[$i]['children'] = array(); + $parents[$i]['children'] = get_item_children($arr, $_x); - foreach($arr as $x) { + /*foreach($arr as $x) { if($x['id'] != $x['parent']) { $p = find_thread_parent_index($parents,$x); if($p !== false) $parents[$p]['children'][] = $x; } - } + }*/ if(count($parents)) { foreach($parents as $k => $v) { if(count($parents[$k]['children'])) { - $y = $parents[$k]['children']; + $parents[$k]['children'] = sort_item_children($parents[$k]['children']); + /*$y = $parents[$k]['children']; usort($y,'sort_thr_created_rev'); - $parents[$k]['children'] = $y; + $parents[$k]['children'] = $y;*/ } } } @@ -1218,8 +1309,9 @@ function conv_sort($arr,$order) { foreach($parents as $x) { $ret[] = $x; if(count($x['children'])) - foreach($x['children'] as $y) - $ret[] = $y; + add_children_to_list($x['children'], $ret); + /*foreach($x['children'] as $y) + $ret[] = $y;*/ } } diff --git a/include/diaspora.php b/include/diaspora.php index a23c11bd21..baee0420ba 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -102,6 +102,37 @@ function diaspora_dispatch($importer,$msg) { return $ret; } +function diaspora_handle_from_contact($contact_id) { + $handle = False; + + logger("diaspora_handle_from_contact: contact id is " . $contact_id, LOGGER_DEBUG); + + $r = q("SELECT network, addr, self, url, nick FROM contact WHERE id = %d", + intval($contact_id) + ); + if($r) { + $contact = $r[0]; + + logger("diaspora_handle_from_contact: contact 'self' = " . $contact['self'] . " 'url' = " . $contact['url'], LOGGER_DEBUG); + + if($contact['network'] === NETWORK_DIASPORA) { + $handle = $contact['addr']; + +// logger("diaspora_handle_from_contact: contact id is a Diaspora person, handle = " . $handle, LOGGER_DEBUG); + } + elseif(($contact['network'] === NETWORK_DFRN) || ($contact['self'] == 1)) { + $baseurl_start = strpos($contact['url'],'://') + 3; + $baseurl_length = strpos($contact['url'],'/profile') - $baseurl_start; // allows installations in a subdirectory--not sure how Diaspora will handle + $baseurl = substr($contact['url'], $baseurl_start, $baseurl_length); + $handle = $contact['nick'] . '@' . $baseurl; + +// logger("diaspora_handle_from_contact: contact id is a DFRN person, handle = " . $handle, LOGGER_DEBUG); + } + } + + return $handle; +} + function diaspora_get_contact_by_handle($uid,$handle) { $r = q("SELECT * FROM `contact` WHERE `network` = '%s' AND `uid` = %d AND `addr` = '%s' LIMIT 1", dbesc(NETWORK_DIASPORA), @@ -1282,7 +1313,7 @@ function diaspora_comment($importer,$xml,$msg) { // the existence of parent_author_signature means the parent_author or owner // is already relaying. - proc_run('php','include/notifier.php','comment',$message_id); + proc_run('php','include/notifier.php','comment-import',$message_id); } $myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 AND `deleted` = 0 ", @@ -1319,7 +1350,7 @@ function diaspora_comment($importer,$xml,$msg) { 'verb' => ACTIVITY_POST, 'otype' => 'item', 'parent' => $conv_parent, - + 'parent_uri' => $parent_uri )); // only send one notification @@ -1867,7 +1898,7 @@ EOT; // is already relaying. The parent_item['origin'] indicates the message was created on our system if(($parent_item['origin']) && (! $parent_author_signature)) - proc_run('php','include/notifier.php','comment',$message_id); + proc_run('php','include/notifier.php','comment-import',$message_id); return; } @@ -1993,7 +2024,7 @@ function diaspora_signed_retraction($importer,$xml,$msg) { // is already relaying. logger('diaspora_signed_retraction: relaying relayable_retraction'); - proc_run('php','include/notifier.php','relayable_retraction',$r[0]['id']); + proc_run('php','include/notifier.php','drop',$r[0]['id']); } } } @@ -2153,12 +2184,6 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) { } } */ - /** - * Transform #tags, strip off the [url] and replace spaces with underscore - */ - $body = preg_replace_callback('/#\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', create_function('$match', - 'return \'#\'. str_replace(\' \', \'_\', $match[2]);' - ), $body); //if(strlen($title)) // $body = "[b]".html_entity_decode($title)."[/b]\n\n".$body; @@ -2257,12 +2282,13 @@ function diaspora_send_followup($item,$owner,$contact,$public_batch = false) { $myaddr = $owner['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3); // $theiraddr = $contact['addr']; - if($item['thr-parent']) { + // Diaspora doesn't support threaded comments + /*if($item['thr-parent']) { $p = q("select guid, type, uri, `parent-uri` from item where uri = '%s' limit 1", dbesc($item['thr-parent']) ); } - else { + else {*/ // The first item in the `item` table with the parent id is the parent. However, MySQL doesn't always // return the items ordered by `item`.`id`, in which case the wrong item is chosen as the parent. // The only item with `parent` and `id` as the parent id is the parent item. @@ -2270,7 +2296,7 @@ function diaspora_send_followup($item,$owner,$contact,$public_batch = false) { intval($item['parent']), intval($item['parent']) ); - } + //} if(count($p)) $parent = $p[0]; else @@ -2332,21 +2358,21 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) { $body = $item['body']; $text = html_entity_decode(bb2diaspora($body)); - - if($item['thr-parent']) { + // Diaspora doesn't support threaded comments + /*if($item['thr-parent']) { $p = q("select guid, type, uri, `parent-uri` from item where uri = '%s' limit 1", dbesc($item['thr-parent']) ); } - else { + else {*/ // The first item in the `item` table with the parent id is the parent. However, MySQL doesn't always // return the items ordered by `item`.`id`, in which case the wrong item is chosen as the parent. // The only item with `parent` and `id` as the parent id is the parent item. $p = q("select guid, type, uri, `parent-uri` from item where parent = %d and id = %d limit 1", - intval($item['parent']), - intval($item['parent']) + intval($item['parent']), + intval($item['parent']) ); - } + //} if(count($p)) $parent = $p[0]; else @@ -2367,7 +2393,6 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) { $like = true; $target_type = ( $parent['uri'] === $parent['parent-uri'] ? 'Post' : 'Comment'); -// $target_type = (strpos($parent['type'], 'comment') ? 'Comment' : 'Post'); // $positive = (($item['deleted']) ? 'false' : 'true'); $positive = 'true'; @@ -2381,7 +2406,7 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) { // fetch the original signature if the relayable was created by a Diaspora // or DFRN user. Relayables for other networks are not supported. - $r = q("select * from sign where " . $sql_sign_id . " = %d limit 1", +/* $r = q("select * from sign where " . $sql_sign_id . " = %d limit 1", intval($item['id']) ); if(count($r)) { @@ -2397,7 +2422,25 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) { // function is called logger('diaspora_send_relay: original author signature not found, cannot send relayable'); return; - } + }*/ + + /* Since the author signature is only checked by the parent, not by the relay recipients, + * I think it may not be necessary for us to do so much work to preserve all the original + * signatures. The important thing that Diaspora DOES need is the original creator's handle. + * Let's just generate that and forget about all the original author signature stuff. + * + * Note: this might be more of an problem if we want to support likes on comments for older + * versions of Diaspora (diaspora-pistos), but since there are a number of problems with + * doing that, let's ignore it for now. + * + * Currently, only DFRN contacts are supported. StatusNet shouldn't be hard, but it hasn't + * been done yet + */ + + $handle = diaspora_handle_from_contact($item['contact-id']); + if(! $handle) + return; + if($relay_retract) $sender_signed_text = $item['guid'] . ';' . $target_type; diff --git a/include/enotify.php b/include/enotify.php index 5109914762..b4331f0926 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -1,5 +1,7 @@ get_item_tags(NAMESPACE_DFRN,'comment-allow'); @@ -930,6 +931,8 @@ function item_store($arr,$force_parent = false) { $arr['origin'] = ((x($arr,'origin')) ? intval($arr['origin']) : 0 ); $arr['guid'] = ((x($arr,'guid')) ? notags(trim($arr['guid'])) : get_guid()); + + $arr['thr-parent'] = $arr['parent-uri']; if($arr['parent-uri'] === $arr['uri']) { $parent_id = 0; $parent_deleted = 0; @@ -955,7 +958,6 @@ function item_store($arr,$force_parent = false) { // and re-attach to the conversation parent. if($r[0]['uri'] != $r[0]['parent-uri']) { - $arr['thr-parent'] = $arr['parent-uri']; $arr['parent-uri'] = $r[0]['parent-uri']; $z = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `parent-uri` = '%s' AND `uid` = %d ORDER BY `id` ASC LIMIT 1", @@ -997,7 +999,6 @@ function item_store($arr,$force_parent = false) { if($force_parent) { logger('item_store: $force_parent=true, reply converted to top-level post.'); $parent_id = 0; - $arr['thr-parent'] = $arr['parent-uri']; $arr['parent-uri'] = $arr['uri']; $arr['gravity'] = 0; } @@ -2141,7 +2142,7 @@ function local_delivery($importer,$data) { } } - if((is_array($contact)) && ($photo_timestamp) && (strlen($photo_url)) && ($photo_timestamp > $importer['avatar-date'])) { + if(($photo_timestamp) && (strlen($photo_url)) && ($photo_timestamp > $importer['avatar-date'])) { logger('local_delivery: Updating photo for ' . $importer['name']); require_once("Photo.php"); $photo_failure = false; @@ -2199,7 +2200,7 @@ function local_delivery($importer,$data) { } } - if((is_array($contact)) && ($name_updated) && (strlen($new_name)) && ($name_updated > $contact['name-date'])) { + if(($name_updated) && (strlen($new_name)) && ($name_updated > $importer['name-date'])) { $r = q("select * from contact where uid = %d and id = %d limit 1", intval($importer['importer_uid']), intval($importer['id']) @@ -2464,6 +2465,7 @@ function local_delivery($importer,$data) { $is_a_remote_delete = false; + // POSSIBLE CLEANUP --> Why select so many fields when only forum_mode and wall are used? $r = q("select `item`.`id`, `item`.`uri`, `item`.`tag`, `item`.`forum_mode`,`item`.`origin`,`item`.`wall`, `contact`.`name`, `contact`.`url`, `contact`.`thumb` from `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` @@ -2477,7 +2479,7 @@ function local_delivery($importer,$data) { intval($importer['importer_uid']) ); if($r && count($r)) - $is_a_remote_delete = true; + $is_a_remote_delete = true; // Does this have the characteristics of a community or private group comment? // If it's a reply to a wall post on a community/prvgroup page it's a @@ -2782,12 +2784,14 @@ function local_delivery($importer,$data) { $parent = 0; if($posted_id) { - $r = q("SELECT `parent` FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1", + $r = q("SELECT `parent`, `parent-uri` FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1", intval($posted_id), intval($importer['importer_uid']) ); - if(count($r)) + if(count($r)) { $parent = $r[0]['parent']; + $parent_uri = $r[0]['parent-uri']; + } if(! $is_like) { $r1 = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `uid` = %d AND `parent` = %d", @@ -2804,7 +2808,7 @@ function local_delivery($importer,$data) { } if($posted_id && $parent) { - + proc_run('php',"include/notifier.php","comment-import","$posted_id"); if((! $is_like) && (! $importer['self'])) { @@ -2827,7 +2831,7 @@ function local_delivery($importer,$data) { 'verb' => ACTIVITY_POST, 'otype' => 'item', 'parent' => $parent, - + 'parent_uri' => $parent_uri, )); } @@ -2976,6 +2980,7 @@ function local_delivery($importer,$data) { 'verb' => ACTIVITY_POST, 'otype' => 'item', 'parent' => $conv_parent, + 'parent_uri' => $parent_uri )); @@ -3065,7 +3070,8 @@ function local_delivery($importer,$data) { $datarray['uid'] = $importer['importer_uid']; $datarray['contact-id'] = $importer['id']; - if(! link_compare($datarray['owner-link'],$contact['url'])) { + + if(! link_compare($datarray['owner-link'],$importer['url'])) { // The item owner info is not our contact. It's OK and is to be expected if this is a tgroup delivery, // but otherwise there's a possible data mixup on the sender's system. // the tgroup delivery code called from item_store will correct it if it's a forum, @@ -3334,7 +3340,6 @@ function atom_entry($item,$type,$author,$owner,$comment = false,$cid = 0) { else $body = $item['body']; - $o = "\r\n\r\n\r\n"; if(is_array($author)) @@ -3344,7 +3349,7 @@ function atom_entry($item,$type,$author,$owner,$comment = false,$cid = 0) { if(strlen($item['owner-name'])) $o .= atom_author('dfrn:owner',$item['owner-name'],$item['owner-link'],80,80,$item['owner-avatar']); - if(($item['parent'] != $item['id']) || ($item['parent-uri'] !== $item['uri']) || ($item['thr-parent'])) { + if(($item['parent'] != $item['id']) || ($item['parent-uri'] !== $item['uri']) || (($item['thr-parent'] !== '') && ($item['thr-parent'] !== $item['uri']))) { $parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']); $o .= '' . "\r\n"; } @@ -3705,8 +3710,9 @@ function drop_item($id,$interactive = true) { // check if logged in user is either the author or owner of this item - if((local_user() == $item['uid']) || (remote_user() == $item['contact-id'])) { + if((local_user() == $item['uid']) || (remote_user() == $item['contact-id']) || (! $interactive)) { + logger('delete item: ' . $item['id'], LOGGER_DEBUG); // delete the item $r = q("UPDATE `item` SET `deleted` = 1, `title` = '', `body` = '', `edited` = '%s', `changed` = '%s' WHERE `id` = %d LIMIT 1", diff --git a/include/network.php b/include/network.php index 0fff5c7cc9..0e1a63792f 100644 --- a/include/network.php +++ b/include/network.php @@ -854,6 +854,10 @@ function scale_external_images($s, $include_link = true, $scale_replace = false) } } } + + // replace the special char encoding + + $s = htmlspecialchars($s,ENT_QUOTES,'UTF-8'); return $s; } diff --git a/include/notifier.php b/include/notifier.php index f54efba31d..947818d597 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -18,6 +18,31 @@ require_once('include/html2plain.php'); * us by hosting providers. */ +/* + * The notifier is typically called with: + * + * proc_run('php', "include/notifier.php", COMMAND, ITEM_ID); + * + * where COMMAND is one of the following: + * + * activity (in diaspora.php, dfrn_confirm.php, profiles.php) + * comment-import (in diaspora.php, items.php) + * comment-new (in item.php) + * drop (in diaspora.php, items.php, photos.php) + * edit_post (in item.php) + * event (in events.php) + * expire (in items.php) + * like (in like.php, poke.php) + * mail (in message.php) + * suggest (in fsuggest.php) + * tag (in photos.php, poke.php, tagger.php) + * tgroup (in items.php) + * wall-new (in photos.php, item.php) + * + * and ITEM_ID is the id of the item in the database that needs to be sent to others. + */ + + function notifier_run($argv, $argc){ global $a, $db; diff --git a/include/oembed.php b/include/oembed.php index a4452586ee..dbb96a67ca 100755 --- a/include/oembed.php +++ b/include/oembed.php @@ -12,7 +12,9 @@ function oembed_replacecb($matches){ function oembed_fetch_url($embedurl){ - $txt = Cache::get($embedurl); + $a = get_app(); + + $txt = Cache::get($a->videowidth . $embedurl); // These media files should now be caught in bbcode.php // left here as a fallback in case this is called from another source @@ -38,7 +40,7 @@ function oembed_fetch_url($embedurl){ $entries = $xpath->query("//link[@type='application/json+oembed']"); foreach($entries as $e){ $href = $e->getAttributeNode("href")->nodeValue; - $txt = fetch_url($href . '&maxwidth=425'); + $txt = fetch_url($href . '&maxwidth=' . $a->videowidth); break; } } @@ -47,7 +49,7 @@ function oembed_fetch_url($embedurl){ if ($txt==false || $txt==""){ // try oohembed service - $ourl = "http://oohembed.com/oohembed/?url=".urlencode($embedurl).'&maxwidth=425'; + $ourl = "http://oohembed.com/oohembed/?url=".urlencode($embedurl).'&maxwidth=' . $a->videowidth; $txt = fetch_url($ourl); } @@ -55,7 +57,7 @@ function oembed_fetch_url($embedurl){ if ($txt[0]!="{") $txt='{"type":"error"}'; //save in cache - Cache::set($embedurl,$txt); + Cache::set($a->videowidth . $embedurl,$txt); } @@ -114,7 +116,7 @@ function oembed_format_object($j){ if (isset($j->provider_name)) $ret.=" on ".$j->provider_name; } else { // add for html2bbcode conversion - $ret .= ""; + $ret .= ""; } $ret.="
"; return mb_convert_encoding($ret, 'HTML-ENTITIES', mb_detect_encoding($ret)); diff --git a/include/plugin.php b/include/plugin.php index 8f6d6ea985..3eeb0ccaa8 100644 --- a/include/plugin.php +++ b/include/plugin.php @@ -8,7 +8,10 @@ function uninstall_plugin($plugin){ q("DELETE FROM `addon` WHERE `name` = '%s' ", dbesc($plugin) ); - + + // define THISPLUGIN, make life easy to plugin devs :-) + define("THISPLUGIN", 'addon/' . $plugin . '/' . $plugin . '.php'); + @include_once('addon/' . $plugin . '/' . $plugin . '.php'); if(function_exists($plugin . '_uninstall')) { $func = $plugin . '_uninstall'; @@ -18,9 +21,11 @@ function uninstall_plugin($plugin){ if (! function_exists('install_plugin')){ function install_plugin($plugin) { - // silently fail if plugin was removed + // define THISPLUGIN, make life easy to plugin devs :-) + define("THISPLUGIN", 'addon/' . $plugin . '/' . $plugin . '.php'); + if(! file_exists('addon/' . $plugin . '/' . $plugin . '.php')) return false; logger("Addons: installing " . $plugin); @@ -77,7 +82,10 @@ function reload_plugins() { $pl = trim($pl); $fname = 'addon/' . $pl . '/' . $pl . '.php'; - + + // define THISPLUGIN, make life easy to plugin devs :-) + define("THISPLUGIN", $fname); + if(file_exists($fname)) { $t = @filemtime($fname); foreach($installed as $i) { @@ -163,6 +171,8 @@ function call_hooks($name, &$data = null) { if((is_array($a->hooks)) && (array_key_exists($name,$a->hooks))) { foreach($a->hooks[$name] as $hook) { + // define THISPLUGIN, make life easy to plugin devs :-) + define("THISPLUGIN", $hook[0]); @include_once($hook[0]); if(function_exists($hook[1])) { $func = $hook[1]; diff --git a/include/template_processor.php b/include/template_processor.php index 46252c355f..4088ddab60 100644 --- a/include/template_processor.php +++ b/include/template_processor.php @@ -63,7 +63,7 @@ if ($b[0]=="$") $b = $this->_get_var($b); $val = ($a == $b); } else if (strpos($args[2],"!=")>0){ - list($a,$b) = explode("!=",$args[2]); + list($a,$b) = array_map("trim", explode("!=",$args[2])); $a = $this->_get_var($a); if ($b[0]=="$") $b = $this->_get_var($b); $val = ($a != $b); @@ -133,6 +133,26 @@ return $ret; } + + /** + * DEBUG node + * + * {{ debug $var [$var [$var [...]]] }}{{ enddebug }} + * + * replace node with 
var_dump($var, $var, ...);
+ */ + private function _replcb_debug($args){ + $vars = array_map('trim', explode(" ",$args[2])); + $vars[] = $args[1]; + + $ret = "
";
+			foreach ($vars as $var){
+				$ret .= htmlspecialchars(var_export( $this->_get_var($var), true ));
+				$ret .= "\n";
+			}
+			$ret .= "
"; + return $ret; + } private function _replcb_node($m) { $node = $this->nodes[$m[1]]; diff --git a/include/text.php b/include/text.php index 1c50086aac..3783d2accd 100644 --- a/include/text.php +++ b/include/text.php @@ -70,7 +70,7 @@ function notags($string) { if(! function_exists('escape_tags')) { function escape_tags($string) { - return(htmlspecialchars($string)); + return(htmlspecialchars($string, ENT_COMPAT, 'UTF-8', false)); }} @@ -504,6 +504,10 @@ function get_tags($s) { $s = preg_replace('/\[code\](.*?)\[\/code\]/sm','',$s); + // ignore anything in a bbtag + + $s = preg_replace('/\[(.*?)\]/sm','',$s); + // Match full names against @tags including the space between first and last // We will look these up afterward to see if they are full names or not recognisable. @@ -723,6 +727,39 @@ function get_poke_verbs() { return $arr; } +function get_mood_verbs() { + + // index is present tense verb + // value is array containing past tense verb, translation of present, translation of past + + $arr = array( + 'happy' => t('happy'), + 'sad' => t('sad'), + 'mellow' => t('mellow'), + 'tired' => t('tired'), + 'perky' => t('perky'), + 'angry' => t('angry'), + 'stupefied' => t('stupified'), + 'puzzled' => t('puzzled'), + 'interested' => t('interested'), + 'bitter' => t('bitter'), + 'cheerful' => t('cheerful'), + 'alive' => t('alive'), + 'annoyed' => t('annoyed'), + 'anxious' => t('anxious'), + 'cranky' => t('cranky'), + 'disturbed' => t('disturbed'), + 'frustrated' => t('frustrated'), + 'motivated' => t('motivated'), + 'relaxed' => t('relaxed'), + 'surprised' => t('surprised'), + ); + + call_hooks('mood_verbs', $arr); + return $arr; +} + + /** * * Function: smilies diff --git a/include/user.php b/include/user.php index 039b30bbd1..2d06ef3742 100644 --- a/include/user.php +++ b/include/user.php @@ -277,6 +277,20 @@ function create_user($arr) { require_once('include/group.php'); group_add($newuid, t('Friends')); + if(! get_config('system', 'newuser_public')) { + $r = q("SELECT id FROM `group` WHERE uid = %d AND name = '%s'", + intval($newuid), + dbesc(t('Friends')) + ); + if($r) { + q("UPDATE user SET def_gid = %d, allow_gid = '%s' WHERE uid = %d", + intval($r[0]['id']), + dbesc("<" . $r[0]['id'] . ">"), + intval($newuid) + ); + } + } + } // if we have no OpenID photo try to look up an avatar diff --git a/js/country.js b/js/country.js index bbe9c7a183..85f4f7a39b 100644 --- a/js/country.js +++ b/js/country.js @@ -275,7 +275,7 @@ aStates[249]="|'Adan|'Ataq|Abyan|Al Bayda'|Al Hudaydah|Al Jawf|Al Mahrah|Al Mahw aStates[250]="|Kosovo|Montenegro|Serbia|Vojvodina"; aStates[251]="|Central|Copperbelt|Eastern|Luapula|Lusaka|North-Western|Northern|Southern|Western"; aStates[252]="|Bulawayo|Harare|ManicalandMashonaland Central|Mashonaland East|Mashonaland West|Masvingo|Matabeleland North|Matabeleland South|Midlands"; -aStates[253]="|Self Hosted|Private Server|Architects Of Sleep|DFRN|Distributed Friend Network|Free-Beer.ch|Foojbook|Free-Haven|Friendica.eu|Friendika.me.4.it|Friendika - I Ask Questions|Frndc.com|Hikado|Hipatia|Hungerfreunde|Kaluguran Community|Kak Ste|Karl.Markx.pm|Loozah Social Club|MyFriendica.net|MyFriendNetwork|Oi!|OpenMindSpace|Optimistisch|Recolutionari.es|Sparkling Network|SPRACI|Styliztique|Sysfu Social Club|Trevena|theshi.re|Tumpambae|Uzmiac|Other"; +aStates[253]="|Self Hosted|Private Server|Architects Of Sleep|DFRN|Distributed Friend Network|ErrLock|Free-Beer.ch|Foojbook|Free-Haven|Friendica.eu|Friendika.me.4.it|Friendika - I Ask Questions|Frndc.com|Hikado|Hipatia|Hungerfreunde|Kaluguran Community|Kak Ste|Karl.Markx.pm|Loozah Social Club|MyFriendica.net|MyFriendNetwork|Oi!|OpenMindSpace|Optimistisch|Recolutionari.es|SilverLips|Sparkling Network|SPRACI|Styliztique|Sysfu Social Club|Trevena|theshi.re|Tumpambae|Uzmiac|Other"; /* * gArCountryInfo * (0) Country name diff --git a/js/main.js b/js/main.js index c7db9a0691..6ab574c4e8 100644 --- a/js/main.js +++ b/js/main.js @@ -280,8 +280,7 @@ //}); // add a new thread - - $('.tread-wrapper',data).each(function() { + $('.toplevel_item',data).each(function() { var ident = $(this).attr('id'); if($('#' + ident).length == 0 && profile_page == 1) { diff --git a/js/main.min.js b/js/main.min.js index e8de026e40..f94d4dc98e 100644 --- a/js/main.min.js +++ b/js/main.min.js @@ -1 +1 @@ -function openClose(e){document.getElementById(e).style.display=="block"?document.getElementById(e).style.display="none":document.getElementById(e).style.display="block"}function openMenu(e){document.getElementById(e).style.display="block"}function closeMenu(e){document.getElementById(e).style.display="none"}function NavUpdate(){if(!stopped){var e="ping"+(localUser!=0?"?f=&uid="+localUser:"");$.get(e,function(e){$(e).find("result").each(function(){$("nav").trigger("nav-update",this),$("#live-network").length&&(src="network",liveUpdate()),$("#live-profile").length&&(src="profile",liveUpdate()),$("#live-community").length&&(src="community",liveUpdate()),$("#live-notes").length&&(src="notes",liveUpdate()),$("#live-display").length&&liking&&(liking=0,window.location.href=window.location.href),$("#live-photos").length&&liking&&(liking=0,window.location.href=window.location.href)})})}timer=setTimeout(NavUpdate,updateInterval)}function liveUpdate(){if(src==null||stopped||!profile_uid){$(".like-rotator").hide();return}if($(".comment-edit-text-full").length||in_progress){livetime&&clearTimeout(livetime),livetime=setTimeout(liveUpdate,1e4);return}livetime!=null&&(livetime=null),prev="live-"+src,in_progress=!0;var e=netargs.length?"/"+netargs:"",t="update_"+src+e+"&p="+profile_uid+"&page="+profile_page+"&msie="+(msie?1:0);$.get(t,function(e){in_progress=!1,$(".tread-wrapper",e).each(function(){var e=$(this).attr("id");$("#"+e).length==0&&profile_page==1?($("img",this).each(function(){$(this).attr("src",$(this).attr("dst"))}),$("#"+prev).after($(this))):($("img",this).each(function(){$(this).attr("src",$(this).attr("dst"))}),$("#"+e).replaceWith($(this))),prev=e}),$(".like-rotator").hide(),commentBusy&&(commentBusy=!1,$("body").css("cursor","auto")),$(".comment-edit-form textarea").contact_autocomplete(baseurl+"/acl")})}function imgbright(e){$(e).removeClass("drophide").addClass("drop")}function imgdull(e){$(e).removeClass("drop").addClass("drophide")}function dolike(e,t){unpause(),$("#like-rotator-"+e.toString()).show(),$.get("like/"+e.toString()+"?verb="+t,NavUpdate),liking=1}function dostar(e){e=e.toString(),$("#like-rotator-"+e).show(),$.get("starred/"+e,function(t){t.match(/1/)?($("#starred-"+e).addClass("starred"),$("#starred-"+e).removeClass("unstarred"),$("#star-"+e).addClass("hidden"),$("#unstar-"+e).removeClass("hidden")):($("#starred-"+e).addClass("unstarred"),$("#starred-"+e).removeClass("starred"),$("#star-"+e).removeClass("hidden"),$("#unstar-"+e).addClass("hidden")),$("#like-rotator-"+e).hide()})}function getPosition(e){var t={x:0,y:0};if(e.pageX||e.pageY)t.x=e.pageX,t.y=e.pageY;else if(e.clientX||e.clientY)t.x=e.clientX+(document.documentElement.scrollLeft||document.body.scrollLeft)-document.documentElement.clientLeft,t.y=e.clientY+(document.documentElement.scrollTop||document.body.scrollTop)-document.documentElement.clientTop;else if(e.x||e.y)t.x=e.x,t.y=e.y;return t}function lockview(e,t){e=e||window.event,cursor=getPosition(e),lockvisible?lockviewhide():(lockvisible=!0,$.get("lockview/"+t,function(e){$("#panel").html(e),$("#panel").css({left:cursor.x+5,top:cursor.y+5}),$("#panel").show()}))}function lockviewhide(){lockvisible=!1,$("#panel").hide()}function post_comment(e){return unpause(),commentBusy=!0,$("body").css("cursor","wait"),$("#comment-preview-inp-"+e).val("0"),$.post("item",$("#comment-edit-form-"+e).serialize(),function(t){if(t.success){$("#comment-edit-wrapper-"+e).hide(),$("#comment-edit-text-"+e).val("");var n=document.getElementById("comment-edit-text-"+e);n&&commentClose(n,e),timer&&clearTimeout(timer),timer=setTimeout(NavUpdate,10)}t.reload&&(window.location.href=t.reload)},"json"),!1}function preview_comment(e){return $("#comment-preview-inp-"+e).val("1"),$("#comment-edit-preview-"+e).show(),$.post("item",$("#comment-edit-form-"+e).serialize(),function(t){t.preview&&($("#comment-edit-preview-"+e).html(t.preview),$("#comment-edit-preview-"+e+" a").click(function(){return!1}))},"json"),!0}function preview_post(){return $("#jot-preview").val("1"),$("#jot-preview-content").show(),tinyMCE.triggerSave(),$.post("item",$("#profile-jot-form").serialize(),function(e){e.preview&&($("#jot-preview-content").html(e.preview),$("#jot-preview-content a").click(function(){return!1}))},"json"),$("#jot-preview").val("0"),!0}function unpause(){totStopped=!1,stopped=!1,$("#pause").html("")}function bin2hex(e){var t,n,r=0,i=[];e+="",r=e.length;for(n=0;n'+e.desc+'
'+e.version+'
'+e.credits+'
'+theme+'')})}var src=null,prev=null,livetime=null,msie=!1,stopped=!1,totStopped=!1,timer=null,pr=0,liking=0,in_progress=!1,langSelect=!1,commentBusy=!1,last_popup_menu=null,last_popup_button=null;$(function(){function e(){last_popup_menu&&(last_popup_menu.hide(),last_popup_button.removeClass("selected"),last_popup_menu=null,last_popup_button=null)}$.ajaxSetup({cache:!1}),msie=$.browser.msie,$(".onoff input").each(function(){val=$(this).val(),id=$(this).attr("id"),$("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden")}),$(".onoff > a").click(function(e){e.preventDefault();var t=$(this).siblings("input"),n=1-t.val(),r=t.attr("id");$("#"+r+"_onoff ."+(n==0?"on":"off")).addClass("hidden"),$("#"+r+"_onoff ."+(n==1?"on":"off")).removeClass("hidden"),t.val(n)}),setupFieldRichtext(),$("a[rel^=#]").click(function(t){return e(),menu=$($(this).attr("rel")),t.preventDefault(),t.stopPropagation(),menu.attr("popup")=="false"?!1:($(this).parent().toggleClass("selected"),menu.toggle(),menu.css("display")=="none"?(last_popup_menu=null,last_popup_button=null):(last_popup_menu=menu,last_popup_button=$(this).parent()),!1)}),$("html").click(function(){e()}),$("a.popupbox").fancybox({transitionIn:"elastic",transitionOut:"elastic"});var t=unescape($("#nav-notifications-template[rel=template]").html()),n=unescape($("
").append($("#nav-notifications-see-all").clone()).html()),r=unescape($("
").append($("#nav-notifications-mark-all").clone()).html()),i=unescape($("#nav-notifications-menu").html());$("nav").bind("nav-update",function(e,s){var o=$(s).find("invalid").text();o==1&&(window.location.href=window.location.href);var u=$(s).find("net").text();u==0?(u="",$("#net-update").removeClass("show")):$("#net-update").addClass("show"),$("#net-update").html(u);var a=$(s).find("home").text();a==0?(a="",$("#home-update").removeClass("show")):$("#home-update").addClass("show"),$("#home-update").html(a);var f=$(s).find("intro").text();f==0?(f="",$("#intro-update").removeClass("show")):$("#intro-update").addClass("show"),$("#intro-update").html(f);var l=$(s).find("mail").text();l==0?(l="",$("#mail-update").removeClass("show")):$("#mail-update").addClass("show"),$("#mail-update").html(l);var f=$(s).find("intro").text();f==0?(f="",$("#intro-update-li").removeClass("show")):$("#intro-update-li").addClass("show"),$("#intro-update-li").html(f);var l=$(s).find("mail").text();l==0?(l="",$("#mail-update-li").removeClass("show")):$("#mail-update-li").addClass("show"),$("#mail-update-li").html(l);var c=$(s).find("notif");c.children("note").length==0?$("#nav-notifications-menu").html(i):(nnm=$("#nav-notifications-menu"),nnm.html(n+r),c.children("note").each(function(){e=$(this),text=e.text().format(""+e.attr("name")+""),html=t.format(e.attr("href"),e.attr("photo"),text,e.attr("date"),e.attr("seen")),nnm.append(html)})),notif=c.attr("count"),notif>0?$("#nav-notifications-linkmenu").addClass("on"):$("#nav-notifications-linkmenu").removeClass("on"),notif==0?(notif="",$("#notify-update").removeClass("show")):$("#notify-update").addClass("show"),$("#notify-update").html(notif);var h=$(s).find("sysmsgs");h.children("notice").each(function(){text=$(this).text(),$.jGrowl(text,{sticky:!0,theme:"notice"})}),h.children("info").each(function(){text=$(this).text(),$.jGrowl(text,{sticky:!1,theme:"info",life:1e4})})}),NavUpdate(),$(document).keydown(function(e){if(e.keyCode=="8"){var t=e.target||e.srcElement;if(!/input|textarea/i.test(t.nodeName))return!1}e.keyCode=="19"||e.ctrlKey&&e.which=="32"?(e.preventDefault(),stopped==0?(stopped=!0,e.ctrlKey&&(totStopped=!0),$("#pause").html('pause')):unpause()):totStopped||unpause()})});var lockvisible=!1;String.prototype.format=function(){var e=this;for(var t=0;t'+e.desc+'
'+e.version+'
'+e.credits+'
'+theme+'')})}var src=null,prev=null,livetime=null,msie=!1,stopped=!1,totStopped=!1,timer=null,pr=0,liking=0,in_progress=!1,langSelect=!1,commentBusy=!1,last_popup_menu=null,last_popup_button=null;$(function(){function e(){last_popup_menu&&(last_popup_menu.hide(),last_popup_button.removeClass("selected"),last_popup_menu=null,last_popup_button=null)}$.ajaxSetup({cache:!1}),msie=$.browser.msie,$(".onoff input").each(function(){val=$(this).val(),id=$(this).attr("id"),$("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden")}),$(".onoff > a").click(function(e){e.preventDefault();var t=$(this).siblings("input"),n=1-t.val(),r=t.attr("id");$("#"+r+"_onoff ."+(n==0?"on":"off")).addClass("hidden"),$("#"+r+"_onoff ."+(n==1?"on":"off")).removeClass("hidden"),t.val(n)}),setupFieldRichtext(),$("a[rel^=#]").click(function(t){return e(),menu=$($(this).attr("rel")),t.preventDefault(),t.stopPropagation(),menu.attr("popup")=="false"?!1:($(this).parent().toggleClass("selected"),menu.toggle(),menu.css("display")=="none"?(last_popup_menu=null,last_popup_button=null):(last_popup_menu=menu,last_popup_button=$(this).parent()),!1)}),$("html").click(function(){e()}),$("a.popupbox").fancybox({transitionIn:"elastic",transitionOut:"elastic"});var t=unescape($("#nav-notifications-template[rel=template]").html()),n=unescape($("
").append($("#nav-notifications-see-all").clone()).html()),r=unescape($("
").append($("#nav-notifications-mark-all").clone()).html()),i=unescape($("#nav-notifications-menu").html());$("nav").bind("nav-update",function(e,s){var o=$(s).find("invalid").text();o==1&&(window.location.href=window.location.href);var u=$(s).find("net").text();u==0?(u="",$("#net-update").removeClass("show")):$("#net-update").addClass("show"),$("#net-update").html(u);var a=$(s).find("home").text();a==0?(a="",$("#home-update").removeClass("show")):$("#home-update").addClass("show"),$("#home-update").html(a);var f=$(s).find("intro").text();f==0?(f="",$("#intro-update").removeClass("show")):$("#intro-update").addClass("show"),$("#intro-update").html(f);var l=$(s).find("mail").text();l==0?(l="",$("#mail-update").removeClass("show")):$("#mail-update").addClass("show"),$("#mail-update").html(l);var f=$(s).find("intro").text();f==0?(f="",$("#intro-update-li").removeClass("show")):$("#intro-update-li").addClass("show"),$("#intro-update-li").html(f);var l=$(s).find("mail").text();l==0?(l="",$("#mail-update-li").removeClass("show")):$("#mail-update-li").addClass("show"),$("#mail-update-li").html(l);var c=$(s).find("notif");c.children("note").length==0?$("#nav-notifications-menu").html(i):(nnm=$("#nav-notifications-menu"),nnm.html(n+r),c.children("note").each(function(){e=$(this),text=e.text().format(""+e.attr("name")+""),html=t.format(e.attr("href"),e.attr("photo"),text,e.attr("date"),e.attr("seen")),nnm.append(html)})),notif=c.attr("count"),notif>0?$("#nav-notifications-linkmenu").addClass("on"):$("#nav-notifications-linkmenu").removeClass("on"),notif==0?(notif="",$("#notify-update").removeClass("show")):$("#notify-update").addClass("show"),$("#notify-update").html(notif);var h=$(s).find("sysmsgs");h.children("notice").each(function(){text=$(this).text(),$.jGrowl(text,{sticky:!0,theme:"notice"})}),h.children("info").each(function(){text=$(this).text(),$.jGrowl(text,{sticky:!1,theme:"info",life:1e4})})}),NavUpdate(),$(document).keydown(function(e){if(e.keyCode=="8"){var t=e.target||e.srcElement;if(!/input|textarea/i.test(t.nodeName))return!1}e.keyCode=="19"||e.ctrlKey&&e.which=="32"?(e.preventDefault(),stopped==0?(stopped=!0,e.ctrlKey&&(totStopped=!0),$("#pause").html('pause')):unpause()):totStopped||unpause()})});var lockvisible=!1;String.prototype.format=function(){var e=this;for(var t=0;targc > 1) { + switch($a->argv[1]) { + case "host-meta": + hostxrd_init($a); + break; + } + } + http_status_exit(404); + killme(); +} \ No newline at end of file diff --git a/mod/admin.php b/mod/admin.php index 05af01aa41..cc13e27b14 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -231,42 +231,47 @@ function admin_page_site_post(&$a){ return; } - check_form_security_token_redirectOnErr('/admin/site', 'admin_site'); + check_form_security_token_redirectOnErr('/admin/site', 'admin_site'); - $sitename = ((x($_POST,'sitename')) ? notags(trim($_POST['sitename'])) : ''); - $banner = ((x($_POST,'banner')) ? trim($_POST['banner']) : false); - $language = ((x($_POST,'language')) ? notags(trim($_POST['language'])) : ''); - $theme = ((x($_POST,'theme')) ? notags(trim($_POST['theme'])) : ''); + $sitename = ((x($_POST,'sitename')) ? notags(trim($_POST['sitename'])) : ''); + $banner = ((x($_POST,'banner')) ? trim($_POST['banner']) : false); + $language = ((x($_POST,'language')) ? notags(trim($_POST['language'])) : ''); + $theme = ((x($_POST,'theme')) ? notags(trim($_POST['theme'])) : ''); + $theme_mobile = ((x($_POST,'theme_mobile')) ? notags(trim($_POST['theme_mobile'])) : ''); $maximagesize = ((x($_POST,'maximagesize')) ? intval(trim($_POST['maximagesize'])) : 0); + $maximagelength = ((x($_POST,'maximagelength')) ? intval(trim($_POST['maximagelength'])) : MAX_IMAGE_LENGTH); + $jpegimagequality = ((x($_POST,'jpegimagequality')) ? intval(trim($_POST['jpegimagequality'])) : JPEG_QUALITY); - $register_policy = ((x($_POST,'register_policy')) ? intval(trim($_POST['register_policy'])) : 0); - $abandon_days = ((x($_POST,'abandon_days')) ? intval(trim($_POST['abandon_days'])) : 0); + $register_policy = ((x($_POST,'register_policy')) ? intval(trim($_POST['register_policy'])) : 0); + $abandon_days = ((x($_POST,'abandon_days')) ? intval(trim($_POST['abandon_days'])) : 0); - $register_text = ((x($_POST,'register_text')) ? notags(trim($_POST['register_text'])) : ''); + $register_text = ((x($_POST,'register_text')) ? notags(trim($_POST['register_text'])) : ''); - $allowed_sites = ((x($_POST,'allowed_sites')) ? notags(trim($_POST['allowed_sites'])) : ''); - $allowed_email = ((x($_POST,'allowed_email')) ? notags(trim($_POST['allowed_email'])) : ''); - $block_public = ((x($_POST,'block_public')) ? True : False); - $force_publish = ((x($_POST,'publish_all')) ? True : False); + $allowed_sites = ((x($_POST,'allowed_sites')) ? notags(trim($_POST['allowed_sites'])) : ''); + $allowed_email = ((x($_POST,'allowed_email')) ? notags(trim($_POST['allowed_email'])) : ''); + $block_public = ((x($_POST,'block_public')) ? True : False); + $force_publish = ((x($_POST,'publish_all')) ? True : False); $global_directory = ((x($_POST,'directory_submit_url')) ? notags(trim($_POST['directory_submit_url'])) : ''); - $no_multi_reg = ((x($_POST,'no_multi_reg')) ? True : False); - $no_openid = !((x($_POST,'no_openid')) ? True : False); - $no_regfullname = !((x($_POST,'no_regfullname')) ? True : False); - $no_utf = !((x($_POST,'no_utf')) ? True : False); - $no_community_page = !((x($_POST,'no_community_page')) ? True : False); + $thread_allow = ((x($_POST,'thread_allow')) ? True : False); + $newuser_public = ((x($_POST,'newuser_public')) ? True : False); + $no_multi_reg = ((x($_POST,'no_multi_reg')) ? True : False); + $no_openid = !((x($_POST,'no_openid')) ? True : False); + $no_regfullname = !((x($_POST,'no_regfullname')) ? True : False); + $no_utf = !((x($_POST,'no_utf')) ? True : False); + $no_community_page = !((x($_POST,'no_community_page')) ? True : False); - $verifyssl = ((x($_POST,'verifyssl')) ? True : False); - $proxyuser = ((x($_POST,'proxyuser')) ? notags(trim($_POST['proxyuser'])) : ''); - $proxy = ((x($_POST,'proxy')) ? notags(trim($_POST['proxy'])) : ''); - $timeout = ((x($_POST,'timeout')) ? intval(trim($_POST['timeout'])) : 60); - $delivery_interval = ((x($_POST,'delivery_interval'))? intval(trim($_POST['delivery_interval'])) : 0); - $poll_interval = ((x($_POST,'poll_interval'))? intval(trim($_POST['poll_interval'])) : 0); - $maxloadavg = ((x($_POST,'maxloadavg')) ? intval(trim($_POST['maxloadavg'])) : 50); - $dfrn_only = ((x($_POST,'dfrn_only')) ? True : False); - $ostatus_disabled = !((x($_POST,'ostatus_disabled')) ? True : False); - $diaspora_enabled = ((x($_POST,'diaspora_enabled')) ? True : False); - $ssl_policy = ((x($_POST,'ssl_policy')) ? intval($_POST['ssl_policy']) : 0); + $verifyssl = ((x($_POST,'verifyssl')) ? True : False); + $proxyuser = ((x($_POST,'proxyuser')) ? notags(trim($_POST['proxyuser'])) : ''); + $proxy = ((x($_POST,'proxy')) ? notags(trim($_POST['proxy'])) : ''); + $timeout = ((x($_POST,'timeout')) ? intval(trim($_POST['timeout'])) : 60); + $delivery_interval = ((x($_POST,'delivery_interval')) ? intval(trim($_POST['delivery_interval'])) : 0); + $poll_interval = ((x($_POST,'poll_interval')) ? intval(trim($_POST['poll_interval'])) : 0); + $maxloadavg = ((x($_POST,'maxloadavg')) ? intval(trim($_POST['maxloadavg'])) : 50); + $dfrn_only = ((x($_POST,'dfrn_only')) ? True : False); + $ostatus_disabled = !((x($_POST,'ostatus_disabled')) ? True : False); + $diaspora_enabled = ((x($_POST,'diaspora_enabled')) ? True : False); + $ssl_policy = ((x($_POST,'ssl_policy')) ? intval($_POST['ssl_policy']) : 0); if($ssl_policy != intval(get_config('system','ssl_policy'))) { if($ssl_policy == SSL_POLICY_FULL) { @@ -324,7 +329,14 @@ function admin_page_site_post(&$a){ } set_config('system','language', $language); set_config('system','theme', $theme); + if ( $theme_mobile === '---' ) { + del_config('system','mobile-theme'); + } else { + set_config('system','mobile-theme', $theme_mobile); + } set_config('system','maximagesize', $maximagesize); + set_config('system','max_image_length', $maximagelength); + set_config('system','jpeg_quality', $jpegimagequality); set_config('config','register_policy', $register_policy); set_config('system','account_abandon_days', $abandon_days); @@ -342,6 +354,8 @@ function admin_page_site_post(&$a){ } else { set_config('system','directory_submit_url', $global_directory); } + set_config('system','thread_allow', $thread_allow); + set_config('system','newuser_public', $newuser_public); set_config('system','block_extended_register', $no_multi_reg); set_config('system','no_openid', $no_openid); @@ -384,12 +398,17 @@ function admin_page_site(&$a) { /* Installed themes */ $theme_choices = array(); + $theme_choices_mobile = array(); + $theme_choices_mobile["---"] = t("Don't apply a special theme for mobile devices."); $files = glob('view/theme/*'); if($files) { foreach($files as $file) { $f = basename($file); $theme_name = ((file_exists($file . '/experimental')) ? sprintf("%s - \x28Experimental\x29", $f) : $f); - $theme_choices[$f] = $theme_name; + $theme_choices[$f] = $theme_name; + if (file_exists($file . '/mobile')) { + $theme_choices_mobile[$f] = $theme_name; + } } } @@ -426,38 +445,43 @@ function admin_page_site(&$a) { '$advanced' => t('Advanced'), '$baseurl' => $a->get_baseurl(true), - // name, label, value, help string, extra data... + // name, label, value, help string, extra data... '$sitename' => array('sitename', t("Site name"), htmlentities($a->config['sitename'], ENT_QUOTES), ""), - '$banner' => array('banner', t("Banner/Logo"), $banner, ""), + '$banner' => array('banner', t("Banner/Logo"), $banner, ""), '$language' => array('language', t("System language"), get_config('system','language'), "", $lang_choices), - '$theme' => array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles - change theme settings"), $theme_choices), - '$ssl_policy' => array('ssl_policy', t("SSL link policy"), (string) intval(get_config('system','ssl_policy')), t("Determines whether generated links should be forced to use SSL"), $ssl_choices), + '$theme' => array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles - change theme settings"), $theme_choices), + '$theme_mobile' => array('theme_mobile', t("Mobile system theme"), get_config('system','mobile-theme'), t("Theme for mobile devices"), $theme_choices_mobile), + '$ssl_policy' => array('ssl_policy', t("SSL link policy"), (string) intval(get_config('system','ssl_policy')), t("Determines whether generated links should be forced to use SSL"), $ssl_choices), '$maximagesize' => array('maximagesize', t("Maximum image size"), get_config('system','maximagesize'), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")), + '$maximagelength' => array('maximagelength', t("Maximum image length"), get_config('system','max_image_length'), t("Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits.")), + '$jpegimagequality' => array('jpegimagequality', t("JPEG image quality"), get_config('system','jpeg_quality'), t("Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality.")), '$register_policy' => array('register_policy', t("Register policy"), $a->config['register_policy'], "", $register_choices), '$register_text' => array('register_text', t("Register text"), htmlentities($a->config['register_text'], ENT_QUOTES, 'UTF-8'), t("Will be displayed prominently on the registration page.")), - '$abandon_days' => array('abandon_days', t('Accounts abandoned after x days'), get_config('system','account_abandon_days'), t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.')), + '$abandon_days' => array('abandon_days', t('Accounts abandoned after x days'), get_config('system','account_abandon_days'), t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.')), '$allowed_sites' => array('allowed_sites', t("Allowed friend domains"), get_config('system','allowed_sites'), t("Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains")), '$allowed_email' => array('allowed_email', t("Allowed email domains"), get_config('system','allowed_email'), t("Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains")), '$block_public' => array('block_public', t("Block public"), get_config('system','block_public'), t("Check to block public access to all otherwise public personal pages on this site unless you are currently logged in.")), '$force_publish' => array('publish_all', t("Force publish"), get_config('system','publish_all'), t("Check to force all profiles on this site to be listed in the site directory.")), '$global_directory' => array('directory_submit_url', t("Global directory update URL"), get_config('system','directory_submit_url'), t("URL to update the global directory. If this is not set, the global directory is completely unavailable to the application.")), + '$thread_allow' => array('thread_allow', t("Allow threaded items"), get_config('system','thread_allow'), t("Allow infinite level threading for items on this site.")), + '$newuser_public' => array('newuser_public', t("No default permissions for new users"), get_config('system','newuser_public'), t("New users will have no private permissions set for their posts by default, making their posts public until they change it.")), '$no_multi_reg' => array('no_multi_reg', t("Block multiple registrations"), get_config('system','block_extended_register'), t("Disallow users to register additional accounts for use as pages.")), '$no_openid' => array('no_openid', t("OpenID support"), !get_config('system','no_openid'), t("OpenID support for registration and logins.")), '$no_regfullname' => array('no_regfullname', t("Fullname check"), !get_config('system','no_regfullname'), t("Force users to register with a space between firstname and lastname in Full name, as an antispam measure")), - '$no_utf' => array('no_utf', t("UTF-8 Regular expressions"), !get_config('system','no_utf'), t("Use PHP UTF8 regular expressions")), - '$no_community_page' => array('no_community_page', t("Show Community Page"), !get_config('system','no_community_page'), t("Display a Community page showing all recent public postings on this site.")), - '$ostatus_disabled' => array('ostatus_disabled', t("Enable OStatus support"), !get_config('system','ostatus_disable'), t("Provide built-in OStatus \x28identi.ca, status.net, etc.\x29 compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed.")), - '$diaspora_enabled' => array('diaspora_enabled', t("Enable Diaspora support"), get_config('system','diaspora_enabled'), t("Provide built-in Diaspora network compatibility.")), - '$dfrn_only' => array('dfrn_only', t('Only allow Friendica contacts'), get_config('system','dfrn_only'), t("All contacts must use Friendica protocols. All other built-in communication protocols disabled.")), + '$no_utf' => array('no_utf', t("UTF-8 Regular expressions"), !get_config('system','no_utf'), t("Use PHP UTF8 regular expressions")), + '$no_community_page' => array('no_community_page', t("Show Community Page"), !get_config('system','no_community_page'), t("Display a Community page showing all recent public postings on this site.")), + '$ostatus_disabled' => array('ostatus_disabled', t("Enable OStatus support"), !get_config('system','ostatus_disable'), t("Provide built-in OStatus \x28identi.ca, status.net, etc.\x29 compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed.")), + '$diaspora_enabled' => array('diaspora_enabled', t("Enable Diaspora support"), get_config('system','diaspora_enabled'), t("Provide built-in Diaspora network compatibility.")), + '$dfrn_only' => array('dfrn_only', t('Only allow Friendica contacts'), get_config('system','dfrn_only'), t("All contacts must use Friendica protocols. All other built-in communication protocols disabled.")), '$verifyssl' => array('verifyssl', t("Verify SSL"), get_config('system','verifyssl'), t("If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites.")), '$proxyuser' => array('proxyuser', t("Proxy user"), get_config('system','proxyuser'), ""), - '$proxy' => array('proxy', t("Proxy URL"), get_config('system','proxy'), ""), - '$timeout' => array('timeout', t("Network timeout"), (x(get_config('system','curl_timeout'))?get_config('system','curl_timeout'):60), t("Value is in seconds. Set to 0 for unlimited (not recommended).")), - '$delivery_interval' => array('delivery_interval', t("Delivery interval"), (x(get_config('system','delivery_interval'))?get_config('system','delivery_interval'):2), t("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.")), - '$poll_interval' => array('poll_interval', t("Poll interval"), (x(get_config('system','poll_interval'))?get_config('system','poll_interval'):2), t("Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval.")), - '$maxloadavg' => array('maxloadavg', t("Maximum Load Average"), ((intval(get_config('system','maxloadavg')) > 0)?get_config('system','maxloadavg'):50), t("Maximum system load before delivery and poll processes are deferred - default 50.")), + '$proxy' => array('proxy', t("Proxy URL"), get_config('system','proxy'), ""), + '$timeout' => array('timeout', t("Network timeout"), (x(get_config('system','curl_timeout'))?get_config('system','curl_timeout'):60), t("Value is in seconds. Set to 0 for unlimited (not recommended).")), + '$delivery_interval' => array('delivery_interval', t("Delivery interval"), (x(get_config('system','delivery_interval'))?get_config('system','delivery_interval'):2), t("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.")), + '$poll_interval' => array('poll_interval', t("Poll interval"), (x(get_config('system','poll_interval'))?get_config('system','poll_interval'):2), t("Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval.")), + '$maxloadavg' => array('maxloadavg', t("Maximum Load Average"), ((intval(get_config('system','maxloadavg')) > 0)?get_config('system','maxloadavg'):50), t("Maximum system load before delivery and poll processes are deferred - default 50.")), '$form_security_token' => get_form_security_token("admin_site"), )); diff --git a/mod/content.php b/mod/content.php index 5f3e954f60..e6789860db 100644 --- a/mod/content.php +++ b/mod/content.php @@ -698,6 +698,7 @@ function render_content(&$a, $items, $mode, $update, $preview = false) { '$edurl' => t('Link'), '$edvideo' => t('Video'), '$preview' => t('Preview'), + '$sourceapp' => t($a->sourcename), '$ww' => (($mode === 'network') ? $commentww : '') )); } diff --git a/mod/display.php b/mod/display.php index 92ffd1a709..afa61ef026 100644 --- a/mod/display.php +++ b/mod/display.php @@ -113,8 +113,9 @@ function display_content(&$a) { ); } - - $o .= conversation($a,$r,'display', false); + $items = conv_sort($r,"`commented`"); + + $o .= conversation($a,$items,'display', false); } else { diff --git a/mod/editpost.php b/mod/editpost.php index 4270ef1133..b44afe245f 100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -123,8 +123,8 @@ function editpost_content(&$a) { '$jotnets' => $jotnets, '$title' => $itm[0]['title'], '$placeholdertitle' => t('Set title'), - '$category' => file_tag_file_to_list($itm[0]['file'], 'category'), - '$placeholdercategory' => t('Categories (comma-separated list)'), + '$category' => file_tag_file_to_list($itm[0]['file'], 'category'), + '$placeholdercategory' => t('Categories (comma-separated list)'), '$emtitle' => t('Example: bob@example.com, mary@example.com'), '$lockstate' => $lockstate, '$acl' => '', // populate_acl((($group) ? $group_acl : $a->user), $celeb), @@ -132,7 +132,7 @@ function editpost_content(&$a) { '$profile_uid' => $_SESSION['uid'], '$preview' => t('Preview'), '$jotplugins' => $jotplugins, - '$mobileapp' => t('Friendica mobile web'), + '$sourceapp' => t($a->sourcename), )); return $o; diff --git a/mod/install.php b/mod/install.php index cb21a71ebe..4e4631b85f 100755 --- a/mod/install.php +++ b/mod/install.php @@ -60,7 +60,7 @@ function install_post(&$a) { return; break; - case 4; + case 4: $urlpath = $a->get_path(); $dbhost = notags(trim($_POST['dbhost'])); $dbuser = notags(trim($_POST['dbuser'])); @@ -155,11 +155,11 @@ function install_content(&$a) { } if(x($a->data,'txt') && strlen($a->data['txt'])) { - $tpl = get_markup_template('install.tpl'); $db_return_text .= manual_config($a); } if ($db_return_text!="") { + $tpl = get_markup_template('install.tpl'); return replace_macros($tpl, array( '$title' => $install_title, '$pass' => "", diff --git a/mod/item.php b/mod/item.php index fddc3fd124..6c1c06f99a 100644 --- a/mod/item.php +++ b/mod/item.php @@ -79,6 +79,7 @@ function item_post(&$a) { // if this isn't the real parent of the conversation, find it if($r !== false && count($r)) { $parid = $r[0]['parent']; + $parent_uri = $r[0]['uri']; if($r[0]['id'] != $r[0]['parent']) { $r = q("SELECT * FROM `item` WHERE `id` = `parent` AND `parent` = %d LIMIT 1", intval($parid) @@ -96,7 +97,7 @@ function item_post(&$a) { $parent = $r[0]['id']; // multi-level threading - preserve the info but re-parent to our single level threading - if(($parid) && ($parid != $parent)) + //if(($parid) && ($parid != $parent)) $thr_parent = $parent_uri; if($parent_item['contact-id'] && $uid) { @@ -438,6 +439,7 @@ function item_post(&$a) { $body = bb_translate_video($body); + /** * Fold multi-line [code] sequences */ @@ -446,6 +448,8 @@ function item_post(&$a) { $body = scale_external_images($body,false); + + /** * Look for any tags and linkify them */ @@ -541,6 +545,10 @@ function item_post(&$a) { $uri = item_new_uri($a->get_hostname(),$profile_uid); + // Fallback so that we alway have a thr-parent + if(!$thr_parent) + $thr_parent = $uri; + $datarray = array(); $datarray['uid'] = $profile_uid; $datarray['type'] = $post_type; @@ -600,7 +608,7 @@ function item_post(&$a) { if($preview) { require_once('include/conversation.php'); - $o = conversation($a,array(array_merge($contact_record,$datarray)),'search',false,true); + $o = conversation($a,array(array_merge($contact_record,$datarray)),'search', false); logger('preview: ' . $o); echo json_encode(array('preview' => $o)); killme(); @@ -740,6 +748,7 @@ function item_post(&$a) { 'verb' => ACTIVITY_POST, 'otype' => 'item', 'parent' => $parent, + 'parent_uri' => $parent_item['uri'] )); } diff --git a/mod/message.php b/mod/message.php index 83bad29d43..97c6586320 100644 --- a/mod/message.php +++ b/mod/message.php @@ -351,6 +351,7 @@ function message_content(&$a) { '$body' => template_escape($rr['body']), '$to_name' => template_escape($rr['name']), '$date' => datetime_convert('UTC',date_default_timezone_get(),$rr['mailcreated'], t('D, d M Y - g:i A')), + '$ago' => relative_date($rr['mailcreated']), '$seen' => $rr['mailseen'], '$count' => sprintf( tt('%d message', '%d messages', $rr['count']), $rr['count']), )); @@ -443,6 +444,7 @@ function message_content(&$a) { 'delete' => t('Delete message'), 'to_name' => template_escape($message['name']), 'date' => datetime_convert('UTC',date_default_timezone_get(),$message['created'],'D, d M Y - g:i A'), + 'ago' => relative_date($message['created']), ); $seen = $message['seen']; diff --git a/mod/mood.php b/mod/mood.php new file mode 100644 index 0000000000..7a793c71e0 --- /dev/null +++ b/mod/mood.php @@ -0,0 +1,142 @@ +user['allow_cid']; + $allow_gid = $a->user['allow_gid']; + $deny_cid = $a->user['deny_cid']; + $deny_gid = $a->user['deny_gid']; + } + + $poster = $a->contact; + + $uri = item_new_uri($a->get_hostname(),$uid); + + $action = sprintf( t('%1$s is currently %2$s'), '[url=' . $poster['url'] . ']' . $poster['name'] . '[/url]' , $verbs[$verb]); + + $arr = array(); + + $arr['uid'] = $uid; + $arr['uri'] = $uri; + $arr['parent-uri'] = (($parent_uri) ? $parent_uri : $uri); + $arr['type'] = 'activity'; + $arr['wall'] = 1; + $arr['contact-id'] = $poster['id']; + $arr['owner-name'] = $poster['name']; + $arr['owner-link'] = $poster['url']; + $arr['owner-avatar'] = $poster['thumb']; + $arr['author-name'] = $poster['name']; + $arr['author-link'] = $poster['url']; + $arr['author-avatar'] = $poster['thumb']; + $arr['title'] = ''; + $arr['allow_cid'] = $allow_cid; + $arr['allow_gid'] = $allow_gid; + $arr['deny_cid'] = $deny_cid; + $arr['deny_gid'] = $deny_gid; + $arr['last-child'] = 1; + $arr['visible'] = 1; + $arr['verb'] = $activity; + $arr['private'] = $private; + + $arr['origin'] = 1; + $arr['body'] = $action; + + $item_id = item_store($arr); + if($item_id) { + q("UPDATE `item` SET `plink` = '%s' WHERE `uid` = %d AND `id` = %d LIMIT 1", + dbesc($a->get_baseurl() . '/display/' . $poster['nickname'] . '/' . $item_id), + intval($uid), + intval($item_id) + ); + proc_run('php',"include/notifier.php","tag","$item_id"); + } + + + call_hooks('post_local_end', $arr); + + proc_run('php',"include/notifier.php","like","$post_id"); + + return; +} + + + +function mood_content(&$a) { + + if(! local_user()) { + notice( t('Permission denied.') . EOL); + return; + } + + $parent = ((x($_GET,'parent')) ? intval($_GET['parent']) : '0'); + + + + $verbs = get_mood_verbs(); + + $shortlist = array(); + foreach($verbs as $k => $v) + if($v !== 'NOTRANSLATION') + $shortlist[] = array($k,$v); + + + $tpl = get_markup_template('mood_content.tpl'); + + $o = replace_macros($tpl,array( + '$title' => t('Mood'), + '$desc' => t('Set your current mood and tell your friends'), + '$verbs' => $shortlist, + '$parent' => $parent, + '$submit' => t('Submit'), + )); + + return $o; + +} \ No newline at end of file diff --git a/mod/network.php b/mod/network.php index 17368ab92d..97f00eeda9 100644 --- a/mod/network.php +++ b/mod/network.php @@ -563,7 +563,7 @@ function network_content(&$a, $update = 0) { } else { - if(! get_pconfig(local_user(),'system','alt_pager')) { + if(! get_pconfig(local_user(),'system','alt_pager')) { $r = q("SELECT COUNT(*) AS `total` FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 @@ -576,10 +576,15 @@ function network_content(&$a, $update = 0) { if(count($r)) { $a->set_pager_total($r[0]['total']); } - } - $itemspage_network = get_pconfig(local_user(),'system','itemspage_network'); - $a->set_pager_itemspage(((intval($itemspage_network)) ? $itemspage_network : 40)); - $pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage'])); + } + + $itemspage_network = get_pconfig(local_user(),'system','itemspage_network'); + $itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 40); + if(($a->force_max_items > 0) && ($a->force_max_items < $itemspage_network)) + $itemspage_network = $a->force_max_items; + + $a->set_pager_itemspage($itemspage_network); + $pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage'])); } $simple_update = (($update) ? " and `item`.`unseen` = 1 " : ''); diff --git a/mod/newmember.php b/mod/newmember.php index a423d11b8f..e17a0db037 100644 --- a/mod/newmember.php +++ b/mod/newmember.php @@ -3,7 +3,7 @@ function newmember_content(&$a) { - $o = '

' . t('Welcome to Friendica') . '

'; + $o = '

' . t('Welcome to Friendica') . '

'; $o .= '

' . t('New Member Checklist') . '

'; @@ -11,39 +11,77 @@ function newmember_content(&$a) { $o .= t('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.'); + $o .= '

' . t('Getting Started') . '

'; + $o .= ''; - $o .= '
  • ' . '' . t('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.') . '
    • ' . EOL; + $o .= '

    ' . t('Settings') . '

    '; - $o .= '
  • ' . '' . t('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.') . '
    • ' . EOL; + $o .= '
      '; + + $o .= '
    • ' . '' . t('Go to Your Settings') . '
      ' . t('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.') . '
      • ' . EOL; + + $o .= '
    • ' . t('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.') . '
      • ' . EOL; + + $o .= '
    '; + + $o .= '

    ' . t('Profile') . '

    '; + + $o .= '
      '; + + $o .= '
    • ' . '' . t('Upload Profile Photo') . '
      ' . t('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.') . '
      • ' . EOL; + + $o .= '
    • ' . '' . t('Edit Your Profile') . '
      ' . t('Edit your default profile to your liking. Review the settings for hiding your list of friends and hiding the profile from unknown visitors.') . '
      • ' . EOL; + + $o .= '
    • ' . '' . t('Profile Keywords') . '
      ' . t('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.') . '
      • ' . EOL; + + $o .= '
    '; + + $o .= '

    ' . t('Connecting') . '

    '; + + $o .= ''; - $o .= '
  • ' . '' . t("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.") . '
    • ' . EOL; + $o .= '

    ' . t('Groups') . '

    '; - $o .= '
  • ' . '' . t('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.') . '
    • ' . EOL; + $o .= ''; + + $o .= '

    ' . t('Getting Help') . '

    '; + + $o .= ''; $o .= '
    '; diff --git a/mod/notes.php b/mod/notes.php index 625bbd2eef..afaa60f701 100644 --- a/mod/notes.php +++ b/mod/notes.php @@ -129,9 +129,13 @@ function notes_content(&$a,$update = false) { intval(local_user()), dbesc($parents_str) ); - } - $o .= conversation($a,$r,'notes',$update); + if(count($r)) { + $items = conv_sort($r,"`commented`"); + + $o .= conversation($a,$items,'notes',$update); + } + } $o .= paginate($a); diff --git a/mod/photos.php b/mod/photos.php index af40ea3037..fa2ddb3477 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -1324,6 +1324,7 @@ function photos_content(&$a) { '$comment' => t('Comment'), '$submit' => t('Submit'), '$preview' => t('Preview'), + '$sourceapp' => t($a->sourcename), '$ww' => '' )); } @@ -1363,6 +1364,7 @@ function photos_content(&$a) { '$myphoto' => $contact['thumb'], '$comment' => t('Comment'), '$submit' => t('Submit'), + '$sourceapp' => t($a->sourcename), '$ww' => '' )); } @@ -1394,6 +1396,7 @@ function photos_content(&$a) { '$myphoto' => $contact['thumb'], '$comment' => t('Comment'), '$submit' => t('Submit'), + '$sourceapp' => t($a->sourcename), '$ww' => '' )); } diff --git a/mod/poke.php b/mod/poke.php index 5cd88d7e2a..edcb27d021 100644 --- a/mod/poke.php +++ b/mod/poke.php @@ -73,7 +73,7 @@ function poke_init(&$a) { $poster = $a->contact; - $uri = item_new_uri($a->get_hostname(),$owner_uid); + $uri = item_new_uri($a->get_hostname(),$uid); $arr = array(); diff --git a/mod/profile.php b/mod/profile.php index a3e25b76a1..24cadef3b2 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -1,8 +1,9 @@ page,'aside')) $a->page['aside'] = ''; @@ -228,21 +229,27 @@ function profile_content(&$a, $update = 0) { $sql_extra2 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery2)))); } - if(! get_pconfig($a->profile['profile_uid'],'system','alt_pager')) { - $r = q("SELECT COUNT(*) AS `total` - FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` - WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 - and `item`.`moderated` = 0 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 - AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 1 - $sql_extra $sql_extra2 ", - intval($a->profile['profile_uid']) - ); + if(! get_pconfig($a->profile['profile_uid'],'system','alt_pager')) { + $r = q("SELECT COUNT(*) AS `total` + FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` + WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 + and `item`.`moderated` = 0 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 + AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 1 + $sql_extra $sql_extra2 ", + intval($a->profile['profile_uid']) + ); - if(count($r)) { - $a->set_pager_total($r[0]['total']); + if(count($r)) { + $a->set_pager_total($r[0]['total']); + } } - } - $a->set_pager_itemspage(40); + + $itemspage_network = get_pconfig(local_user(),'system','itemspage_network'); + $itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 40); + if(($a->force_max_items > 0) && ($a->force_max_items < $itemspage_network)) + $itemspage_network = $a->force_max_items; + + $a->set_pager_itemspage($itemspage_network); $pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage'])); diff --git a/mod/profiles.php b/mod/profiles.php index 975a8c2127..74844ff42e 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -48,10 +48,15 @@ function profiles_post(&$a) { $name = notags(trim($_POST['name'])); + if(! strlen($name)) { + $name = '[No Name]'; + } + if($orig[0]['name'] != $name) $namechanged = true; + $pdesc = notags(trim($_POST['pdesc'])); $gender = notags(trim($_POST['gender'])); $address = notags(trim($_POST['address'])); diff --git a/mod/settings.php b/mod/settings.php index b8cf95e9c7..c0244e6975 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -755,7 +755,7 @@ function settings_content(&$a) { '$theme' => array('theme', t('Display Theme:'), $theme_selected, '', $themes), '$ajaxint' => array('browser_update', t("Update browser every xx seconds"), $browser_update, t('Minimum of 10 seconds, no maximum')), - '$itemspage_network' => array('itemspage_network', t("Number of items to display on the network page:"), $itemspage_network, t('Maximum of 100 items')), + '$itemspage_network' => array('itemspage_network', t("Number of items to display per page:"), $itemspage_network, t('Maximum of 100 items')), '$nosmile' => array('nosmile', t("Don't show emoticons"), $nosmile, ''), '$theme_config' => $theme_config, diff --git a/util/messages.po b/util/messages.po index d48b506d17..f8594b3a37 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.0.1421\n" +"Project-Id-Version: 3.0.1449\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-07-31 10:00-0700\n" +"POT-Creation-Date: 2012-08-28 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -37,7 +37,7 @@ msgstr "" #: ../../mod/crepair.php:115 ../../mod/wall_attach.php:44 #: ../../mod/fsuggest.php:78 ../../mod/events.php:140 ../../mod/api.php:26 #: ../../mod/api.php:31 ../../mod/photos.php:116 ../../mod/photos.php:938 -#: ../../mod/editpost.php:10 ../../mod/install.php:151 ../../mod/poke.php:109 +#: ../../mod/editpost.php:10 ../../mod/install.php:151 ../../mod/poke.php:135 #: ../../mod/notifications.php:66 ../../mod/contacts.php:139 #: ../../mod/settings.php:86 ../../mod/settings.php:519 #: ../../mod/settings.php:524 ../../mod/manage.php:86 ../../mod/network.php:6 @@ -45,18 +45,20 @@ msgstr "" #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33 #: ../../mod/group.php:19 ../../mod/viewcontacts.php:22 -#: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:125 -#: ../../mod/item.php:141 ../../mod/profile_photo.php:19 -#: ../../mod/profile_photo.php:142 ../../mod/profile_photo.php:153 -#: ../../mod/profile_photo.php:166 ../../mod/message.php:38 -#: ../../mod/message.php:168 ../../mod/allfriends.php:9 -#: ../../mod/nogroup.php:25 ../../mod/wall_upload.php:53 -#: ../../mod/follow.php:9 ../../mod/display.php:138 ../../mod/profiles.php:7 -#: ../../mod/profiles.php:408 ../../mod/delegate.php:6 +#: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:126 +#: ../../mod/item.php:142 ../../mod/mood.php:114 +#: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:142 +#: ../../mod/profile_photo.php:153 ../../mod/profile_photo.php:166 +#: ../../mod/message.php:38 ../../mod/message.php:168 +#: ../../mod/allfriends.php:9 ../../mod/nogroup.php:25 +#: ../../mod/wall_upload.php:53 ../../mod/follow.php:9 +#: ../../mod/display.php:131 ../../mod/profiles.php:7 +#: ../../mod/profiles.php:413 ../../mod/delegate.php:6 #: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510 -#: ../../addon/facebook/facebook.php:516 ../../addon/dav/layout.fnk.php:354 -#: ../../include/items.php:3813 ../../index.php:315 +#: ../../addon/facebook/facebook.php:516 +#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3819 +#: ../../index.php:315 msgid "Permission denied." msgstr "" @@ -86,7 +88,7 @@ msgid "Return to contact editor" msgstr "" #: ../../mod/crepair.php:148 ../../mod/settings.php:539 -#: ../../mod/settings.php:565 ../../mod/admin.php:664 ../../mod/admin.php:673 +#: ../../mod/settings.php:565 ../../mod/admin.php:679 ../../mod/admin.php:688 msgid "Name" msgstr "" @@ -125,16 +127,16 @@ msgstr "" #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107 #: ../../mod/events.php:439 ../../mod/photos.php:971 ../../mod/photos.php:1042 #: ../../mod/photos.php:1285 ../../mod/photos.php:1325 -#: ../../mod/photos.php:1365 ../../mod/photos.php:1396 +#: ../../mod/photos.php:1366 ../../mod/photos.php:1398 #: ../../mod/install.php:246 ../../mod/install.php:284 -#: ../../mod/localtime.php:45 ../../mod/poke.php:169 ../../mod/content.php:691 +#: ../../mod/localtime.php:45 ../../mod/poke.php:199 ../../mod/content.php:691 #: ../../mod/contacts.php:341 ../../mod/settings.php:537 #: ../../mod/settings.php:691 ../../mod/settings.php:752 -#: ../../mod/settings.php:958 ../../mod/group.php:85 ../../mod/message.php:294 -#: ../../mod/message.php:478 ../../mod/admin.php:422 ../../mod/admin.php:661 -#: ../../mod/admin.php:797 ../../mod/admin.php:996 ../../mod/admin.php:1083 -#: ../../mod/profiles.php:578 ../../mod/invite.php:119 -#: ../../addon/fromgplus/fromgplus.php:40 +#: ../../mod/settings.php:958 ../../mod/group.php:85 ../../mod/mood.php:137 +#: ../../mod/message.php:294 ../../mod/message.php:478 ../../mod/admin.php:435 +#: ../../mod/admin.php:676 ../../mod/admin.php:812 ../../mod/admin.php:1011 +#: ../../mod/admin.php:1098 ../../mod/profiles.php:583 +#: ../../mod/invite.php:119 ../../addon/fromgplus/fromgplus.php:40 #: ../../addon/facebook/facebook.php:619 #: ../../addon/snautofollow/snautofollow.php:64 ../../addon/bg/bg.php:90 #: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:93 @@ -172,7 +174,7 @@ msgstr "" #: ../../view/theme/diabook/theme.php:757 #: ../../view/theme/diabook/config.php:190 #: ../../view/theme/quattro/config.php:52 ../../view/theme/dispy/config.php:70 -#: ../../include/conversation.php:696 +#: ../../include/conversation.php:560 msgid "Submit" msgstr "" @@ -180,7 +182,7 @@ msgstr "" msgid "Help:" msgstr "" -#: ../../mod/help.php:34 ../../addon/dav/layout.fnk.php:225 +#: ../../mod/help.php:34 ../../addon/dav/friendica/layout.fnk.php:225 #: ../../include/nav.php:86 msgid "Help" msgstr "" @@ -227,12 +229,12 @@ msgstr "" msgid "Edit event" msgstr "" -#: ../../mod/events.php:307 ../../include/text.php:1110 +#: ../../mod/events.php:307 ../../include/text.php:1147 msgid "link to source" msgstr "" #: ../../mod/events.php:331 ../../view/theme/diabook/theme.php:131 -#: ../../include/nav.php:52 ../../boot.php:1634 +#: ../../include/nav.php:52 ../../boot.php:1659 msgid "Events" msgstr "" @@ -240,12 +242,12 @@ msgstr "" msgid "Create New Event" msgstr "" -#: ../../mod/events.php:333 ../../addon/dav/layout.fnk.php:263 +#: ../../mod/events.php:333 ../../addon/dav/friendica/layout.fnk.php:263 msgid "Previous" msgstr "" #: ../../mod/events.php:334 ../../mod/install.php:205 -#: ../../addon/dav/layout.fnk.php:266 +#: ../../addon/dav/friendica/layout.fnk.php:266 msgid "Next" msgstr "" @@ -287,8 +289,8 @@ msgid "Description:" msgstr "" #: ../../mod/events.php:432 ../../mod/directory.php:132 -#: ../../include/event.php:40 ../../include/bb2diaspora.php:447 -#: ../../boot.php:1186 +#: ../../include/event.php:40 ../../include/bb2diaspora.php:455 +#: ../../boot.php:1208 msgid "Location:" msgstr "" @@ -354,7 +356,7 @@ msgstr "" #: ../../mod/settings.php:945 ../../mod/settings.php:946 #: ../../mod/settings.php:947 ../../mod/settings.php:948 #: ../../mod/settings.php:949 ../../mod/register.php:234 -#: ../../mod/profiles.php:558 +#: ../../mod/profiles.php:563 msgid "Yes" msgstr "" @@ -366,23 +368,23 @@ msgstr "" #: ../../mod/settings.php:945 ../../mod/settings.php:946 #: ../../mod/settings.php:947 ../../mod/settings.php:948 #: ../../mod/settings.php:949 ../../mod/register.php:235 -#: ../../mod/profiles.php:559 +#: ../../mod/profiles.php:564 msgid "No" msgstr "" -#: ../../mod/photos.php:46 ../../boot.php:1627 +#: ../../mod/photos.php:46 ../../boot.php:1652 msgid "Photo Albums" msgstr "" #: ../../mod/photos.php:54 ../../mod/photos.php:137 ../../mod/photos.php:952 #: ../../mod/photos.php:1034 ../../mod/photos.php:1049 -#: ../../mod/photos.php:1474 ../../mod/photos.php:1486 +#: ../../mod/photos.php:1477 ../../mod/photos.php:1489 #: ../../addon/communityhome/communityhome.php:110 #: ../../view/theme/diabook/theme.php:598 msgid "Contact Photos" msgstr "" -#: ../../mod/photos.php:61 ../../mod/photos.php:1059 ../../mod/photos.php:1524 +#: ../../mod/photos.php:61 ../../mod/photos.php:1059 ../../mod/photos.php:1527 msgid "Upload New Photos" msgstr "" @@ -423,9 +425,9 @@ msgstr "" #: ../../mod/photos.php:572 ../../mod/like.php:145 ../../mod/tagger.php:70 #: ../../addon/communityhome/communityhome.php:163 -#: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1362 -#: ../../include/diaspora.php:1793 ../../include/conversation.php:114 -#: ../../include/conversation.php:230 +#: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1399 +#: ../../include/diaspora.php:1824 ../../include/conversation.php:114 +#: ../../include/conversation.php:244 msgid "photo" msgstr "" @@ -499,7 +501,7 @@ msgstr "" msgid "Edit Album" msgstr "" -#: ../../mod/photos.php:1077 ../../mod/photos.php:1507 +#: ../../mod/photos.php:1077 ../../mod/photos.php:1510 msgid "View Photo" msgstr "" @@ -524,7 +526,7 @@ msgid "Use as profile photo" msgstr "" #: ../../mod/photos.php:1171 ../../mod/content.php:601 -#: ../../include/conversation.php:606 +#: ../../include/conversation.php:395 msgid "Private Message" msgstr "" @@ -565,57 +567,57 @@ msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "" #: ../../mod/photos.php:1303 ../../mod/content.php:665 -#: ../../include/conversation.php:670 +#: ../../include/conversation.php:534 msgid "I like this (toggle)" msgstr "" #: ../../mod/photos.php:1304 ../../mod/content.php:666 -#: ../../include/conversation.php:671 +#: ../../include/conversation.php:535 msgid "I don't like this (toggle)" msgstr "" -#: ../../mod/photos.php:1305 ../../include/conversation.php:1128 +#: ../../mod/photos.php:1305 ../../include/conversation.php:1164 msgid "Share" msgstr "" #: ../../mod/photos.php:1306 ../../mod/editpost.php:112 -#: ../../mod/content.php:482 ../../mod/content.php:842 +#: ../../mod/content.php:482 ../../mod/content.php:843 #: ../../mod/wallmessage.php:152 ../../mod/message.php:293 -#: ../../mod/message.php:479 ../../include/conversation.php:487 -#: ../../include/conversation.php:847 ../../include/conversation.php:1147 +#: ../../mod/message.php:479 ../../include/conversation.php:628 +#: ../../include/conversation.php:860 ../../include/conversation.php:1183 msgid "Please wait" msgstr "" -#: ../../mod/photos.php:1322 ../../mod/photos.php:1362 -#: ../../mod/photos.php:1393 ../../mod/content.php:688 -#: ../../include/conversation.php:693 +#: ../../mod/photos.php:1322 ../../mod/photos.php:1363 +#: ../../mod/photos.php:1395 ../../mod/content.php:688 +#: ../../include/conversation.php:557 msgid "This is you" msgstr "" -#: ../../mod/photos.php:1324 ../../mod/photos.php:1364 -#: ../../mod/photos.php:1395 ../../mod/content.php:690 -#: ../../include/conversation.php:695 ../../boot.php:569 +#: ../../mod/photos.php:1324 ../../mod/photos.php:1365 +#: ../../mod/photos.php:1397 ../../mod/content.php:690 +#: ../../include/conversation.php:559 ../../boot.php:583 msgid "Comment" msgstr "" #: ../../mod/photos.php:1326 ../../mod/editpost.php:133 -#: ../../mod/content.php:700 ../../include/conversation.php:705 -#: ../../include/conversation.php:1165 +#: ../../mod/content.php:700 ../../include/conversation.php:569 +#: ../../include/conversation.php:1201 msgid "Preview" msgstr "" -#: ../../mod/photos.php:1423 ../../mod/content.php:439 -#: ../../mod/content.php:720 ../../mod/settings.php:600 -#: ../../mod/settings.php:689 ../../mod/group.php:168 ../../mod/admin.php:668 -#: ../../include/conversation.php:444 ../../include/conversation.php:725 +#: ../../mod/photos.php:1426 ../../mod/content.php:439 +#: ../../mod/content.php:721 ../../mod/settings.php:600 +#: ../../mod/settings.php:689 ../../mod/group.php:168 ../../mod/admin.php:683 +#: ../../include/conversation.php:409 ../../include/conversation.php:816 msgid "Delete" msgstr "" -#: ../../mod/photos.php:1513 +#: ../../mod/photos.php:1516 msgid "View Album" msgstr "" -#: ../../mod/photos.php:1522 +#: ../../mod/photos.php:1525 msgid "Recent Photos" msgstr "" @@ -673,28 +675,28 @@ msgstr "" msgid "Edit post" msgstr "" -#: ../../mod/editpost.php:88 ../../include/conversation.php:1114 +#: ../../mod/editpost.php:88 ../../include/conversation.php:1150 msgid "Post to Email" msgstr "" -#: ../../mod/editpost.php:103 ../../mod/content.php:707 -#: ../../mod/settings.php:599 ../../include/conversation.php:712 +#: ../../mod/editpost.php:103 ../../mod/content.php:708 +#: ../../mod/settings.php:599 ../../include/conversation.php:400 msgid "Edit" msgstr "" #: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150 #: ../../mod/message.php:291 ../../mod/message.php:476 -#: ../../include/conversation.php:1129 +#: ../../include/conversation.php:1165 msgid "Upload photo" msgstr "" -#: ../../mod/editpost.php:105 ../../include/conversation.php:1131 +#: ../../mod/editpost.php:105 ../../include/conversation.php:1167 msgid "Attach file" msgstr "" #: ../../mod/editpost.php:106 ../../mod/wallmessage.php:151 #: ../../mod/message.php:292 ../../mod/message.php:477 -#: ../../include/conversation.php:1133 +#: ../../include/conversation.php:1169 msgid "Insert web link" msgstr "" @@ -710,42 +712,38 @@ msgstr "" msgid "Insert Vorbis [.ogg] audio" msgstr "" -#: ../../mod/editpost.php:110 ../../include/conversation.php:1139 +#: ../../mod/editpost.php:110 ../../include/conversation.php:1175 msgid "Set your location" msgstr "" -#: ../../mod/editpost.php:111 ../../include/conversation.php:1141 +#: ../../mod/editpost.php:111 ../../include/conversation.php:1177 msgid "Clear browser location" msgstr "" -#: ../../mod/editpost.php:113 ../../include/conversation.php:1148 +#: ../../mod/editpost.php:113 ../../include/conversation.php:1184 msgid "Permission settings" msgstr "" -#: ../../mod/editpost.php:121 ../../include/conversation.php:1157 +#: ../../mod/editpost.php:121 ../../include/conversation.php:1193 msgid "CC: email addresses" msgstr "" -#: ../../mod/editpost.php:122 ../../include/conversation.php:1158 +#: ../../mod/editpost.php:122 ../../include/conversation.php:1194 msgid "Public post" msgstr "" -#: ../../mod/editpost.php:125 ../../include/conversation.php:1144 +#: ../../mod/editpost.php:125 ../../include/conversation.php:1180 msgid "Set title" msgstr "" -#: ../../mod/editpost.php:127 ../../include/conversation.php:1146 +#: ../../mod/editpost.php:127 ../../include/conversation.php:1182 msgid "Categories (comma-separated list)" msgstr "" -#: ../../mod/editpost.php:128 ../../include/conversation.php:1160 +#: ../../mod/editpost.php:128 ../../include/conversation.php:1196 msgid "Example: bob@example.com, mary@example.com" msgstr "" -#: ../../mod/editpost.php:135 ../../include/conversation.php:1166 -msgid "Friendica mobile web" -msgstr "" - #: ../../mod/dfrn_request.php:93 msgid "This introduction has already been accepted." msgstr "" @@ -863,7 +861,7 @@ msgstr "" msgid "Confirm" msgstr "" -#: ../../mod/dfrn_request.php:715 ../../include/items.php:3204 +#: ../../mod/dfrn_request.php:715 ../../include/items.php:3210 msgid "[Name Withheld]" msgstr "" @@ -1189,7 +1187,7 @@ msgid "" msgstr "" #: ../../mod/localtime.php:12 ../../include/event.php:11 -#: ../../include/bb2diaspora.php:425 +#: ../../include/bb2diaspora.php:433 msgid "l F d, Y \\@ g:i A" msgstr "" @@ -1222,23 +1220,23 @@ msgstr "" msgid "Please select your timezone:" msgstr "" -#: ../../mod/poke.php:163 +#: ../../mod/poke.php:192 msgid "Poke/Prod" msgstr "" -#: ../../mod/poke.php:164 +#: ../../mod/poke.php:193 msgid "poke, prod or do other things to somebody" msgstr "" -#: ../../mod/poke.php:165 +#: ../../mod/poke.php:194 msgid "Recipient" msgstr "" -#: ../../mod/poke.php:166 +#: ../../mod/poke.php:195 msgid "Choose what you wish to do to recipient" msgstr "" -#: ../../mod/poke.php:168 +#: ../../mod/poke.php:198 msgid "Make this post private" msgstr "" @@ -1255,7 +1253,7 @@ msgid "is interested in:" msgstr "" #: ../../mod/match.php:58 ../../mod/suggest.php:59 -#: ../../include/contact_widgets.php:9 ../../boot.php:1130 +#: ../../include/contact_widgets.php:9 ../../boot.php:1152 msgid "Connect" msgstr "" @@ -1283,29 +1281,29 @@ msgstr "" msgid "Group: " msgstr "" -#: ../../mod/content.php:438 ../../mod/content.php:719 -#: ../../include/conversation.php:443 ../../include/conversation.php:724 +#: ../../mod/content.php:438 ../../mod/content.php:720 +#: ../../include/conversation.php:408 ../../include/conversation.php:815 msgid "Select" msgstr "" -#: ../../mod/content.php:455 ../../mod/content.php:812 -#: ../../mod/content.php:813 ../../include/conversation.php:460 -#: ../../include/conversation.php:817 ../../include/conversation.php:818 +#: ../../mod/content.php:455 ../../mod/content.php:813 +#: ../../mod/content.php:814 ../../include/conversation.php:596 +#: ../../include/conversation.php:597 ../../include/conversation.php:832 #, php-format msgid "View %s's profile @ %s" msgstr "" -#: ../../mod/content.php:465 ../../mod/content.php:824 -#: ../../include/conversation.php:470 ../../include/conversation.php:829 +#: ../../mod/content.php:465 ../../mod/content.php:825 +#: ../../include/conversation.php:610 ../../include/conversation.php:843 #, php-format msgid "%s from %s" msgstr "" -#: ../../mod/content.php:480 ../../include/conversation.php:485 +#: ../../mod/content.php:480 ../../include/conversation.php:858 msgid "View in context" msgstr "" -#: ../../mod/content.php:586 ../../include/conversation.php:591 +#: ../../mod/content.php:586 ../../include/conversation.php:637 #, php-format msgid "%d comment" msgid_plural "%d comments" @@ -1314,92 +1312,92 @@ msgstr[1] "" #: ../../mod/content.php:587 ../../addon/page/page.php:76 #: ../../addon/page/page.php:110 ../../addon/showmore/showmore.php:119 -#: ../../include/contact_widgets.php:188 ../../include/conversation.php:592 -#: ../../boot.php:570 +#: ../../include/contact_widgets.php:188 ../../include/conversation.php:638 +#: ../../boot.php:584 msgid "show more" msgstr "" -#: ../../mod/content.php:665 ../../include/conversation.php:670 +#: ../../mod/content.php:665 ../../include/conversation.php:534 msgid "like" msgstr "" -#: ../../mod/content.php:666 ../../include/conversation.php:671 +#: ../../mod/content.php:666 ../../include/conversation.php:535 msgid "dislike" msgstr "" -#: ../../mod/content.php:668 ../../include/conversation.php:673 +#: ../../mod/content.php:668 ../../include/conversation.php:537 msgid "Share this" msgstr "" -#: ../../mod/content.php:668 ../../include/conversation.php:673 +#: ../../mod/content.php:668 ../../include/conversation.php:537 msgid "share" msgstr "" -#: ../../mod/content.php:692 ../../include/conversation.php:697 +#: ../../mod/content.php:692 ../../include/conversation.php:561 msgid "Bold" msgstr "" -#: ../../mod/content.php:693 ../../include/conversation.php:698 +#: ../../mod/content.php:693 ../../include/conversation.php:562 msgid "Italic" msgstr "" -#: ../../mod/content.php:694 ../../include/conversation.php:699 +#: ../../mod/content.php:694 ../../include/conversation.php:563 msgid "Underline" msgstr "" -#: ../../mod/content.php:695 ../../include/conversation.php:700 +#: ../../mod/content.php:695 ../../include/conversation.php:564 msgid "Quote" msgstr "" -#: ../../mod/content.php:696 ../../include/conversation.php:701 +#: ../../mod/content.php:696 ../../include/conversation.php:565 msgid "Code" msgstr "" -#: ../../mod/content.php:697 ../../include/conversation.php:702 +#: ../../mod/content.php:697 ../../include/conversation.php:566 msgid "Image" msgstr "" -#: ../../mod/content.php:698 ../../include/conversation.php:703 +#: ../../mod/content.php:698 ../../include/conversation.php:567 msgid "Link" msgstr "" -#: ../../mod/content.php:699 ../../include/conversation.php:704 +#: ../../mod/content.php:699 ../../include/conversation.php:568 msgid "Video" msgstr "" -#: ../../mod/content.php:732 ../../include/conversation.php:737 +#: ../../mod/content.php:733 ../../include/conversation.php:498 msgid "add star" msgstr "" -#: ../../mod/content.php:733 ../../include/conversation.php:738 +#: ../../mod/content.php:734 ../../include/conversation.php:499 msgid "remove star" msgstr "" -#: ../../mod/content.php:734 ../../include/conversation.php:739 +#: ../../mod/content.php:735 ../../include/conversation.php:500 msgid "toggle star status" msgstr "" -#: ../../mod/content.php:737 ../../include/conversation.php:742 +#: ../../mod/content.php:738 ../../include/conversation.php:503 msgid "starred" msgstr "" -#: ../../mod/content.php:738 ../../include/conversation.php:743 +#: ../../mod/content.php:739 ../../include/conversation.php:504 msgid "add tag" msgstr "" -#: ../../mod/content.php:742 ../../include/conversation.php:747 +#: ../../mod/content.php:743 ../../include/conversation.php:412 msgid "save to folder" msgstr "" -#: ../../mod/content.php:814 ../../include/conversation.php:819 +#: ../../mod/content.php:815 ../../include/conversation.php:598 msgid "to" msgstr "" -#: ../../mod/content.php:815 ../../include/conversation.php:820 +#: ../../mod/content.php:816 ../../include/conversation.php:599 msgid "Wall-to-Wall" msgstr "" -#: ../../mod/content.php:816 ../../include/conversation.php:821 +#: ../../mod/content.php:817 ../../include/conversation.php:600 msgid "via Wall-To-Wall:" msgstr "" @@ -1484,7 +1482,7 @@ msgid "if applicable" msgstr "" #: ../../mod/notifications.php:157 ../../mod/notifications.php:204 -#: ../../mod/admin.php:666 +#: ../../mod/admin.php:681 msgid "Approve" msgstr "" @@ -1685,12 +1683,12 @@ msgid "View all contacts" msgstr "" #: ../../mod/contacts.php:308 ../../mod/contacts.php:367 -#: ../../mod/admin.php:670 +#: ../../mod/admin.php:685 msgid "Unblock" msgstr "" #: ../../mod/contacts.php:308 ../../mod/contacts.php:367 -#: ../../mod/admin.php:669 +#: ../../mod/admin.php:684 msgid "Block" msgstr "" @@ -1787,7 +1785,7 @@ msgstr "" msgid "Update public posts" msgstr "" -#: ../../mod/contacts.php:364 ../../mod/admin.php:1141 +#: ../../mod/contacts.php:364 ../../mod/admin.php:1156 msgid "Update now" msgstr "" @@ -1917,8 +1915,8 @@ msgstr "" #: ../../addon/facebook/facebook.php:702 #: ../../addon/facebook/facebook.php:1200 #: ../../addon/public_server/public_server.php:62 -#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3213 -#: ../../boot.php:779 +#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3219 +#: ../../boot.php:797 msgid "Administrator" msgstr "" @@ -1928,7 +1926,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:83 ../../boot.php:912 +#: ../../mod/lostpass.php:83 ../../boot.php:934 msgid "Password Reset" msgstr "" @@ -2000,9 +1998,9 @@ msgstr "" msgid "Remove account" msgstr "" -#: ../../mod/settings.php:69 ../../mod/admin.php:756 ../../mod/admin.php:961 -#: ../../addon/dav/layout.fnk.php:225 ../../addon/mathjax/mathjax.php:36 -#: ../../view/theme/diabook/theme.php:643 +#: ../../mod/settings.php:69 ../../mod/admin.php:771 ../../mod/admin.php:976 +#: ../../addon/dav/friendica/layout.fnk.php:225 +#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:643 #: ../../view/theme/diabook/theme.php:773 ../../include/nav.php:137 msgid "Settings" msgstr "" @@ -2596,15 +2594,15 @@ msgstr "" msgid "Invalid contact." msgstr "" -#: ../../mod/notes.php:44 ../../boot.php:1641 +#: ../../mod/notes.php:44 ../../boot.php:1666 msgid "Personal Notes" msgstr "" #: ../../mod/notes.php:63 ../../mod/filer.php:30 #: ../../addon/facebook/facebook.php:770 -#: ../../addon/privacy_image_cache/privacy_image_cache.php:236 -#: ../../addon/dav/layout.fnk.php:441 ../../addon/dav/layout.fnk.php:488 -#: ../../include/text.php:677 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:263 +#: ../../addon/dav/friendica/layout.fnk.php:441 +#: ../../addon/dav/friendica/layout.fnk.php:488 ../../include/text.php:681 msgid "Save" msgstr "" @@ -2639,7 +2637,7 @@ msgstr "" #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131 #: ../../mod/message.php:242 ../../mod/message.php:250 -#: ../../include/conversation.php:1065 ../../include/conversation.php:1082 +#: ../../include/conversation.php:1101 ../../include/conversation.php:1118 msgid "Please enter a link URL:" msgstr "" @@ -2688,8 +2686,8 @@ msgstr "" #: ../../mod/newmember.php:16 msgid "" "On your Quick Start page - find a brief introduction to your " -"profile and network tabs, connect to Facebook, make some new connections, " -"and find some groups to join." +"profile and network tabs, make some new connections, and find some groups to " +"join." msgstr "" #: ../../mod/newmember.php:18 @@ -2849,7 +2847,7 @@ msgstr "" #: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:128 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:84 -#: ../../include/nav.php:50 ../../boot.php:1617 +#: ../../include/nav.php:50 ../../boot.php:1642 msgid "Profile" msgstr "" @@ -2865,7 +2863,7 @@ msgstr "" msgid "No contacts." msgstr "" -#: ../../mod/viewcontacts.php:76 ../../include/text.php:614 +#: ../../mod/viewcontacts.php:76 ../../include/text.php:618 msgid "View Contacts" msgstr "" @@ -2930,7 +2928,7 @@ msgstr "" msgid "Your invitation ID: " msgstr "" -#: ../../mod/register.php:255 ../../mod/admin.php:423 +#: ../../mod/register.php:255 ../../mod/admin.php:436 msgid "Registration" msgstr "" @@ -2953,7 +2951,7 @@ msgstr "" msgid "Choose a nickname: " msgstr "" -#: ../../mod/register.php:269 ../../include/nav.php:81 ../../boot.php:878 +#: ../../mod/register.php:269 ../../include/nav.php:81 ../../boot.php:896 msgid "Register" msgstr "" @@ -2966,15 +2964,15 @@ msgstr "" #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 #: ../../view/theme/diabook/theme.php:565 -#: ../../view/theme/diabook/theme.php:574 ../../include/diaspora.php:1793 +#: ../../view/theme/diabook/theme.php:574 ../../include/diaspora.php:1824 #: ../../include/conversation.php:109 ../../include/conversation.php:118 -#: ../../include/conversation.php:225 ../../include/conversation.php:234 +#: ../../include/conversation.php:239 ../../include/conversation.php:248 msgid "status" msgstr "" #: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1598 #: ../../addon/communityhome/communityhome.php:172 -#: ../../view/theme/diabook/theme.php:579 ../../include/diaspora.php:1809 +#: ../../view/theme/diabook/theme.php:579 ../../include/diaspora.php:1840 #: ../../include/conversation.php:126 #, php-format msgid "%1$s likes %2$s's %3$s" @@ -2986,8 +2984,8 @@ msgid "%1$s doesn't like %2$s's %3$s" msgstr "" #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159 -#: ../../mod/admin.php:705 ../../mod/admin.php:904 ../../mod/display.php:37 -#: ../../mod/display.php:142 ../../include/items.php:3692 +#: ../../mod/admin.php:720 ../../mod/admin.php:919 ../../mod/display.php:29 +#: ../../mod/display.php:135 ../../include/items.php:3697 msgid "Item not found." msgstr "" @@ -2996,7 +2994,7 @@ msgid "Access denied." msgstr "" #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:130 -#: ../../include/nav.php:51 ../../boot.php:1624 +#: ../../include/nav.php:51 ../../boot.php:1649 msgid "Photos" msgstr "" @@ -3017,46 +3015,59 @@ msgstr "" msgid "Please login." msgstr "" -#: ../../mod/item.php:90 +#: ../../mod/item.php:91 msgid "Unable to locate original post." msgstr "" -#: ../../mod/item.php:274 +#: ../../mod/item.php:275 msgid "Empty post discarded." msgstr "" -#: ../../mod/item.php:395 ../../mod/wall_upload.php:122 +#: ../../mod/item.php:396 ../../mod/wall_upload.php:122 #: ../../mod/wall_upload.php:131 ../../mod/wall_upload.php:138 #: ../../include/message.php:144 msgid "Wall Photos" msgstr "" -#: ../../mod/item.php:800 +#: ../../mod/item.php:809 msgid "System error. Post not saved." msgstr "" -#: ../../mod/item.php:825 +#: ../../mod/item.php:834 #, php-format msgid "" "This message was sent to you by %s, a member of the Friendica social network." msgstr "" -#: ../../mod/item.php:827 +#: ../../mod/item.php:836 #, php-format msgid "You may visit them online at %s" msgstr "" -#: ../../mod/item.php:828 +#: ../../mod/item.php:837 msgid "" "Please contact the sender by replying to this post if you do not wish to " "receive these messages." msgstr "" -#: ../../mod/item.php:830 +#: ../../mod/item.php:839 #, php-format msgid "%s posted an update." msgstr "" +#: ../../mod/mood.php:62 ../../include/conversation.php:217 +#, php-format +msgid "%1$s is currently %2$s" +msgstr "" + +#: ../../mod/mood.php:133 +msgid "Mood" +msgstr "" + +#: ../../mod/mood.php:134 +msgid "Set your current mood and tell your friends" +msgstr "" + #: ../../mod/profile_photo.php:30 msgid "Image uploaded but image cropping failed." msgstr "" @@ -3090,7 +3101,8 @@ msgstr "" msgid "Upload Profile Photo" msgstr "" -#: ../../mod/profile_photo.php:212 ../../addon/dav/layout.fnk.php:152 +#: ../../mod/profile_photo.php:212 +#: ../../addon/dav/friendica/layout.fnk.php:152 msgid "Upload" msgstr "" @@ -3217,19 +3229,19 @@ msgstr "" msgid "Theme settings updated." msgstr "" -#: ../../mod/admin.php:96 ../../mod/admin.php:421 +#: ../../mod/admin.php:96 ../../mod/admin.php:434 msgid "Site" msgstr "" -#: ../../mod/admin.php:97 ../../mod/admin.php:660 ../../mod/admin.php:672 +#: ../../mod/admin.php:97 ../../mod/admin.php:675 ../../mod/admin.php:687 msgid "Users" msgstr "" -#: ../../mod/admin.php:98 ../../mod/admin.php:754 ../../mod/admin.php:796 +#: ../../mod/admin.php:98 ../../mod/admin.php:769 ../../mod/admin.php:811 msgid "Plugins" msgstr "" -#: ../../mod/admin.php:99 ../../mod/admin.php:959 ../../mod/admin.php:995 +#: ../../mod/admin.php:99 ../../mod/admin.php:974 ../../mod/admin.php:1010 msgid "Themes" msgstr "" @@ -3237,7 +3249,7 @@ msgstr "" msgid "DB updates" msgstr "" -#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1082 +#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1097 msgid "Logs" msgstr "" @@ -3253,19 +3265,19 @@ msgstr "" msgid "User registrations waiting for confirmation" msgstr "" -#: ../../mod/admin.php:183 ../../mod/admin.php:642 +#: ../../mod/admin.php:183 ../../mod/admin.php:657 msgid "Normal Account" msgstr "" -#: ../../mod/admin.php:184 ../../mod/admin.php:643 +#: ../../mod/admin.php:184 ../../mod/admin.php:658 msgid "Soapbox Account" msgstr "" -#: ../../mod/admin.php:185 ../../mod/admin.php:644 +#: ../../mod/admin.php:185 ../../mod/admin.php:659 msgid "Community/Celebrity Account" msgstr "" -#: ../../mod/admin.php:186 ../../mod/admin.php:645 +#: ../../mod/admin.php:186 ../../mod/admin.php:660 msgid "Automatic Friend Account" msgstr "" @@ -3281,9 +3293,9 @@ msgstr "" msgid "Message queues" msgstr "" -#: ../../mod/admin.php:212 ../../mod/admin.php:420 ../../mod/admin.php:659 -#: ../../mod/admin.php:753 ../../mod/admin.php:795 ../../mod/admin.php:958 -#: ../../mod/admin.php:994 ../../mod/admin.php:1081 +#: ../../mod/admin.php:212 ../../mod/admin.php:433 ../../mod/admin.php:674 +#: ../../mod/admin.php:768 ../../mod/admin.php:810 ../../mod/admin.php:973 +#: ../../mod/admin.php:1009 ../../mod/admin.php:1096 msgid "Administration" msgstr "" @@ -3307,515 +3319,535 @@ msgstr "" msgid "Active plugins" msgstr "" -#: ../../mod/admin.php:359 +#: ../../mod/admin.php:367 msgid "Site settings updated." msgstr "" -#: ../../mod/admin.php:407 +#: ../../mod/admin.php:396 +msgid "Don't apply a special theme for mobile devices." +msgstr "" + +#: ../../mod/admin.php:420 msgid "Closed" msgstr "" -#: ../../mod/admin.php:408 +#: ../../mod/admin.php:421 msgid "Requires approval" msgstr "" -#: ../../mod/admin.php:409 +#: ../../mod/admin.php:422 msgid "Open" msgstr "" -#: ../../mod/admin.php:413 +#: ../../mod/admin.php:426 msgid "No SSL policy, links will track page SSL state" msgstr "" -#: ../../mod/admin.php:414 +#: ../../mod/admin.php:427 msgid "Force all links to use SSL" msgstr "" -#: ../../mod/admin.php:415 +#: ../../mod/admin.php:428 msgid "Self-signed certificate, use SSL for local links only (discouraged)" msgstr "" -#: ../../mod/admin.php:424 +#: ../../mod/admin.php:437 msgid "File upload" msgstr "" -#: ../../mod/admin.php:425 +#: ../../mod/admin.php:438 msgid "Policies" msgstr "" -#: ../../mod/admin.php:426 +#: ../../mod/admin.php:439 msgid "Advanced" msgstr "" -#: ../../mod/admin.php:430 ../../addon/statusnet/statusnet.php:567 +#: ../../mod/admin.php:443 ../../addon/statusnet/statusnet.php:567 msgid "Site name" msgstr "" -#: ../../mod/admin.php:431 +#: ../../mod/admin.php:444 msgid "Banner/Logo" msgstr "" -#: ../../mod/admin.php:432 +#: ../../mod/admin.php:445 msgid "System language" msgstr "" -#: ../../mod/admin.php:433 +#: ../../mod/admin.php:446 msgid "System theme" msgstr "" -#: ../../mod/admin.php:433 +#: ../../mod/admin.php:446 msgid "" "Default system theme - may be over-ridden by user profiles - change theme settings" msgstr "" -#: ../../mod/admin.php:434 +#: ../../mod/admin.php:447 +msgid "Mobile system theme" +msgstr "" + +#: ../../mod/admin.php:447 +msgid "Theme for mobile devices" +msgstr "" + +#: ../../mod/admin.php:448 msgid "SSL link policy" msgstr "" -#: ../../mod/admin.php:434 +#: ../../mod/admin.php:448 msgid "Determines whether generated links should be forced to use SSL" msgstr "" -#: ../../mod/admin.php:435 +#: ../../mod/admin.php:449 msgid "Maximum image size" msgstr "" -#: ../../mod/admin.php:435 +#: ../../mod/admin.php:449 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "" -#: ../../mod/admin.php:437 +#: ../../mod/admin.php:451 msgid "Register policy" msgstr "" -#: ../../mod/admin.php:438 +#: ../../mod/admin.php:452 msgid "Register text" msgstr "" -#: ../../mod/admin.php:438 +#: ../../mod/admin.php:452 msgid "Will be displayed prominently on the registration page." msgstr "" -#: ../../mod/admin.php:439 +#: ../../mod/admin.php:453 msgid "Accounts abandoned after x days" msgstr "" -#: ../../mod/admin.php:439 +#: ../../mod/admin.php:453 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "" -#: ../../mod/admin.php:440 +#: ../../mod/admin.php:454 msgid "Allowed friend domains" msgstr "" -#: ../../mod/admin.php:440 +#: ../../mod/admin.php:454 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:441 +#: ../../mod/admin.php:455 msgid "Allowed email domains" msgstr "" -#: ../../mod/admin.php:441 +#: ../../mod/admin.php:455 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:442 +#: ../../mod/admin.php:456 msgid "Block public" msgstr "" -#: ../../mod/admin.php:442 +#: ../../mod/admin.php:456 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:443 +#: ../../mod/admin.php:457 msgid "Force publish" msgstr "" -#: ../../mod/admin.php:443 +#: ../../mod/admin.php:457 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "" -#: ../../mod/admin.php:444 +#: ../../mod/admin.php:458 msgid "Global directory update URL" msgstr "" -#: ../../mod/admin.php:444 +#: ../../mod/admin.php:458 msgid "" "URL to update the global directory. If this is not set, the global directory " "is completely unavailable to the application." msgstr "" -#: ../../mod/admin.php:446 +#: ../../mod/admin.php:459 +msgid "Allow threaded items" +msgstr "" + +#: ../../mod/admin.php:459 +msgid "Allow infinite level threading for items on this site." +msgstr "" + +#: ../../mod/admin.php:461 msgid "Block multiple registrations" msgstr "" -#: ../../mod/admin.php:446 +#: ../../mod/admin.php:461 msgid "Disallow users to register additional accounts for use as pages." msgstr "" -#: ../../mod/admin.php:447 +#: ../../mod/admin.php:462 msgid "OpenID support" msgstr "" -#: ../../mod/admin.php:447 +#: ../../mod/admin.php:462 msgid "OpenID support for registration and logins." msgstr "" -#: ../../mod/admin.php:448 +#: ../../mod/admin.php:463 msgid "Fullname check" msgstr "" -#: ../../mod/admin.php:448 +#: ../../mod/admin.php:463 msgid "" "Force users to register with a space between firstname and lastname in Full " "name, as an antispam measure" msgstr "" -#: ../../mod/admin.php:449 +#: ../../mod/admin.php:464 msgid "UTF-8 Regular expressions" msgstr "" -#: ../../mod/admin.php:449 +#: ../../mod/admin.php:464 msgid "Use PHP UTF8 regular expressions" msgstr "" -#: ../../mod/admin.php:450 +#: ../../mod/admin.php:465 msgid "Show Community Page" msgstr "" -#: ../../mod/admin.php:450 +#: ../../mod/admin.php:465 msgid "" "Display a Community page showing all recent public postings on this site." msgstr "" -#: ../../mod/admin.php:451 +#: ../../mod/admin.php:466 msgid "Enable OStatus support" msgstr "" -#: ../../mod/admin.php:451 +#: ../../mod/admin.php:466 msgid "" "Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All " "communications in OStatus are public, so privacy warnings will be " "occasionally displayed." msgstr "" -#: ../../mod/admin.php:452 +#: ../../mod/admin.php:467 msgid "Enable Diaspora support" msgstr "" -#: ../../mod/admin.php:452 +#: ../../mod/admin.php:467 msgid "Provide built-in Diaspora network compatibility." msgstr "" -#: ../../mod/admin.php:453 +#: ../../mod/admin.php:468 msgid "Only allow Friendica contacts" msgstr "" -#: ../../mod/admin.php:453 +#: ../../mod/admin.php:468 msgid "" "All contacts must use Friendica protocols. All other built-in communication " "protocols disabled." msgstr "" -#: ../../mod/admin.php:454 +#: ../../mod/admin.php:469 msgid "Verify SSL" msgstr "" -#: ../../mod/admin.php:454 +#: ../../mod/admin.php:469 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:455 +#: ../../mod/admin.php:470 msgid "Proxy user" msgstr "" -#: ../../mod/admin.php:456 +#: ../../mod/admin.php:471 msgid "Proxy URL" msgstr "" -#: ../../mod/admin.php:457 +#: ../../mod/admin.php:472 msgid "Network timeout" msgstr "" -#: ../../mod/admin.php:457 +#: ../../mod/admin.php:472 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "" -#: ../../mod/admin.php:458 +#: ../../mod/admin.php:473 msgid "Delivery interval" msgstr "" -#: ../../mod/admin.php:458 +#: ../../mod/admin.php:473 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:459 +#: ../../mod/admin.php:474 msgid "Poll interval" msgstr "" -#: ../../mod/admin.php:459 +#: ../../mod/admin.php:474 msgid "" "Delay background polling processes by this many seconds to reduce system " "load. If 0, use delivery interval." msgstr "" -#: ../../mod/admin.php:460 +#: ../../mod/admin.php:475 msgid "Maximum Load Average" msgstr "" -#: ../../mod/admin.php:460 +#: ../../mod/admin.php:475 msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." msgstr "" -#: ../../mod/admin.php:477 +#: ../../mod/admin.php:492 msgid "Update has been marked successful" msgstr "" -#: ../../mod/admin.php:487 +#: ../../mod/admin.php:502 #, php-format msgid "Executing %s failed. Check system logs." msgstr "" -#: ../../mod/admin.php:490 +#: ../../mod/admin.php:505 #, php-format msgid "Update %s was successfully applied." msgstr "" -#: ../../mod/admin.php:494 +#: ../../mod/admin.php:509 #, php-format msgid "Update %s did not return a status. Unknown if it succeeded." msgstr "" -#: ../../mod/admin.php:497 +#: ../../mod/admin.php:512 #, php-format msgid "Update function %s could not be found." msgstr "" -#: ../../mod/admin.php:512 +#: ../../mod/admin.php:527 msgid "No failed updates." msgstr "" -#: ../../mod/admin.php:516 +#: ../../mod/admin.php:531 msgid "Failed Updates" msgstr "" -#: ../../mod/admin.php:517 +#: ../../mod/admin.php:532 msgid "" "This does not include updates prior to 1139, which did not return a status." msgstr "" -#: ../../mod/admin.php:518 +#: ../../mod/admin.php:533 msgid "Mark success (if update was manually applied)" msgstr "" -#: ../../mod/admin.php:519 +#: ../../mod/admin.php:534 msgid "Attempt to execute this update step automatically" msgstr "" -#: ../../mod/admin.php:544 +#: ../../mod/admin.php:559 #, php-format msgid "%s user blocked/unblocked" msgid_plural "%s users blocked/unblocked" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:551 +#: ../../mod/admin.php:566 #, php-format msgid "%s user deleted" msgid_plural "%s users deleted" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:590 +#: ../../mod/admin.php:605 #, php-format msgid "User '%s' deleted" msgstr "" -#: ../../mod/admin.php:598 +#: ../../mod/admin.php:613 #, php-format msgid "User '%s' unblocked" msgstr "" -#: ../../mod/admin.php:598 +#: ../../mod/admin.php:613 #, php-format msgid "User '%s' blocked" msgstr "" -#: ../../mod/admin.php:662 +#: ../../mod/admin.php:677 msgid "select all" msgstr "" -#: ../../mod/admin.php:663 +#: ../../mod/admin.php:678 msgid "User registrations waiting for confirm" msgstr "" -#: ../../mod/admin.php:664 +#: ../../mod/admin.php:679 msgid "Request date" msgstr "" -#: ../../mod/admin.php:664 ../../mod/admin.php:673 +#: ../../mod/admin.php:679 ../../mod/admin.php:688 #: ../../include/contact_selectors.php:79 msgid "Email" msgstr "" -#: ../../mod/admin.php:665 +#: ../../mod/admin.php:680 msgid "No registrations." msgstr "" -#: ../../mod/admin.php:667 +#: ../../mod/admin.php:682 msgid "Deny" msgstr "" -#: ../../mod/admin.php:673 +#: ../../mod/admin.php:688 msgid "Register date" msgstr "" -#: ../../mod/admin.php:673 +#: ../../mod/admin.php:688 msgid "Last login" msgstr "" -#: ../../mod/admin.php:673 +#: ../../mod/admin.php:688 msgid "Last item" msgstr "" -#: ../../mod/admin.php:673 +#: ../../mod/admin.php:688 msgid "Account" msgstr "" -#: ../../mod/admin.php:675 +#: ../../mod/admin.php:690 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:676 +#: ../../mod/admin.php:691 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:717 +#: ../../mod/admin.php:732 #, php-format msgid "Plugin %s disabled." msgstr "" -#: ../../mod/admin.php:721 +#: ../../mod/admin.php:736 #, php-format msgid "Plugin %s enabled." msgstr "" -#: ../../mod/admin.php:731 ../../mod/admin.php:929 +#: ../../mod/admin.php:746 ../../mod/admin.php:944 msgid "Disable" msgstr "" -#: ../../mod/admin.php:733 ../../mod/admin.php:931 +#: ../../mod/admin.php:748 ../../mod/admin.php:946 msgid "Enable" msgstr "" -#: ../../mod/admin.php:755 ../../mod/admin.php:960 +#: ../../mod/admin.php:770 ../../mod/admin.php:975 msgid "Toggle" msgstr "" -#: ../../mod/admin.php:763 ../../mod/admin.php:970 +#: ../../mod/admin.php:778 ../../mod/admin.php:985 msgid "Author: " msgstr "" -#: ../../mod/admin.php:764 ../../mod/admin.php:971 +#: ../../mod/admin.php:779 ../../mod/admin.php:986 msgid "Maintainer: " msgstr "" -#: ../../mod/admin.php:893 +#: ../../mod/admin.php:908 msgid "No themes found." msgstr "" -#: ../../mod/admin.php:952 +#: ../../mod/admin.php:967 msgid "Screenshot" msgstr "" -#: ../../mod/admin.php:1000 +#: ../../mod/admin.php:1015 msgid "[Experimental]" msgstr "" -#: ../../mod/admin.php:1001 +#: ../../mod/admin.php:1016 msgid "[Unsupported]" msgstr "" -#: ../../mod/admin.php:1028 +#: ../../mod/admin.php:1043 msgid "Log settings updated." msgstr "" -#: ../../mod/admin.php:1084 +#: ../../mod/admin.php:1099 msgid "Clear" msgstr "" -#: ../../mod/admin.php:1090 +#: ../../mod/admin.php:1105 msgid "Debugging" msgstr "" -#: ../../mod/admin.php:1091 +#: ../../mod/admin.php:1106 msgid "Log file" msgstr "" -#: ../../mod/admin.php:1091 +#: ../../mod/admin.php:1106 msgid "" "Must be writable by web server. Relative to your Friendica top-level " "directory." msgstr "" -#: ../../mod/admin.php:1092 +#: ../../mod/admin.php:1107 msgid "Log level" msgstr "" -#: ../../mod/admin.php:1142 +#: ../../mod/admin.php:1157 msgid "Close" msgstr "" -#: ../../mod/admin.php:1148 +#: ../../mod/admin.php:1163 msgid "FTP Host" msgstr "" -#: ../../mod/admin.php:1149 +#: ../../mod/admin.php:1164 msgid "FTP Path" msgstr "" -#: ../../mod/admin.php:1150 +#: ../../mod/admin.php:1165 msgid "FTP User" msgstr "" -#: ../../mod/admin.php:1151 +#: ../../mod/admin.php:1166 msgid "FTP Password" msgstr "" -#: ../../mod/profile.php:21 ../../boot.php:1043 +#: ../../mod/profile.php:22 ../../boot.php:1065 msgid "Requested profile is not available." msgstr "" -#: ../../mod/profile.php:141 ../../mod/display.php:75 +#: ../../mod/profile.php:142 ../../mod/display.php:67 msgid "Access to this profile has been restricted." msgstr "" -#: ../../mod/profile.php:166 +#: ../../mod/profile.php:167 msgid "Tips for New Members" msgstr "" @@ -3898,7 +3930,7 @@ msgstr "" msgid "link" msgstr "" -#: ../../mod/display.php:135 +#: ../../mod/display.php:128 msgid "Item has been removed." msgstr "" @@ -3910,13 +3942,13 @@ msgstr "" msgid "No installed applications." msgstr "" -#: ../../mod/search.php:83 ../../include/text.php:674 -#: ../../include/text.php:675 ../../include/nav.php:91 +#: ../../mod/search.php:83 ../../include/text.php:678 +#: ../../include/text.php:679 ../../include/nav.php:91 msgid "Search" msgstr "" -#: ../../mod/profiles.php:21 ../../mod/profiles.php:418 -#: ../../mod/profiles.php:532 ../../mod/dfrn_confirm.php:62 +#: ../../mod/profiles.php:21 ../../mod/profiles.php:423 +#: ../../mod/profiles.php:537 ../../mod/dfrn_confirm.php:62 msgid "Profile not found." msgstr "" @@ -3924,306 +3956,306 @@ msgstr "" msgid "Profile Name is required." msgstr "" -#: ../../mod/profiles.php:155 +#: ../../mod/profiles.php:160 msgid "Marital Status" msgstr "" -#: ../../mod/profiles.php:159 +#: ../../mod/profiles.php:164 msgid "Romantic Partner" msgstr "" -#: ../../mod/profiles.php:163 +#: ../../mod/profiles.php:168 msgid "Likes" msgstr "" -#: ../../mod/profiles.php:167 +#: ../../mod/profiles.php:172 msgid "Dislikes" msgstr "" -#: ../../mod/profiles.php:171 +#: ../../mod/profiles.php:176 msgid "Work/Employment" msgstr "" -#: ../../mod/profiles.php:174 +#: ../../mod/profiles.php:179 msgid "Religion" msgstr "" -#: ../../mod/profiles.php:178 +#: ../../mod/profiles.php:183 msgid "Political Views" msgstr "" -#: ../../mod/profiles.php:182 +#: ../../mod/profiles.php:187 msgid "Gender" msgstr "" -#: ../../mod/profiles.php:186 +#: ../../mod/profiles.php:191 msgid "Sexual Preference" msgstr "" -#: ../../mod/profiles.php:190 +#: ../../mod/profiles.php:195 msgid "Homepage" msgstr "" -#: ../../mod/profiles.php:194 +#: ../../mod/profiles.php:199 msgid "Interests" msgstr "" -#: ../../mod/profiles.php:198 +#: ../../mod/profiles.php:203 msgid "Address" msgstr "" -#: ../../mod/profiles.php:205 ../../addon/dav/common/wdcal_edit.inc.php:183 +#: ../../mod/profiles.php:210 ../../addon/dav/common/wdcal_edit.inc.php:183 msgid "Location" msgstr "" -#: ../../mod/profiles.php:288 +#: ../../mod/profiles.php:293 msgid "Profile updated." msgstr "" -#: ../../mod/profiles.php:355 +#: ../../mod/profiles.php:360 msgid " and " msgstr "" -#: ../../mod/profiles.php:363 +#: ../../mod/profiles.php:368 msgid "public profile" msgstr "" -#: ../../mod/profiles.php:366 +#: ../../mod/profiles.php:371 #, php-format msgid "%1$s changed %2$s to “%3$s”" msgstr "" -#: ../../mod/profiles.php:367 +#: ../../mod/profiles.php:372 #, php-format msgid " - Visit %1$s's %2$s" msgstr "" -#: ../../mod/profiles.php:370 +#: ../../mod/profiles.php:375 #, php-format msgid "%1$s has an updated %2$s, changing %3$s." msgstr "" -#: ../../mod/profiles.php:437 +#: ../../mod/profiles.php:442 msgid "Profile deleted." msgstr "" -#: ../../mod/profiles.php:455 ../../mod/profiles.php:489 +#: ../../mod/profiles.php:460 ../../mod/profiles.php:494 msgid "Profile-" msgstr "" -#: ../../mod/profiles.php:474 ../../mod/profiles.php:516 +#: ../../mod/profiles.php:479 ../../mod/profiles.php:521 msgid "New profile created." msgstr "" -#: ../../mod/profiles.php:495 +#: ../../mod/profiles.php:500 msgid "Profile unavailable to clone." msgstr "" -#: ../../mod/profiles.php:557 +#: ../../mod/profiles.php:562 msgid "Hide your contact/friend list from viewers of this profile?" msgstr "" -#: ../../mod/profiles.php:577 +#: ../../mod/profiles.php:582 msgid "Edit Profile Details" msgstr "" -#: ../../mod/profiles.php:579 +#: ../../mod/profiles.php:584 msgid "View this profile" msgstr "" -#: ../../mod/profiles.php:580 +#: ../../mod/profiles.php:585 msgid "Create a new profile using these settings" msgstr "" -#: ../../mod/profiles.php:581 +#: ../../mod/profiles.php:586 msgid "Clone this profile" msgstr "" -#: ../../mod/profiles.php:582 +#: ../../mod/profiles.php:587 msgid "Delete this profile" msgstr "" -#: ../../mod/profiles.php:583 +#: ../../mod/profiles.php:588 msgid "Profile Name:" msgstr "" -#: ../../mod/profiles.php:584 +#: ../../mod/profiles.php:589 msgid "Your Full Name:" msgstr "" -#: ../../mod/profiles.php:585 +#: ../../mod/profiles.php:590 msgid "Title/Description:" msgstr "" -#: ../../mod/profiles.php:586 +#: ../../mod/profiles.php:591 msgid "Your Gender:" msgstr "" -#: ../../mod/profiles.php:587 +#: ../../mod/profiles.php:592 #, php-format msgid "Birthday (%s):" msgstr "" -#: ../../mod/profiles.php:588 +#: ../../mod/profiles.php:593 msgid "Street Address:" msgstr "" -#: ../../mod/profiles.php:589 +#: ../../mod/profiles.php:594 msgid "Locality/City:" msgstr "" -#: ../../mod/profiles.php:590 +#: ../../mod/profiles.php:595 msgid "Postal/Zip Code:" msgstr "" -#: ../../mod/profiles.php:591 +#: ../../mod/profiles.php:596 msgid "Country:" msgstr "" -#: ../../mod/profiles.php:592 +#: ../../mod/profiles.php:597 msgid "Region/State:" msgstr "" -#: ../../mod/profiles.php:593 +#: ../../mod/profiles.php:598 msgid "♥ Marital Status:" msgstr "" -#: ../../mod/profiles.php:594 +#: ../../mod/profiles.php:599 msgid "Who: (if applicable)" msgstr "" -#: ../../mod/profiles.php:595 +#: ../../mod/profiles.php:600 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "" -#: ../../mod/profiles.php:596 +#: ../../mod/profiles.php:601 msgid "Since [date]:" msgstr "" -#: ../../mod/profiles.php:597 ../../include/profile_advanced.php:46 +#: ../../mod/profiles.php:602 ../../include/profile_advanced.php:46 msgid "Sexual Preference:" msgstr "" -#: ../../mod/profiles.php:598 +#: ../../mod/profiles.php:603 msgid "Homepage URL:" msgstr "" -#: ../../mod/profiles.php:599 ../../include/profile_advanced.php:50 +#: ../../mod/profiles.php:604 ../../include/profile_advanced.php:50 msgid "Hometown:" msgstr "" -#: ../../mod/profiles.php:600 ../../include/profile_advanced.php:54 +#: ../../mod/profiles.php:605 ../../include/profile_advanced.php:54 msgid "Political Views:" msgstr "" -#: ../../mod/profiles.php:601 +#: ../../mod/profiles.php:606 msgid "Religious Views:" msgstr "" -#: ../../mod/profiles.php:602 +#: ../../mod/profiles.php:607 msgid "Public Keywords:" msgstr "" -#: ../../mod/profiles.php:603 +#: ../../mod/profiles.php:608 msgid "Private Keywords:" msgstr "" -#: ../../mod/profiles.php:604 ../../include/profile_advanced.php:62 +#: ../../mod/profiles.php:609 ../../include/profile_advanced.php:62 msgid "Likes:" msgstr "" -#: ../../mod/profiles.php:605 ../../include/profile_advanced.php:64 +#: ../../mod/profiles.php:610 ../../include/profile_advanced.php:64 msgid "Dislikes:" msgstr "" -#: ../../mod/profiles.php:606 +#: ../../mod/profiles.php:611 msgid "Example: fishing photography software" msgstr "" -#: ../../mod/profiles.php:607 +#: ../../mod/profiles.php:612 msgid "(Used for suggesting potential friends, can be seen by others)" msgstr "" -#: ../../mod/profiles.php:608 +#: ../../mod/profiles.php:613 msgid "(Used for searching profiles, never shown to others)" msgstr "" -#: ../../mod/profiles.php:609 +#: ../../mod/profiles.php:614 msgid "Tell us about yourself..." msgstr "" -#: ../../mod/profiles.php:610 +#: ../../mod/profiles.php:615 msgid "Hobbies/Interests" msgstr "" -#: ../../mod/profiles.php:611 +#: ../../mod/profiles.php:616 msgid "Contact information and Social Networks" msgstr "" -#: ../../mod/profiles.php:612 +#: ../../mod/profiles.php:617 msgid "Musical interests" msgstr "" -#: ../../mod/profiles.php:613 +#: ../../mod/profiles.php:618 msgid "Books, literature" msgstr "" -#: ../../mod/profiles.php:614 +#: ../../mod/profiles.php:619 msgid "Television" msgstr "" -#: ../../mod/profiles.php:615 +#: ../../mod/profiles.php:620 msgid "Film/dance/culture/entertainment" msgstr "" -#: ../../mod/profiles.php:616 +#: ../../mod/profiles.php:621 msgid "Love/romance" msgstr "" -#: ../../mod/profiles.php:617 +#: ../../mod/profiles.php:622 msgid "Work/employment" msgstr "" -#: ../../mod/profiles.php:618 +#: ../../mod/profiles.php:623 msgid "School/education" msgstr "" -#: ../../mod/profiles.php:623 +#: ../../mod/profiles.php:628 msgid "" "This is your public profile.
    It may " "be visible to anybody using the internet." msgstr "" -#: ../../mod/profiles.php:633 ../../mod/directory.php:109 +#: ../../mod/profiles.php:638 ../../mod/directory.php:109 msgid "Age: " msgstr "" -#: ../../mod/profiles.php:672 +#: ../../mod/profiles.php:677 msgid "Edit/Manage Profiles" msgstr "" -#: ../../mod/profiles.php:673 ../../boot.php:1152 +#: ../../mod/profiles.php:678 ../../boot.php:1174 msgid "Change profile photo" msgstr "" -#: ../../mod/profiles.php:674 ../../boot.php:1153 +#: ../../mod/profiles.php:679 ../../boot.php:1175 msgid "Create New Profile" msgstr "" -#: ../../mod/profiles.php:685 ../../boot.php:1163 +#: ../../mod/profiles.php:690 ../../boot.php:1185 msgid "Profile Image" msgstr "" -#: ../../mod/profiles.php:687 ../../boot.php:1166 +#: ../../mod/profiles.php:692 ../../boot.php:1188 msgid "visible to everybody" msgstr "" -#: ../../mod/profiles.php:688 ../../boot.php:1167 +#: ../../mod/profiles.php:693 ../../boot.php:1189 msgid "Edit visibility" msgstr "" -#: ../../mod/filer.php:29 ../../include/conversation.php:1069 -#: ../../include/conversation.php:1086 +#: ../../mod/filer.php:29 ../../include/conversation.php:1105 +#: ../../include/conversation.php:1122 msgid "Save to Folder:" msgstr "" @@ -4231,7 +4263,7 @@ msgstr "" msgid "- select -" msgstr "" -#: ../../mod/tagger.php:103 ../../include/conversation.php:242 +#: ../../mod/tagger.php:103 ../../include/conversation.php:256 #, php-format msgid "%1$s tagged %2$s's %3$s with %4$s" msgstr "" @@ -4347,17 +4379,17 @@ msgid "Gender: " msgstr "" #: ../../mod/directory.php:134 ../../include/profile_advanced.php:17 -#: ../../boot.php:1188 +#: ../../boot.php:1210 msgid "Gender:" msgstr "" #: ../../mod/directory.php:136 ../../include/profile_advanced.php:37 -#: ../../boot.php:1191 +#: ../../boot.php:1213 msgid "Status:" msgstr "" #: ../../mod/directory.php:138 ../../include/profile_advanced.php:48 -#: ../../boot.php:1193 +#: ../../boot.php:1215 msgid "Homepage:" msgstr "" @@ -4488,7 +4520,7 @@ msgstr "" msgid "Unable to set contact photo." msgstr "" -#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:577 +#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:608 #: ../../include/conversation.php:162 #, php-format msgid "%1$s is now friends with %2$s" @@ -4723,7 +4755,8 @@ msgstr "" msgid "Activate Real-Time Updates" msgstr "" -#: ../../addon/facebook/facebook.php:799 ../../addon/dav/layout.fnk.php:361 +#: ../../addon/facebook/facebook.php:799 +#: ../../addon/dav/friendica/layout.fnk.php:361 msgid "The new values have been saved." msgstr "" @@ -4787,23 +4820,23 @@ msgstr "" msgid "How many contacts to display on profile sidebar" msgstr "" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:233 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:260 msgid "Lifetime of the cache (in hours)" msgstr "" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:238 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:265 msgid "Cache Statistics" msgstr "" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:241 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:268 msgid "Number of items" msgstr "" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:243 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:270 msgid "Size of the cache" msgstr "" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:245 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:272 msgid "Delete the whole cache" msgstr "" @@ -5115,7 +5148,7 @@ msgstr "" #: ../../addon/communityhome/communityhome.php:34 #: ../../addon/communityhome/twillingham/communityhome.php:28 #: ../../addon/communityhome/twillingham/communityhome.php:34 -#: ../../include/nav.php:64 ../../boot.php:899 +#: ../../include/nav.php:64 ../../boot.php:921 msgid "Login" msgstr "" @@ -5143,15 +5176,11 @@ msgid "Latest likes" msgstr "" #: ../../addon/communityhome/communityhome.php:155 -#: ../../view/theme/diabook/theme.php:562 ../../include/text.php:1360 -#: ../../include/conversation.php:106 ../../include/conversation.php:222 +#: ../../view/theme/diabook/theme.php:562 ../../include/text.php:1397 +#: ../../include/conversation.php:106 ../../include/conversation.php:236 msgid "event" msgstr "" -#: ../../addon/dav/dav_caldav_backend_virtual_friendica.inc.php:36 -msgid "Friendicy-Native events" -msgstr "" - #: ../../addon/dav/common/wdcal_backend.inc.php:92 #: ../../addon/dav/common/wdcal_backend.inc.php:166 #: ../../addon/dav/common/wdcal_backend.inc.php:178 @@ -5167,7 +5196,8 @@ msgid "Could not open component for editing" msgstr "" #: ../../addon/dav/common/wdcal_edit.inc.php:140 -#: ../../addon/dav/layout.fnk.php:143 ../../addon/dav/layout.fnk.php:422 +#: ../../addon/dav/friendica/layout.fnk.php:143 +#: ../../addon/dav/friendica/layout.fnk.php:422 msgid "Go back to the calendar" msgstr "" @@ -5175,7 +5205,8 @@ msgstr "" msgid "Event data" msgstr "" -#: ../../addon/dav/common/wdcal_edit.inc.php:146 ../../addon/dav/main.php:206 +#: ../../addon/dav/common/wdcal_edit.inc.php:146 +#: ../../addon/dav/friendica/main.php:239 msgid "Calendar" msgstr "" @@ -5264,38 +5295,38 @@ msgstr "" #: ../../addon/dav/common/wdcal_edit.inc.php:254 #: ../../addon/dav/common/wdcal_edit.inc.php:270 #: ../../addon/dav/common/wdcal_edit.inc.php:293 -#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:880 +#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:917 msgid "Sunday" msgstr "" #: ../../addon/dav/common/wdcal_edit.inc.php:235 #: ../../addon/dav/common/wdcal_edit.inc.php:274 -#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:880 +#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:917 msgid "Monday" msgstr "" #: ../../addon/dav/common/wdcal_edit.inc.php:238 -#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:880 +#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:917 msgid "Tuesday" msgstr "" #: ../../addon/dav/common/wdcal_edit.inc.php:241 -#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:880 +#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:917 msgid "Wednesday" msgstr "" #: ../../addon/dav/common/wdcal_edit.inc.php:244 -#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:880 +#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:917 msgid "Thursday" msgstr "" #: ../../addon/dav/common/wdcal_edit.inc.php:247 -#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:880 +#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:917 msgid "Friday" msgstr "" #: ../../addon/dav/common/wdcal_edit.inc.php:250 -#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:880 +#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:917 msgid "Saturday" msgstr "" @@ -5325,7 +5356,7 @@ msgid "#num#th-last #wkday# of each month" msgstr "" #: ../../addon/dav/common/wdcal_edit.inc.php:372 -#: ../../addon/dav/layout.fnk.php:255 +#: ../../addon/dav/friendica/layout.fnk.php:255 msgid "Month" msgstr "" @@ -5445,178 +5476,189 @@ msgstr "" msgid "Private Events" msgstr "" -#: ../../addon/dav/dav_carddav_backend_virtual_friendica.inc.php:53 +#: ../../addon/dav/common/dav_carddav_backend_private.inc.php:46 +msgid "Private Addressbooks" +msgstr "" + +#: ../../addon/dav/friendica/dav_caldav_backend_virtual_friendica.inc.php:36 +msgid "Friendica-Native events" +msgstr "" + +#: ../../addon/dav/friendica/dav_carddav_backend_virtual_friendica.inc.php:36 +#: ../../addon/dav/friendica/dav_carddav_backend_virtual_friendica.inc.php:59 msgid "Friendica-Contacts" msgstr "" -#: ../../addon/dav/dav_carddav_backend_virtual_friendica.inc.php:54 +#: ../../addon/dav/friendica/dav_carddav_backend_virtual_friendica.inc.php:60 msgid "Your Friendica-Contacts" msgstr "" -#: ../../addon/dav/layout.fnk.php:99 ../../addon/dav/layout.fnk.php:136 +#: ../../addon/dav/friendica/layout.fnk.php:99 +#: ../../addon/dav/friendica/layout.fnk.php:136 msgid "" "Something went wrong when trying to import the file. Sorry. Maybe some " "events were imported anyway." msgstr "" -#: ../../addon/dav/layout.fnk.php:131 +#: ../../addon/dav/friendica/layout.fnk.php:131 msgid "Something went wrong when trying to import the file. Sorry." msgstr "" -#: ../../addon/dav/layout.fnk.php:134 +#: ../../addon/dav/friendica/layout.fnk.php:134 msgid "The ICS-File has been imported." msgstr "" -#: ../../addon/dav/layout.fnk.php:138 +#: ../../addon/dav/friendica/layout.fnk.php:138 msgid "No file was uploaded." msgstr "" -#: ../../addon/dav/layout.fnk.php:147 +#: ../../addon/dav/friendica/layout.fnk.php:147 msgid "Import a ICS-file" msgstr "" -#: ../../addon/dav/layout.fnk.php:150 +#: ../../addon/dav/friendica/layout.fnk.php:150 msgid "ICS-File" msgstr "" -#: ../../addon/dav/layout.fnk.php:151 +#: ../../addon/dav/friendica/layout.fnk.php:151 msgid "Overwrite all #num# existing events" msgstr "" -#: ../../addon/dav/layout.fnk.php:228 +#: ../../addon/dav/friendica/layout.fnk.php:228 msgid "New event" msgstr "" -#: ../../addon/dav/layout.fnk.php:232 +#: ../../addon/dav/friendica/layout.fnk.php:232 msgid "Today" msgstr "" -#: ../../addon/dav/layout.fnk.php:241 +#: ../../addon/dav/friendica/layout.fnk.php:241 msgid "Day" msgstr "" -#: ../../addon/dav/layout.fnk.php:248 +#: ../../addon/dav/friendica/layout.fnk.php:248 msgid "Week" msgstr "" -#: ../../addon/dav/layout.fnk.php:260 +#: ../../addon/dav/friendica/layout.fnk.php:260 msgid "Reload" msgstr "" -#: ../../addon/dav/layout.fnk.php:271 +#: ../../addon/dav/friendica/layout.fnk.php:271 msgid "Date" msgstr "" -#: ../../addon/dav/layout.fnk.php:313 +#: ../../addon/dav/friendica/layout.fnk.php:313 msgid "Error" msgstr "" -#: ../../addon/dav/layout.fnk.php:380 +#: ../../addon/dav/friendica/layout.fnk.php:380 msgid "The calendar has been updated." msgstr "" -#: ../../addon/dav/layout.fnk.php:393 +#: ../../addon/dav/friendica/layout.fnk.php:393 msgid "The new calendar has been created." msgstr "" -#: ../../addon/dav/layout.fnk.php:417 +#: ../../addon/dav/friendica/layout.fnk.php:417 msgid "The calendar has been deleted." msgstr "" -#: ../../addon/dav/layout.fnk.php:424 +#: ../../addon/dav/friendica/layout.fnk.php:424 msgid "Calendar Settings" msgstr "" -#: ../../addon/dav/layout.fnk.php:430 +#: ../../addon/dav/friendica/layout.fnk.php:430 msgid "Date format" msgstr "" -#: ../../addon/dav/layout.fnk.php:439 +#: ../../addon/dav/friendica/layout.fnk.php:439 msgid "Time zone" msgstr "" -#: ../../addon/dav/layout.fnk.php:445 +#: ../../addon/dav/friendica/layout.fnk.php:445 msgid "Calendars" msgstr "" -#: ../../addon/dav/layout.fnk.php:487 +#: ../../addon/dav/friendica/layout.fnk.php:487 msgid "Create a new calendar" msgstr "" -#: ../../addon/dav/layout.fnk.php:496 +#: ../../addon/dav/friendica/layout.fnk.php:496 msgid "Limitations" msgstr "" -#: ../../addon/dav/layout.fnk.php:500 ../../addon/libravatar/libravatar.php:82 +#: ../../addon/dav/friendica/layout.fnk.php:500 +#: ../../addon/libravatar/libravatar.php:82 msgid "Warning" msgstr "" -#: ../../addon/dav/layout.fnk.php:504 +#: ../../addon/dav/friendica/layout.fnk.php:504 msgid "Synchronization (iPhone, Thunderbird Lightning, Android, ...)" msgstr "" -#: ../../addon/dav/layout.fnk.php:511 +#: ../../addon/dav/friendica/layout.fnk.php:511 msgid "Synchronizing this calendar with the iPhone" msgstr "" -#: ../../addon/dav/layout.fnk.php:522 +#: ../../addon/dav/friendica/layout.fnk.php:522 msgid "Synchronizing your Friendica-Contacts with the iPhone" msgstr "" -#: ../../addon/dav/main.php:169 +#: ../../addon/dav/friendica/main.php:202 msgid "" "The current version of this plugin has not been set up correctly. Please " "contact the system administrator of your installation of friendica to fix " "this." msgstr "" -#: ../../addon/dav/main.php:209 +#: ../../addon/dav/friendica/main.php:242 msgid "Extended calendar with CalDAV-support" msgstr "" -#: ../../addon/dav/main.php:246 ../../addon/dav/main.php:247 -#: ../../include/delivery.php:463 ../../include/enotify.php:26 -#: ../../include/notifier.php:685 +#: ../../addon/dav/friendica/main.php:279 +#: ../../addon/dav/friendica/main.php:280 ../../include/delivery.php:463 +#: ../../include/enotify.php:28 ../../include/notifier.php:710 msgid "noreply" msgstr "" -#: ../../addon/dav/main.php:249 +#: ../../addon/dav/friendica/main.php:282 msgid "Notification: " msgstr "" -#: ../../addon/dav/main.php:276 +#: ../../addon/dav/friendica/main.php:309 msgid "The database tables have been installed." msgstr "" -#: ../../addon/dav/main.php:277 +#: ../../addon/dav/friendica/main.php:310 msgid "An error occurred during the installation." msgstr "" -#: ../../addon/dav/main.php:283 +#: ../../addon/dav/friendica/main.php:316 msgid "The database tables have been updated." msgstr "" -#: ../../addon/dav/main.php:285 +#: ../../addon/dav/friendica/main.php:317 msgid "An error occurred during the update." msgstr "" -#: ../../addon/dav/main.php:301 +#: ../../addon/dav/friendica/main.php:333 msgid "No system-wide settings yet." msgstr "" -#: ../../addon/dav/main.php:304 +#: ../../addon/dav/friendica/main.php:336 msgid "Database status" msgstr "" -#: ../../addon/dav/main.php:307 +#: ../../addon/dav/friendica/main.php:339 msgid "Installed" msgstr "" -#: ../../addon/dav/main.php:310 +#: ../../addon/dav/friendica/main.php:343 msgid "Upgrade needed" msgstr "" -#: ../../addon/dav/main.php:310 +#: ../../addon/dav/friendica/main.php:343 msgid "" "Please back up all calendar data (the tables beginning with dav_*) before " "proceeding. While all calendar events should be converted to the new " @@ -5625,23 +5667,23 @@ msgid "" "button." msgstr "" -#: ../../addon/dav/main.php:310 +#: ../../addon/dav/friendica/main.php:343 msgid "Upgrade" msgstr "" -#: ../../addon/dav/main.php:313 +#: ../../addon/dav/friendica/main.php:346 msgid "Not installed" msgstr "" -#: ../../addon/dav/main.php:313 +#: ../../addon/dav/friendica/main.php:346 msgid "Install" msgstr "" -#: ../../addon/dav/main.php:317 +#: ../../addon/dav/friendica/main.php:350 msgid "Unknown" msgstr "" -#: ../../addon/dav/main.php:317 +#: ../../addon/dav/friendica/main.php:350 msgid "" "Something really went wrong. I cannot recover from this state automatically, " "sorry. Please go to the database backend, back up the data, and delete all " @@ -5649,30 +5691,38 @@ msgid "" "should be able to reinitialize the tables automatically." msgstr "" -#: ../../addon/dav/main.php:322 +#: ../../addon/dav/friendica/main.php:355 msgid "Troubleshooting" msgstr "" -#: ../../addon/dav/main.php:323 +#: ../../addon/dav/friendica/main.php:356 msgid "Manual creation of the database tables:" msgstr "" -#: ../../addon/dav/main.php:324 +#: ../../addon/dav/friendica/main.php:357 msgid "Show SQL-statements" msgstr "" -#: ../../addon/dav/calendar.friendica.fnk.php:193 +#: ../../addon/dav/friendica/calendar.friendica.fnk.php:206 msgid "Private Calendar" msgstr "" -#: ../../addon/dav/calendar.friendica.fnk.php:194 +#: ../../addon/dav/friendica/calendar.friendica.fnk.php:207 msgid "Friendica Events: Mine" msgstr "" -#: ../../addon/dav/calendar.friendica.fnk.php:195 +#: ../../addon/dav/friendica/calendar.friendica.fnk.php:208 msgid "Friendica Events: Contacts" msgstr "" +#: ../../addon/dav/friendica/calendar.friendica.fnk.php:248 +msgid "Private Addresses" +msgstr "" + +#: ../../addon/dav/friendica/calendar.friendica.fnk.php:249 +msgid "Friendica Contacts" +msgstr "" + #: ../../addon/uhremotestorage/uhremotestorage.php:84 #, php-format msgid "" @@ -7301,19 +7351,19 @@ msgstr "" msgid "Ask me" msgstr "" -#: ../../include/event.php:20 ../../include/bb2diaspora.php:431 +#: ../../include/event.php:20 ../../include/bb2diaspora.php:439 msgid "Starts:" msgstr "" -#: ../../include/event.php:30 ../../include/bb2diaspora.php:439 +#: ../../include/event.php:30 ../../include/bb2diaspora.php:447 msgid "Finishes:" msgstr "" -#: ../../include/delivery.php:456 ../../include/notifier.php:678 +#: ../../include/delivery.php:456 ../../include/notifier.php:703 msgid "(no subject)" msgstr "" -#: ../../include/Scrape.php:572 +#: ../../include/Scrape.php:575 msgid " on Last.fm" msgstr "" @@ -7341,178 +7391,258 @@ msgstr "" msgid "older" msgstr "" -#: ../../include/text.php:593 +#: ../../include/text.php:597 msgid "No contacts" msgstr "" -#: ../../include/text.php:602 +#: ../../include/text.php:606 #, php-format msgid "%d Contact" msgid_plural "%d Contacts" msgstr[0] "" msgstr[1] "" -#: ../../include/text.php:715 +#: ../../include/text.php:719 msgid "poke" msgstr "" -#: ../../include/text.php:715 ../../include/conversation.php:201 +#: ../../include/text.php:719 ../../include/conversation.php:201 msgid "poked" msgstr "" -#: ../../include/text.php:716 +#: ../../include/text.php:720 msgid "ping" msgstr "" -#: ../../include/text.php:716 +#: ../../include/text.php:720 msgid "pinged" msgstr "" -#: ../../include/text.php:717 +#: ../../include/text.php:721 msgid "prod" msgstr "" -#: ../../include/text.php:717 +#: ../../include/text.php:721 msgid "prodded" msgstr "" -#: ../../include/text.php:718 +#: ../../include/text.php:722 msgid "slap" msgstr "" -#: ../../include/text.php:718 +#: ../../include/text.php:722 msgid "slapped" msgstr "" -#: ../../include/text.php:719 +#: ../../include/text.php:723 msgid "finger" msgstr "" -#: ../../include/text.php:719 +#: ../../include/text.php:723 msgid "fingered" msgstr "" -#: ../../include/text.php:720 +#: ../../include/text.php:724 msgid "rebuff" msgstr "" -#: ../../include/text.php:720 +#: ../../include/text.php:724 msgid "rebuffed" msgstr "" -#: ../../include/text.php:884 +#: ../../include/text.php:736 +msgid "happy" +msgstr "" + +#: ../../include/text.php:737 +msgid "sad" +msgstr "" + +#: ../../include/text.php:738 +msgid "mellow" +msgstr "" + +#: ../../include/text.php:739 +msgid "tired" +msgstr "" + +#: ../../include/text.php:740 +msgid "perky" +msgstr "" + +#: ../../include/text.php:741 +msgid "angry" +msgstr "" + +#: ../../include/text.php:742 +msgid "stupified" +msgstr "" + +#: ../../include/text.php:743 +msgid "puzzled" +msgstr "" + +#: ../../include/text.php:744 +msgid "interested" +msgstr "" + +#: ../../include/text.php:745 +msgid "bitter" +msgstr "" + +#: ../../include/text.php:746 +msgid "cheerful" +msgstr "" + +#: ../../include/text.php:747 +msgid "alive" +msgstr "" + +#: ../../include/text.php:748 +msgid "annoyed" +msgstr "" + +#: ../../include/text.php:749 +msgid "anxious" +msgstr "" + +#: ../../include/text.php:750 +msgid "cranky" +msgstr "" + +#: ../../include/text.php:751 +msgid "disturbed" +msgstr "" + +#: ../../include/text.php:752 +msgid "frustrated" +msgstr "" + +#: ../../include/text.php:753 +msgid "motivated" +msgstr "" + +#: ../../include/text.php:754 +msgid "relaxed" +msgstr "" + +#: ../../include/text.php:755 +msgid "surprised" +msgstr "" + +#: ../../include/text.php:921 msgid "January" msgstr "" -#: ../../include/text.php:884 +#: ../../include/text.php:921 msgid "February" msgstr "" -#: ../../include/text.php:884 +#: ../../include/text.php:921 msgid "March" msgstr "" -#: ../../include/text.php:884 +#: ../../include/text.php:921 msgid "April" msgstr "" -#: ../../include/text.php:884 +#: ../../include/text.php:921 msgid "May" msgstr "" -#: ../../include/text.php:884 +#: ../../include/text.php:921 msgid "June" msgstr "" -#: ../../include/text.php:884 +#: ../../include/text.php:921 msgid "July" msgstr "" -#: ../../include/text.php:884 +#: ../../include/text.php:921 msgid "August" msgstr "" -#: ../../include/text.php:884 +#: ../../include/text.php:921 msgid "September" msgstr "" -#: ../../include/text.php:884 +#: ../../include/text.php:921 msgid "October" msgstr "" -#: ../../include/text.php:884 +#: ../../include/text.php:921 msgid "November" msgstr "" -#: ../../include/text.php:884 +#: ../../include/text.php:921 msgid "December" msgstr "" -#: ../../include/text.php:970 +#: ../../include/text.php:1007 msgid "bytes" msgstr "" -#: ../../include/text.php:990 ../../include/text.php:1005 +#: ../../include/text.php:1027 ../../include/text.php:1042 msgid "remove" msgstr "" -#: ../../include/text.php:990 ../../include/text.php:1005 +#: ../../include/text.php:1027 ../../include/text.php:1042 msgid "[remove]" msgstr "" -#: ../../include/text.php:993 +#: ../../include/text.php:1030 msgid "Categories:" msgstr "" -#: ../../include/text.php:1008 +#: ../../include/text.php:1045 msgid "Filed under:" msgstr "" -#: ../../include/text.php:1024 ../../include/text.php:1036 +#: ../../include/text.php:1061 ../../include/text.php:1073 msgid "Click to open/close" msgstr "" -#: ../../include/text.php:1142 ../../include/user.php:236 +#: ../../include/text.php:1179 ../../include/user.php:236 msgid "default" msgstr "" -#: ../../include/text.php:1154 +#: ../../include/text.php:1191 msgid "Select an alternate language" msgstr "" -#: ../../include/text.php:1364 +#: ../../include/text.php:1401 msgid "activity" msgstr "" -#: ../../include/text.php:1366 +#: ../../include/text.php:1403 msgid "comment" msgstr "" -#: ../../include/text.php:1367 +#: ../../include/text.php:1404 msgid "post" msgstr "" -#: ../../include/text.php:1522 +#: ../../include/text.php:1559 msgid "Item filed" msgstr "" -#: ../../include/diaspora.php:660 +#: ../../include/diaspora.php:691 msgid "Sharing notification from Diaspora network" msgstr "" -#: ../../include/diaspora.php:2177 +#: ../../include/diaspora.php:2202 msgid "Attachments:" msgstr "" -#: ../../include/network.php:843 +#: ../../include/network.php:849 msgid "view full size" msgstr "" -#: ../../include/oembed.php:135 +#: ../../include/oembed.php:137 msgid "Embedded content" msgstr "" -#: ../../include/oembed.php:144 +#: ../../include/oembed.php:146 msgid "Embedding disabled" msgstr "" @@ -7551,7 +7681,7 @@ msgstr "" msgid "Contacts not in any group" msgstr "" -#: ../../include/nav.php:46 ../../boot.php:898 +#: ../../include/nav.php:46 ../../boot.php:920 msgid "Logout" msgstr "" @@ -7559,7 +7689,7 @@ msgstr "" msgid "End this session" msgstr "" -#: ../../include/nav.php:49 ../../boot.php:1610 +#: ../../include/nav.php:49 ../../boot.php:1635 msgid "Status" msgstr "" @@ -7639,11 +7769,11 @@ msgstr "" msgid "Manage other pages" msgstr "" -#: ../../include/nav.php:138 ../../boot.php:1146 +#: ../../include/nav.php:138 ../../boot.php:1168 msgid "Profiles" msgstr "" -#: ../../include/nav.php:138 ../../boot.php:1146 +#: ../../include/nav.php:138 ../../boot.php:1168 msgid "Manage/edit profiles" msgstr "" @@ -7789,12 +7919,12 @@ msgstr "" msgid "%1$d %2$s ago" msgstr "" -#: ../../include/datetime.php:472 ../../include/items.php:1620 +#: ../../include/datetime.php:472 ../../include/items.php:1621 #, php-format msgid "%s's birthday" msgstr "" -#: ../../include/datetime.php:473 ../../include/items.php:1621 +#: ../../include/datetime.php:473 ../../include/items.php:1622 #, php-format msgid "Happy Birthday %s" msgstr "" @@ -7803,14 +7933,18 @@ msgstr "" msgid "From: " msgstr "" -#: ../../include/bbcode.php:102 ../../include/bbcode.php:317 +#: ../../include/bbcode.php:102 ../../include/bbcode.php:323 msgid "Image/photo" msgstr "" -#: ../../include/bbcode.php:282 ../../include/bbcode.php:302 +#: ../../include/bbcode.php:288 ../../include/bbcode.php:308 msgid "$1 wrote:" msgstr "" +#: ../../include/bbcode.php:327 ../../include/bbcode.php:328 +msgid "Encrypted content" +msgstr "" + #: ../../include/dba.php:41 #, php-format msgid "Cannot locate DNS info for database server '%s'" @@ -7824,187 +7958,187 @@ msgstr "" msgid "Visible to everybody" msgstr "" -#: ../../include/enotify.php:14 +#: ../../include/enotify.php:16 msgid "Friendica Notification" msgstr "" -#: ../../include/enotify.php:17 +#: ../../include/enotify.php:19 msgid "Thank You," msgstr "" -#: ../../include/enotify.php:19 +#: ../../include/enotify.php:21 #, php-format msgid "%s Administrator" msgstr "" -#: ../../include/enotify.php:38 +#: ../../include/enotify.php:40 #, php-format msgid "%s " msgstr "" -#: ../../include/enotify.php:42 +#: ../../include/enotify.php:44 #, php-format msgid "[Friendica:Notify] New mail received at %s" msgstr "" -#: ../../include/enotify.php:44 +#: ../../include/enotify.php:46 #, php-format msgid "%1$s sent you a new private message at %2$s." msgstr "" -#: ../../include/enotify.php:45 +#: ../../include/enotify.php:47 #, php-format msgid "%1$s sent you %2$s." msgstr "" -#: ../../include/enotify.php:45 +#: ../../include/enotify.php:47 msgid "a private message" msgstr "" -#: ../../include/enotify.php:46 +#: ../../include/enotify.php:48 #, php-format msgid "Please visit %s to view and/or reply to your private messages." msgstr "" -#: ../../include/enotify.php:87 +#: ../../include/enotify.php:89 #, php-format msgid "%1$s commented on [url=%2$s]a %3$s[/url]" msgstr "" -#: ../../include/enotify.php:94 +#: ../../include/enotify.php:96 #, php-format msgid "%1$s commented on [url=%2$s]%3$s's %4$s[/url]" msgstr "" -#: ../../include/enotify.php:102 +#: ../../include/enotify.php:104 #, php-format msgid "%1$s commented on [url=%2$s]your %3$s[/url]" msgstr "" -#: ../../include/enotify.php:112 +#: ../../include/enotify.php:114 #, php-format msgid "[Friendica:Notify] Comment to conversation #%1$d by %2$s" msgstr "" -#: ../../include/enotify.php:113 +#: ../../include/enotify.php:115 #, php-format msgid "%s commented on an item/conversation you have been following." msgstr "" -#: ../../include/enotify.php:116 ../../include/enotify.php:131 -#: ../../include/enotify.php:144 ../../include/enotify.php:162 -#: ../../include/enotify.php:175 +#: ../../include/enotify.php:118 ../../include/enotify.php:133 +#: ../../include/enotify.php:146 ../../include/enotify.php:164 +#: ../../include/enotify.php:177 #, php-format msgid "Please visit %s to view and/or reply to the conversation." msgstr "" -#: ../../include/enotify.php:123 +#: ../../include/enotify.php:125 #, php-format msgid "[Friendica:Notify] %s posted to your profile wall" msgstr "" -#: ../../include/enotify.php:125 +#: ../../include/enotify.php:127 #, php-format msgid "%1$s posted to your profile wall at %2$s" msgstr "" -#: ../../include/enotify.php:127 +#: ../../include/enotify.php:129 #, php-format msgid "%1$s posted to [url=%2$s]your wall[/url]" msgstr "" -#: ../../include/enotify.php:138 +#: ../../include/enotify.php:140 #, php-format msgid "[Friendica:Notify] %s tagged you" msgstr "" -#: ../../include/enotify.php:139 +#: ../../include/enotify.php:141 #, php-format msgid "%1$s tagged you at %2$s" msgstr "" -#: ../../include/enotify.php:140 +#: ../../include/enotify.php:142 #, php-format msgid "%1$s [url=%2$s]tagged you[/url]." msgstr "" -#: ../../include/enotify.php:152 +#: ../../include/enotify.php:154 #, php-format msgid "[Friendica:Notify] %1$s poked you" msgstr "" -#: ../../include/enotify.php:153 +#: ../../include/enotify.php:155 #, php-format msgid "%1$s poked you at %2$s" msgstr "" -#: ../../include/enotify.php:154 +#: ../../include/enotify.php:156 #, php-format msgid "%1$s [url=%2$s]poked you[/url]." msgstr "" -#: ../../include/enotify.php:169 +#: ../../include/enotify.php:171 #, php-format msgid "[Friendica:Notify] %s tagged your post" msgstr "" -#: ../../include/enotify.php:170 +#: ../../include/enotify.php:172 #, php-format msgid "%1$s tagged your post at %2$s" msgstr "" -#: ../../include/enotify.php:171 +#: ../../include/enotify.php:173 #, php-format msgid "%1$s tagged [url=%2$s]your post[/url]" msgstr "" -#: ../../include/enotify.php:182 +#: ../../include/enotify.php:184 msgid "[Friendica:Notify] Introduction received" msgstr "" -#: ../../include/enotify.php:183 +#: ../../include/enotify.php:185 #, php-format msgid "You've received an introduction from '%1$s' at %2$s" msgstr "" -#: ../../include/enotify.php:184 +#: ../../include/enotify.php:186 #, php-format msgid "You've received [url=%1$s]an introduction[/url] from %2$s." msgstr "" -#: ../../include/enotify.php:187 ../../include/enotify.php:205 +#: ../../include/enotify.php:189 ../../include/enotify.php:207 #, php-format msgid "You may visit their profile at %s" msgstr "" -#: ../../include/enotify.php:189 +#: ../../include/enotify.php:191 #, php-format msgid "Please visit %s to approve or reject the introduction." msgstr "" -#: ../../include/enotify.php:196 +#: ../../include/enotify.php:198 msgid "[Friendica:Notify] Friend suggestion received" msgstr "" -#: ../../include/enotify.php:197 +#: ../../include/enotify.php:199 #, php-format msgid "You've received a friend suggestion from '%1$s' at %2$s" msgstr "" -#: ../../include/enotify.php:198 +#: ../../include/enotify.php:200 #, php-format msgid "You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s." msgstr "" -#: ../../include/enotify.php:203 +#: ../../include/enotify.php:205 msgid "Name:" msgstr "" -#: ../../include/enotify.php:204 +#: ../../include/enotify.php:206 msgid "Photo:" msgstr "" -#: ../../include/enotify.php:207 +#: ../../include/enotify.php:209 #, php-format msgid "Please visit %s to approve or reject the suggestion." msgstr "" @@ -8064,15 +8198,15 @@ msgstr "" msgid "following" msgstr "" -#: ../../include/items.php:3211 +#: ../../include/items.php:3217 msgid "A new person is sharing with you at " msgstr "" -#: ../../include/items.php:3211 +#: ../../include/items.php:3217 msgid "You have a new follower at " msgstr "" -#: ../../include/items.php:3880 +#: ../../include/items.php:3886 msgid "Archives" msgstr "" @@ -8166,34 +8300,34 @@ msgstr "" msgid "stopped following" msgstr "" -#: ../../include/Contact.php:220 ../../include/conversation.php:966 +#: ../../include/Contact.php:220 ../../include/conversation.php:1002 msgid "Poke" msgstr "" -#: ../../include/Contact.php:221 ../../include/conversation.php:960 +#: ../../include/Contact.php:221 ../../include/conversation.php:996 msgid "View Status" msgstr "" -#: ../../include/Contact.php:222 ../../include/conversation.php:961 +#: ../../include/Contact.php:222 ../../include/conversation.php:997 msgid "View Profile" msgstr "" -#: ../../include/Contact.php:223 ../../include/conversation.php:962 +#: ../../include/Contact.php:223 ../../include/conversation.php:998 msgid "View Photos" msgstr "" #: ../../include/Contact.php:224 ../../include/Contact.php:237 -#: ../../include/conversation.php:963 +#: ../../include/conversation.php:999 msgid "Network Posts" msgstr "" #: ../../include/Contact.php:225 ../../include/Contact.php:237 -#: ../../include/conversation.php:964 +#: ../../include/conversation.php:1000 msgid "Edit Contact" msgstr "" #: ../../include/Contact.php:226 ../../include/Contact.php:237 -#: ../../include/conversation.php:965 +#: ../../include/conversation.php:1001 msgid "Send PM" msgstr "" @@ -8202,115 +8336,115 @@ msgstr "" msgid "%1$s poked %2$s" msgstr "" -#: ../../include/conversation.php:267 +#: ../../include/conversation.php:281 msgid "post/item" msgstr "" -#: ../../include/conversation.php:268 +#: ../../include/conversation.php:282 #, php-format msgid "%1$s marked %2$s's %3$s as favorite" msgstr "" -#: ../../include/conversation.php:866 +#: ../../include/conversation.php:902 msgid "Delete Selected Items" msgstr "" -#: ../../include/conversation.php:1024 +#: ../../include/conversation.php:1060 #, php-format msgid "%s likes this." msgstr "" -#: ../../include/conversation.php:1024 +#: ../../include/conversation.php:1060 #, php-format msgid "%s doesn't like this." msgstr "" -#: ../../include/conversation.php:1028 +#: ../../include/conversation.php:1064 #, php-format msgid "%2$d people like this." msgstr "" -#: ../../include/conversation.php:1030 +#: ../../include/conversation.php:1066 #, php-format msgid "%2$d people don't like this." msgstr "" -#: ../../include/conversation.php:1036 +#: ../../include/conversation.php:1072 msgid "and" msgstr "" -#: ../../include/conversation.php:1039 +#: ../../include/conversation.php:1075 #, php-format msgid ", and %d other people" msgstr "" -#: ../../include/conversation.php:1040 +#: ../../include/conversation.php:1076 #, php-format msgid "%s like this." msgstr "" -#: ../../include/conversation.php:1040 +#: ../../include/conversation.php:1076 #, php-format msgid "%s don't like this." msgstr "" -#: ../../include/conversation.php:1064 ../../include/conversation.php:1081 +#: ../../include/conversation.php:1100 ../../include/conversation.php:1117 msgid "Visible to everybody" msgstr "" -#: ../../include/conversation.php:1066 ../../include/conversation.php:1083 +#: ../../include/conversation.php:1102 ../../include/conversation.php:1119 msgid "Please enter a video link/URL:" msgstr "" -#: ../../include/conversation.php:1067 ../../include/conversation.php:1084 +#: ../../include/conversation.php:1103 ../../include/conversation.php:1120 msgid "Please enter an audio link/URL:" msgstr "" -#: ../../include/conversation.php:1068 ../../include/conversation.php:1085 +#: ../../include/conversation.php:1104 ../../include/conversation.php:1121 msgid "Tag term:" msgstr "" -#: ../../include/conversation.php:1070 ../../include/conversation.php:1087 +#: ../../include/conversation.php:1106 ../../include/conversation.php:1123 msgid "Where are you right now?" msgstr "" -#: ../../include/conversation.php:1130 +#: ../../include/conversation.php:1166 msgid "upload photo" msgstr "" -#: ../../include/conversation.php:1132 +#: ../../include/conversation.php:1168 msgid "attach file" msgstr "" -#: ../../include/conversation.php:1134 +#: ../../include/conversation.php:1170 msgid "web link" msgstr "" -#: ../../include/conversation.php:1135 +#: ../../include/conversation.php:1171 msgid "Insert video link" msgstr "" -#: ../../include/conversation.php:1136 +#: ../../include/conversation.php:1172 msgid "video link" msgstr "" -#: ../../include/conversation.php:1137 +#: ../../include/conversation.php:1173 msgid "Insert audio link" msgstr "" -#: ../../include/conversation.php:1138 +#: ../../include/conversation.php:1174 msgid "audio link" msgstr "" -#: ../../include/conversation.php:1140 +#: ../../include/conversation.php:1176 msgid "set location" msgstr "" -#: ../../include/conversation.php:1142 +#: ../../include/conversation.php:1178 msgid "clear location" msgstr "" -#: ../../include/conversation.php:1149 +#: ../../include/conversation.php:1185 msgid "permissions" msgstr "" @@ -8326,96 +8460,96 @@ msgstr "" msgid "This action is not available under your subscription plan." msgstr "" -#: ../../boot.php:568 +#: ../../boot.php:582 msgid "Delete this item?" msgstr "" -#: ../../boot.php:571 +#: ../../boot.php:585 msgid "show fewer" msgstr "" -#: ../../boot.php:774 +#: ../../boot.php:792 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: ../../boot.php:776 +#: ../../boot.php:794 #, php-format msgid "Update Error at %s" msgstr "" -#: ../../boot.php:877 +#: ../../boot.php:895 msgid "Create a New Account" msgstr "" -#: ../../boot.php:901 +#: ../../boot.php:923 msgid "Nickname or Email address: " msgstr "" -#: ../../boot.php:902 +#: ../../boot.php:924 msgid "Password: " msgstr "" -#: ../../boot.php:905 +#: ../../boot.php:927 msgid "Or login using OpenID: " msgstr "" -#: ../../boot.php:911 +#: ../../boot.php:933 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:1078 +#: ../../boot.php:1100 msgid "Edit profile" msgstr "" -#: ../../boot.php:1138 +#: ../../boot.php:1160 msgid "Message" msgstr "" -#: ../../boot.php:1260 ../../boot.php:1346 +#: ../../boot.php:1282 ../../boot.php:1368 msgid "g A l F d" msgstr "" -#: ../../boot.php:1261 ../../boot.php:1347 +#: ../../boot.php:1283 ../../boot.php:1369 msgid "F d" msgstr "" -#: ../../boot.php:1306 ../../boot.php:1387 +#: ../../boot.php:1328 ../../boot.php:1409 msgid "[today]" msgstr "" -#: ../../boot.php:1318 +#: ../../boot.php:1340 msgid "Birthday Reminders" msgstr "" -#: ../../boot.php:1319 +#: ../../boot.php:1341 msgid "Birthdays this week:" msgstr "" -#: ../../boot.php:1380 +#: ../../boot.php:1402 msgid "[No description]" msgstr "" -#: ../../boot.php:1398 +#: ../../boot.php:1420 msgid "Event Reminders" msgstr "" -#: ../../boot.php:1399 +#: ../../boot.php:1421 msgid "Events this week:" msgstr "" -#: ../../boot.php:1613 +#: ../../boot.php:1638 msgid "Status Messages and Posts" msgstr "" -#: ../../boot.php:1620 +#: ../../boot.php:1645 msgid "Profile Details" msgstr "" -#: ../../boot.php:1637 +#: ../../boot.php:1662 msgid "Events and Calendar" msgstr "" -#: ../../boot.php:1644 +#: ../../boot.php:1669 msgid "Only You Can See This" msgstr "" diff --git a/view/admin_site.tpl b/view/admin_site.tpl index 3ca03262d4..6564565f7e 100644 --- a/view/admin_site.tpl +++ b/view/admin_site.tpl @@ -6,6 +6,7 @@ autoDimensions: false, onStart: function(){ var theme = $("#id_theme :selected").val(); + var theme_mobile = $("#id_theme_mobile :selected").val(); $("#cnftheme").attr('href',"$baseurl/admin/themes/"+theme); }, onComplete: function(){ @@ -44,6 +45,7 @@ {{ inc field_textarea.tpl with $field=$banner }}{{ endinc }} {{ inc field_select.tpl with $field=$language }}{{ endinc }} {{ inc field_select.tpl with $field=$theme }}{{ endinc }} + {{ inc field_select.tpl with $field=$theme_mobile }}{{ endinc }} {{ inc field_select.tpl with $field=$ssl_policy }}{{ endinc }}
    @@ -60,6 +62,8 @@

    $upload

    {{ inc field_input.tpl with $field=$maximagesize }}{{ endinc }} + {{ inc field_input.tpl with $field=$maximagelength }}{{ endinc }} + {{ inc field_input.tpl with $field=$jpegimagequality }}{{ endinc }}

    $corporate

    {{ inc field_input.tpl with $field=$allowed_sites }}{{ endinc }} @@ -71,6 +75,8 @@ {{ inc field_checkbox.tpl with $field=$diaspora_enabled }}{{ endinc }} {{ inc field_checkbox.tpl with $field=$dfrn_only }}{{ endinc }} {{ inc field_input.tpl with $field=$global_directory }}{{ endinc }} + {{ inc field_checkbox.tpl with $field=$thread_allow }}{{ endinc }} + {{ inc field_checkbox.tpl with $field=$newuser_public }}{{ endinc }}
    diff --git a/view/birthdays_reminder.tpl b/view/birthdays_reminder.tpl index 8db7d22f4b..971680a8cc 100644 --- a/view/birthdays_reminder.tpl +++ b/view/birthdays_reminder.tpl @@ -3,7 +3,7 @@ {{ endif }} diff --git a/view/comment_item.tpl b/view/comment_item.tpl index a1d4e1043a..98173aa306 100644 --- a/view/comment_item.tpl +++ b/view/comment_item.tpl @@ -1,5 +1,10 @@
    -
    + {{ if $threaded }} + $comment + + {{ else }} + + {{ endif }} diff --git a/view/de/messages.po b/view/de/messages.po index 98ab65d61b..7ca3b565ff 100644 --- a/view/de/messages.po +++ b/view/de/messages.po @@ -8,21 +8,23 @@ # Fabian Dost , 2012. # , 2012. # , 2012. +# Hauke Zühl , 2012. # , 2011, 2012. # , 2012. # , 2012. # Martin Schmitt , 2012. +# Oliver , 2012. # , 2011, 2012. -# , 2011, 2012. +# , 2011-2012. # , 2011. msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n" -"POT-Creation-Date: 2012-06-17 10:00-0700\n" -"PO-Revision-Date: 2012-06-18 22:04+0000\n" -"Last-Translator: Fabian Dost \n" -"Language-Team: German (http://www.transifex.net/projects/p/friendica/language/de/)\n" +"POT-Creation-Date: 2012-08-28 10:00-0700\n" +"PO-Revision-Date: 2012-08-31 23:04+0000\n" +"Last-Translator: zottel \n" +"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -47,28 +49,30 @@ msgid "Contact update failed." msgstr "Konnte den Kontakt nicht aktualisieren." #: ../../mod/crepair.php:115 ../../mod/wall_attach.php:44 -#: ../../mod/fsuggest.php:78 ../../mod/events.php:138 ../../mod/api.php:26 -#: ../../mod/api.php:31 ../../mod/photos.php:133 ../../mod/photos.php:928 -#: ../../mod/editpost.php:10 ../../mod/install.php:151 -#: ../../mod/notifications.php:66 ../../mod/contacts.php:145 -#: ../../mod/settings.php:106 ../../mod/settings.php:537 -#: ../../mod/settings.php:542 ../../mod/manage.php:86 ../../mod/network.php:6 +#: ../../mod/fsuggest.php:78 ../../mod/events.php:140 ../../mod/api.php:26 +#: ../../mod/api.php:31 ../../mod/photos.php:116 ../../mod/photos.php:938 +#: ../../mod/editpost.php:10 ../../mod/install.php:151 ../../mod/poke.php:135 +#: ../../mod/notifications.php:66 ../../mod/contacts.php:139 +#: ../../mod/settings.php:86 ../../mod/settings.php:519 +#: ../../mod/settings.php:524 ../../mod/manage.php:86 ../../mod/network.php:6 #: ../../mod/notes.php:20 ../../mod/wallmessage.php:9 #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33 #: ../../mod/group.php:19 ../../mod/viewcontacts.php:22 -#: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:124 -#: ../../mod/item.php:140 ../../mod/profile_photo.php:19 -#: ../../mod/profile_photo.php:141 ../../mod/profile_photo.php:152 -#: ../../mod/profile_photo.php:165 ../../mod/message.php:45 -#: ../../mod/message.php:97 ../../mod/allfriends.php:9 -#: ../../mod/nogroup.php:25 ../../mod/wall_upload.php:53 -#: ../../mod/follow.php:9 ../../mod/display.php:138 ../../mod/profiles.php:7 -#: ../../mod/profiles.php:385 ../../mod/delegate.php:6 +#: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:126 +#: ../../mod/item.php:142 ../../mod/mood.php:114 +#: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:142 +#: ../../mod/profile_photo.php:153 ../../mod/profile_photo.php:166 +#: ../../mod/message.php:38 ../../mod/message.php:168 +#: ../../mod/allfriends.php:9 ../../mod/nogroup.php:25 +#: ../../mod/wall_upload.php:53 ../../mod/follow.php:9 +#: ../../mod/display.php:131 ../../mod/profiles.php:7 +#: ../../mod/profiles.php:413 ../../mod/delegate.php:6 #: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81 -#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:507 -#: ../../addon/dav/layout.fnk.php:353 ../../include/items.php:3387 -#: ../../index.php:299 +#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510 +#: ../../addon/facebook/facebook.php:516 +#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3819 +#: ../../index.php:315 msgid "Permission denied." msgstr "Zugriff verweigert." @@ -85,7 +89,7 @@ msgstr "Kontakteinstellungen reparieren" 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." +msgstr "ACHTUNG: Das sind Experten-Einstellungen! Wenn du etwas Falsches eingibst, funktioniert die Kommunikation mit diesem Kontakt evtl. nicht mehr." #: ../../mod/crepair.php:138 msgid "" @@ -97,8 +101,8 @@ msgstr "Bitte nutze den Zurück-Button deines Browsers jetzt, w msgid "Return to contact editor" msgstr "Zurück zum Kontakteditor" -#: ../../mod/crepair.php:148 ../../mod/settings.php:557 -#: ../../mod/settings.php:583 ../../mod/admin.php:659 ../../mod/admin.php:668 +#: ../../mod/crepair.php:148 ../../mod/settings.php:539 +#: ../../mod/settings.php:565 ../../mod/admin.php:679 ../../mod/admin.php:688 msgid "Name" msgstr "Name" @@ -135,31 +139,37 @@ msgid "New photo from this URL" msgstr "Neues Foto von dieser URL" #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107 -#: ../../mod/events.php:428 ../../mod/photos.php:963 ../../mod/photos.php:1021 -#: ../../mod/photos.php:1266 ../../mod/photos.php:1306 -#: ../../mod/photos.php:1346 ../../mod/photos.php:1377 +#: ../../mod/events.php:439 ../../mod/photos.php:971 ../../mod/photos.php:1042 +#: ../../mod/photos.php:1285 ../../mod/photos.php:1325 +#: ../../mod/photos.php:1366 ../../mod/photos.php:1398 #: ../../mod/install.php:246 ../../mod/install.php:284 -#: ../../mod/localtime.php:45 ../../mod/contacts.php:343 -#: ../../mod/settings.php:555 ../../mod/settings.php:701 -#: ../../mod/settings.php:762 ../../mod/settings.php:969 -#: ../../mod/group.php:85 ../../mod/message.php:216 ../../mod/admin.php:420 -#: ../../mod/admin.php:656 ../../mod/admin.php:792 ../../mod/admin.php:991 -#: ../../mod/admin.php:1078 ../../mod/profiles.php:554 -#: ../../mod/invite.php:119 ../../addon/facebook/facebook.php:609 -#: ../../addon/snautofollow/snautofollow.php:64 +#: ../../mod/localtime.php:45 ../../mod/poke.php:199 ../../mod/content.php:691 +#: ../../mod/contacts.php:341 ../../mod/settings.php:537 +#: ../../mod/settings.php:691 ../../mod/settings.php:752 +#: ../../mod/settings.php:958 ../../mod/group.php:85 ../../mod/mood.php:137 +#: ../../mod/message.php:294 ../../mod/message.php:478 ../../mod/admin.php:435 +#: ../../mod/admin.php:676 ../../mod/admin.php:812 ../../mod/admin.php:1011 +#: ../../mod/admin.php:1098 ../../mod/profiles.php:583 +#: ../../mod/invite.php:119 ../../addon/fromgplus/fromgplus.php:40 +#: ../../addon/facebook/facebook.php:619 +#: ../../addon/snautofollow/snautofollow.php:64 ../../addon/bg/bg.php:90 #: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:93 -#: ../../addon/nsfw/nsfw.php:57 ../../addon/planets/planets.php:158 +#: ../../addon/nsfw/nsfw.php:57 ../../addon/page/page.php:210 +#: ../../addon/planets/planets.php:158 #: ../../addon/uhremotestorage/uhremotestorage.php:89 #: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93 #: ../../addon/drpost/drpost.php:110 ../../addon/startpage/startpage.php:92 #: ../../addon/geonames/geonames.php:187 ../../addon/oembed.old/oembed.php:41 +#: ../../addon/forumlist/forumlist.php:169 #: ../../addon/impressum/impressum.php:82 #: ../../addon/notimeline/notimeline.php:64 ../../addon/blockem/blockem.php:57 #: ../../addon/qcomment/qcomment.php:61 #: ../../addon/openstreetmap/openstreetmap.php:70 -#: ../../addon/libertree/libertree.php:90 ../../addon/mathjax/mathjax.php:42 -#: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:98 -#: ../../addon/gravatar/gravatar.php:86 +#: ../../addon/group_text/group_text.php:84 +#: ../../addon/libravatar/libravatar.php:99 +#: ../../addon/libertree/libertree.php:90 ../../addon/altpager/altpager.php:87 +#: ../../addon/mathjax/mathjax.php:42 ../../addon/editplain/editplain.php:84 +#: ../../addon/blackout/blackout.php:98 ../../addon/gravatar/gravatar.php:95 #: ../../addon/pageheader/pageheader.php:55 ../../addon/ijpost/ijpost.php:93 #: ../../addon/jappixmini/jappixmini.php:302 #: ../../addon/statusnet/statusnet.php:278 @@ -167,18 +177,18 @@ msgstr "Neues Foto von dieser URL" #: ../../addon/statusnet/statusnet.php:318 #: ../../addon/statusnet/statusnet.php:325 #: ../../addon/statusnet/statusnet.php:353 -#: ../../addon/statusnet/statusnet.php:561 ../../addon/tumblr/tumblr.php:90 +#: ../../addon/statusnet/statusnet.php:576 ../../addon/tumblr/tumblr.php:90 #: ../../addon/numfriends/numfriends.php:85 ../../addon/gnot/gnot.php:88 #: ../../addon/wppost/wppost.php:110 ../../addon/showmore/showmore.php:48 #: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180 -#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:381 +#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:394 #: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102 #: ../../addon/posterous/posterous.php:103 #: ../../view/theme/cleanzero/config.php:80 #: ../../view/theme/diabook/theme.php:757 #: ../../view/theme/diabook/config.php:190 #: ../../view/theme/quattro/config.php:52 ../../view/theme/dispy/config.php:70 -#: ../../include/conversation.php:580 +#: ../../include/conversation.php:560 msgid "Submit" msgstr "Senden" @@ -186,16 +196,16 @@ msgstr "Senden" msgid "Help:" msgstr "Hilfe:" -#: ../../mod/help.php:34 ../../addon/dav/layout.fnk.php:116 +#: ../../mod/help.php:34 ../../addon/dav/friendica/layout.fnk.php:225 #: ../../include/nav.php:86 msgid "Help" msgstr "Hilfe" -#: ../../mod/help.php:38 ../../index.php:218 +#: ../../mod/help.php:38 ../../index.php:224 msgid "Not Found" msgstr "Nicht gefunden" -#: ../../mod/help.php:41 ../../index.php:221 +#: ../../mod/help.php:41 ../../index.php:227 msgid "Page not found." msgstr "Seite nicht gefunden." @@ -204,7 +214,7 @@ msgstr "Seite nicht gefunden." msgid "File exceeds size limit of %d" msgstr "Die Datei ist größer als das erlaubte Limit von %d" -#: ../../mod/wall_attach.php:86 ../../mod/wall_attach.php:97 +#: ../../mod/wall_attach.php:99 ../../mod/wall_attach.php:110 msgid "File upload failed." msgstr "Hochladen der Datei fehlgeschlagen." @@ -221,85 +231,94 @@ msgstr "Kontakte vorschlagen" msgid "Suggest a friend for %s" msgstr "Schlage %s einen Kontakt vor" -#: ../../mod/events.php:65 -msgid "Event description and start time are required." -msgstr "Ereignisbeschreibung und Startzeit sind erforderlich." +#: ../../mod/events.php:66 +msgid "Event title and start time are required." +msgstr "Der Veranstaltungstitel und die Anfangszeit müssen angegeben werden." -#: ../../mod/events.php:258 +#: ../../mod/events.php:263 msgid "l, F j" msgstr "l, F j" -#: ../../mod/events.php:280 +#: ../../mod/events.php:285 msgid "Edit event" msgstr "Veranstaltung bearbeiten" -#: ../../mod/events.php:300 ../../include/text.php:1065 +#: ../../mod/events.php:307 ../../include/text.php:1147 msgid "link to source" msgstr "Link zum Originalbeitrag" -#: ../../mod/events.php:324 ../../view/theme/diabook/theme.php:131 -#: ../../include/nav.php:52 ../../boot.php:1529 +#: ../../mod/events.php:331 ../../view/theme/diabook/theme.php:131 +#: ../../include/nav.php:52 ../../boot.php:1659 msgid "Events" msgstr "Veranstaltungen" -#: ../../mod/events.php:325 +#: ../../mod/events.php:332 msgid "Create New Event" msgstr "Neue Veranstaltung erstellen" -#: ../../mod/events.php:326 ../../addon/dav/layout.fnk.php:154 +#: ../../mod/events.php:333 ../../addon/dav/friendica/layout.fnk.php:263 msgid "Previous" msgstr "Vorherige" -#: ../../mod/events.php:327 ../../mod/install.php:205 -#: ../../addon/dav/layout.fnk.php:157 +#: ../../mod/events.php:334 ../../mod/install.php:205 +#: ../../addon/dav/friendica/layout.fnk.php:266 msgid "Next" msgstr "Nächste" -#: ../../mod/events.php:399 +#: ../../mod/events.php:407 msgid "hour:minute" msgstr "Stunde:Minute" -#: ../../mod/events.php:408 +#: ../../mod/events.php:417 msgid "Event details" msgstr "Veranstaltungsdetails" -#: ../../mod/events.php:409 +#: ../../mod/events.php:418 #, php-format -msgid "Format is %s %s. Starting date and Description are required." -msgstr "Format ist %s %s. Anfangsdatum und Beschreibung sind notwendig." +msgid "Format is %s %s. Starting date and Title are required." +msgstr "Das Format ist %s %s. Beginnzeitpunkt und Titel werden benötigt." -#: ../../mod/events.php:411 +#: ../../mod/events.php:420 msgid "Event Starts:" msgstr "Veranstaltungsbeginn:" -#: ../../mod/events.php:414 +#: ../../mod/events.php:420 ../../mod/events.php:434 +msgid "Required" +msgstr "Benötigt" + +#: ../../mod/events.php:423 msgid "Finish date/time is not known or not relevant" msgstr "Enddatum/-zeit ist nicht bekannt oder nicht relevant" -#: ../../mod/events.php:416 +#: ../../mod/events.php:425 msgid "Event Finishes:" msgstr "Veranstaltungsende:" -#: ../../mod/events.php:419 +#: ../../mod/events.php:428 msgid "Adjust for viewer timezone" msgstr "An Zeitzone des Betrachters anpassen" -#: ../../mod/events.php:421 +#: ../../mod/events.php:430 msgid "Description:" msgstr "Beschreibung" -#: ../../mod/events.php:423 ../../include/event.php:37 -#: ../../include/bb2diaspora.php:265 ../../boot.php:1109 +#: ../../mod/events.php:432 ../../mod/directory.php:132 +#: ../../include/event.php:40 ../../include/bb2diaspora.php:455 +#: ../../boot.php:1208 msgid "Location:" msgstr "Ort:" -#: ../../mod/events.php:425 +#: ../../mod/events.php:434 +msgid "Title:" +msgstr "Titel:" + +#: ../../mod/events.php:436 msgid "Share this event" msgstr "Veranstaltung teilen" #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 -#: ../../mod/dfrn_request.php:845 ../../mod/settings.php:556 -#: ../../mod/settings.php:582 ../../addon/js_upload/js_upload.php:45 +#: ../../mod/dfrn_request.php:845 ../../mod/settings.php:538 +#: ../../mod/settings.php:564 ../../addon/js_upload/js_upload.php:45 msgid "Cancel" msgstr "Abbrechen" @@ -316,6 +335,7 @@ msgid "Select a tag to remove: " msgstr "Wähle ein Tag zum Entfernen aus: " #: ../../mod/tagrm.php:93 ../../mod/delegate.php:130 +#: ../../addon/dav/common/wdcal_edit.inc.php:468 msgid "Remove" msgstr "Entfernen" @@ -343,255 +363,276 @@ msgid "" msgstr "Möchtest du dieser Anwendung den Zugriff auf deine Beiträge und Kontakte, sowie das Erstellen neuer Beiträge in deinem Namen gestatten?" #: ../../mod/api.php:105 ../../mod/dfrn_request.php:833 -#: ../../mod/settings.php:879 ../../mod/settings.php:885 -#: ../../mod/settings.php:893 ../../mod/settings.php:897 -#: ../../mod/settings.php:902 ../../mod/settings.php:908 -#: ../../mod/settings.php:914 ../../mod/settings.php:920 -#: ../../mod/settings.php:956 ../../mod/settings.php:957 -#: ../../mod/settings.php:958 ../../mod/settings.php:959 -#: ../../mod/settings.php:960 ../../mod/register.php:234 -#: ../../mod/profiles.php:531 +#: ../../mod/settings.php:874 ../../mod/settings.php:880 +#: ../../mod/settings.php:888 ../../mod/settings.php:892 +#: ../../mod/settings.php:897 ../../mod/settings.php:903 +#: ../../mod/settings.php:909 ../../mod/settings.php:915 +#: ../../mod/settings.php:945 ../../mod/settings.php:946 +#: ../../mod/settings.php:947 ../../mod/settings.php:948 +#: ../../mod/settings.php:949 ../../mod/register.php:234 +#: ../../mod/profiles.php:563 msgid "Yes" msgstr "Ja" #: ../../mod/api.php:106 ../../mod/dfrn_request.php:834 -#: ../../mod/settings.php:879 ../../mod/settings.php:885 -#: ../../mod/settings.php:893 ../../mod/settings.php:897 -#: ../../mod/settings.php:902 ../../mod/settings.php:908 -#: ../../mod/settings.php:914 ../../mod/settings.php:920 -#: ../../mod/settings.php:956 ../../mod/settings.php:957 -#: ../../mod/settings.php:958 ../../mod/settings.php:959 -#: ../../mod/settings.php:960 ../../mod/register.php:235 -#: ../../mod/profiles.php:532 +#: ../../mod/settings.php:874 ../../mod/settings.php:880 +#: ../../mod/settings.php:888 ../../mod/settings.php:892 +#: ../../mod/settings.php:897 ../../mod/settings.php:903 +#: ../../mod/settings.php:909 ../../mod/settings.php:915 +#: ../../mod/settings.php:945 ../../mod/settings.php:946 +#: ../../mod/settings.php:947 ../../mod/settings.php:948 +#: ../../mod/settings.php:949 ../../mod/register.php:235 +#: ../../mod/profiles.php:564 msgid "No" msgstr "Nein" -#: ../../mod/photos.php:44 ../../boot.php:1523 +#: ../../mod/photos.php:46 ../../boot.php:1652 msgid "Photo Albums" msgstr "Fotoalben" -#: ../../mod/photos.php:52 ../../mod/photos.php:154 ../../mod/photos.php:942 -#: ../../mod/photos.php:1013 ../../mod/photos.php:1028 -#: ../../mod/photos.php:1455 ../../mod/photos.php:1467 +#: ../../mod/photos.php:54 ../../mod/photos.php:137 ../../mod/photos.php:952 +#: ../../mod/photos.php:1034 ../../mod/photos.php:1049 +#: ../../mod/photos.php:1477 ../../mod/photos.php:1489 #: ../../addon/communityhome/communityhome.php:110 #: ../../view/theme/diabook/theme.php:598 msgid "Contact Photos" msgstr "Kontaktbilder" -#: ../../mod/photos.php:59 ../../mod/photos.php:1038 ../../mod/photos.php:1505 +#: ../../mod/photos.php:61 ../../mod/photos.php:1059 ../../mod/photos.php:1527 msgid "Upload New Photos" msgstr "Weitere Fotos hochladen" -#: ../../mod/photos.php:70 ../../mod/settings.php:21 +#: ../../mod/photos.php:74 ../../mod/settings.php:23 msgid "everybody" msgstr "jeder" -#: ../../mod/photos.php:143 +#: ../../mod/photos.php:126 msgid "Contact information unavailable" msgstr "Kontaktinformationen nicht verfügbar" -#: ../../mod/photos.php:154 ../../mod/photos.php:656 ../../mod/photos.php:1013 -#: ../../mod/photos.php:1028 ../../mod/profile_photo.php:60 +#: ../../mod/photos.php:137 ../../mod/photos.php:641 ../../mod/photos.php:1034 +#: ../../mod/photos.php:1049 ../../mod/profile_photo.php:60 #: ../../mod/profile_photo.php:67 ../../mod/profile_photo.php:74 -#: ../../mod/profile_photo.php:176 ../../mod/profile_photo.php:254 -#: ../../mod/profile_photo.php:263 +#: ../../mod/profile_photo.php:177 ../../mod/profile_photo.php:261 +#: ../../mod/profile_photo.php:270 #: ../../addon/communityhome/communityhome.php:111 -#: ../../view/theme/diabook/theme.php:599 ../../include/user.php:298 -#: ../../include/user.php:305 ../../include/user.php:312 +#: ../../view/theme/diabook/theme.php:599 ../../include/user.php:304 +#: ../../include/user.php:311 ../../include/user.php:318 msgid "Profile Photos" msgstr "Profilbilder" -#: ../../mod/photos.php:164 +#: ../../mod/photos.php:147 msgid "Album not found." msgstr "Album nicht gefunden." -#: ../../mod/photos.php:182 ../../mod/photos.php:1022 +#: ../../mod/photos.php:165 ../../mod/photos.php:1043 msgid "Delete Album" msgstr "Album löschen" -#: ../../mod/photos.php:245 ../../mod/photos.php:1267 +#: ../../mod/photos.php:228 ../../mod/photos.php:1286 msgid "Delete Photo" msgstr "Foto löschen" -#: ../../mod/photos.php:587 +#: ../../mod/photos.php:572 msgid "was tagged in a" msgstr "wurde getaggt in einem" -#: ../../mod/photos.php:587 ../../mod/like.php:185 ../../mod/tagger.php:70 +#: ../../mod/photos.php:572 ../../mod/like.php:145 ../../mod/tagger.php:70 #: ../../addon/communityhome/communityhome.php:163 -#: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1316 -#: ../../include/diaspora.php:1709 ../../include/conversation.php:53 -#: ../../include/conversation.php:126 +#: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1399 +#: ../../include/diaspora.php:1824 ../../include/conversation.php:114 +#: ../../include/conversation.php:244 msgid "photo" msgstr "Foto" -#: ../../mod/photos.php:587 +#: ../../mod/photos.php:572 msgid "by" msgstr "von" -#: ../../mod/photos.php:692 ../../addon/js_upload/js_upload.php:315 +#: ../../mod/photos.php:677 ../../addon/js_upload/js_upload.php:315 msgid "Image exceeds size limit of " msgstr "Die Bildgröße übersteigt das Limit von " -#: ../../mod/photos.php:700 +#: ../../mod/photos.php:685 msgid "Image file is empty." msgstr "Bilddatei ist leer." -#: ../../mod/photos.php:714 ../../mod/profile_photo.php:126 -#: ../../mod/wall_upload.php:86 +#: ../../mod/photos.php:717 ../../mod/profile_photo.php:126 +#: ../../mod/wall_upload.php:99 msgid "Unable to process image." msgstr "Konnte das Bild nicht bearbeiten." -#: ../../mod/photos.php:734 ../../mod/profile_photo.php:259 -#: ../../mod/wall_upload.php:105 +#: ../../mod/photos.php:744 ../../mod/profile_photo.php:266 +#: ../../mod/wall_upload.php:125 msgid "Image upload failed." msgstr "Hochladen des Bildes gescheitert." -#: ../../mod/photos.php:820 ../../mod/community.php:16 +#: ../../mod/photos.php:830 ../../mod/community.php:16 #: ../../mod/dfrn_request.php:759 ../../mod/viewcontacts.php:17 #: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:29 msgid "Public access denied." msgstr "Öffentlicher Zugriff verweigert." -#: ../../mod/photos.php:830 +#: ../../mod/photos.php:840 msgid "No photos selected" msgstr "Keine Bilder ausgewählt" -#: ../../mod/photos.php:909 +#: ../../mod/photos.php:919 msgid "Access to this item is restricted." msgstr "Zugriff zu diesem Eintrag wurde eingeschränkt." -#: ../../mod/photos.php:970 +#: ../../mod/photos.php:981 +#, 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:984 +#, php-format +msgid "You have used %1$.2f Mbytes of photo storage." +msgstr "Du verwendest %1$.2f Mbyte des Foto-Speichers." + +#: ../../mod/photos.php:990 msgid "Upload Photos" msgstr "Bilder hochladen" -#: ../../mod/photos.php:973 ../../mod/photos.php:1017 +#: ../../mod/photos.php:994 ../../mod/photos.php:1038 msgid "New album name: " msgstr "Name des neuen Albums: " -#: ../../mod/photos.php:974 +#: ../../mod/photos.php:995 msgid "or existing album name: " msgstr "oder existierender Albumname: " -#: ../../mod/photos.php:975 +#: ../../mod/photos.php:996 msgid "Do not show a status post for this upload" msgstr "Keine Status-Mitteilung für diesen Beitrag anzeigen" -#: ../../mod/photos.php:977 ../../mod/photos.php:1262 +#: ../../mod/photos.php:998 ../../mod/photos.php:1281 msgid "Permissions" msgstr "Berechtigungen" -#: ../../mod/photos.php:1032 +#: ../../mod/photos.php:1053 msgid "Edit Album" msgstr "Album bearbeiten" -#: ../../mod/photos.php:1056 ../../mod/photos.php:1488 +#: ../../mod/photos.php:1077 ../../mod/photos.php:1510 msgid "View Photo" msgstr "Fotos betrachten" -#: ../../mod/photos.php:1091 +#: ../../mod/photos.php:1112 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:1093 +#: ../../mod/photos.php:1114 msgid "Photo not available" msgstr "Foto nicht verfügbar" -#: ../../mod/photos.php:1143 +#: ../../mod/photos.php:1164 msgid "View photo" msgstr "Fotos ansehen" -#: ../../mod/photos.php:1143 +#: ../../mod/photos.php:1164 msgid "Edit photo" msgstr "Foto bearbeiten" -#: ../../mod/photos.php:1144 +#: ../../mod/photos.php:1165 msgid "Use as profile photo" msgstr "Als Profilbild verwenden" -#: ../../mod/photos.php:1150 ../../include/conversation.php:490 +#: ../../mod/photos.php:1171 ../../mod/content.php:601 +#: ../../include/conversation.php:395 msgid "Private Message" msgstr "Private Nachricht" -#: ../../mod/photos.php:1172 +#: ../../mod/photos.php:1190 msgid "View Full Size" msgstr "Betrachte Originalgröße" -#: ../../mod/photos.php:1240 +#: ../../mod/photos.php:1258 msgid "Tags: " msgstr "Tags: " -#: ../../mod/photos.php:1243 +#: ../../mod/photos.php:1261 msgid "[Remove any tag]" msgstr "[Tag entfernen]" -#: ../../mod/photos.php:1253 -msgid "Rotate CW" -msgstr "Im Uhrzeigersinn rotieren" +#: ../../mod/photos.php:1271 +msgid "Rotate CW (right)" +msgstr "Drehen US (rechts)" -#: ../../mod/photos.php:1255 +#: ../../mod/photos.php:1272 +msgid "Rotate CCW (left)" +msgstr "Drehen EUS (links)" + +#: ../../mod/photos.php:1274 msgid "New album name" msgstr "Name des neuen Albums" -#: ../../mod/photos.php:1258 +#: ../../mod/photos.php:1277 msgid "Caption" msgstr "Bildunterschrift" -#: ../../mod/photos.php:1260 +#: ../../mod/photos.php:1279 msgid "Add a Tag" msgstr "Tag hinzufügen" -#: ../../mod/photos.php:1264 +#: ../../mod/photos.php:1283 msgid "" "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" -#: ../../mod/photos.php:1284 ../../include/conversation.php:554 +#: ../../mod/photos.php:1303 ../../mod/content.php:665 +#: ../../include/conversation.php:534 msgid "I like this (toggle)" msgstr "Ich mag das (toggle)" -#: ../../mod/photos.php:1285 ../../include/conversation.php:555 +#: ../../mod/photos.php:1304 ../../mod/content.php:666 +#: ../../include/conversation.php:535 msgid "I don't like this (toggle)" msgstr "Ich mag das nicht (toggle)" -#: ../../mod/photos.php:1286 ../../include/conversation.php:989 +#: ../../mod/photos.php:1305 ../../include/conversation.php:1164 msgid "Share" msgstr "Teilen" -#: ../../mod/photos.php:1287 ../../mod/editpost.php:104 -#: ../../mod/wallmessage.php:145 ../../mod/message.php:215 -#: ../../mod/message.php:410 ../../include/conversation.php:371 -#: ../../include/conversation.php:731 ../../include/conversation.php:1008 +#: ../../mod/photos.php:1306 ../../mod/editpost.php:112 +#: ../../mod/content.php:482 ../../mod/content.php:843 +#: ../../mod/wallmessage.php:152 ../../mod/message.php:293 +#: ../../mod/message.php:479 ../../include/conversation.php:628 +#: ../../include/conversation.php:860 ../../include/conversation.php:1183 msgid "Please wait" msgstr "Bitte warten" -#: ../../mod/photos.php:1303 ../../mod/photos.php:1343 -#: ../../mod/photos.php:1374 ../../include/conversation.php:577 +#: ../../mod/photos.php:1322 ../../mod/photos.php:1363 +#: ../../mod/photos.php:1395 ../../mod/content.php:688 +#: ../../include/conversation.php:557 msgid "This is you" msgstr "Das bist du" -#: ../../mod/photos.php:1305 ../../mod/photos.php:1345 -#: ../../mod/photos.php:1376 ../../include/conversation.php:579 -#: ../../boot.php:523 +#: ../../mod/photos.php:1324 ../../mod/photos.php:1365 +#: ../../mod/photos.php:1397 ../../mod/content.php:690 +#: ../../include/conversation.php:559 ../../boot.php:583 msgid "Comment" msgstr "Kommentar" -#: ../../mod/photos.php:1307 ../../mod/editpost.php:125 -#: ../../include/conversation.php:589 ../../include/conversation.php:1026 +#: ../../mod/photos.php:1326 ../../mod/editpost.php:133 +#: ../../mod/content.php:700 ../../include/conversation.php:569 +#: ../../include/conversation.php:1201 msgid "Preview" msgstr "Vorschau" -#: ../../mod/photos.php:1404 ../../mod/settings.php:618 -#: ../../mod/settings.php:699 ../../mod/group.php:168 ../../mod/admin.php:663 -#: ../../include/conversation.php:328 ../../include/conversation.php:609 +#: ../../mod/photos.php:1426 ../../mod/content.php:439 +#: ../../mod/content.php:721 ../../mod/settings.php:600 +#: ../../mod/settings.php:689 ../../mod/group.php:168 ../../mod/admin.php:683 +#: ../../include/conversation.php:409 ../../include/conversation.php:816 msgid "Delete" msgstr "Löschen" -#: ../../mod/photos.php:1494 +#: ../../mod/photos.php:1516 msgid "View Album" msgstr "Album betrachten" -#: ../../mod/photos.php:1503 +#: ../../mod/photos.php:1525 msgid "Recent Photos" msgstr "Neueste Fotos" @@ -604,7 +645,8 @@ msgstr "Nicht verfügbar." msgid "Community" msgstr "Gemeinschaft" -#: ../../mod/community.php:61 ../../mod/search.php:144 +#: ../../mod/community.php:61 ../../mod/community.php:86 +#: ../../mod/search.php:146 ../../mod/search.php:172 msgid "No results." msgstr "Keine Ergebnisse." @@ -648,72 +690,72 @@ msgstr "Beitrag nicht gefunden" msgid "Edit post" msgstr "Beitrag bearbeiten" -#: ../../mod/editpost.php:80 ../../include/conversation.php:975 +#: ../../mod/editpost.php:88 ../../include/conversation.php:1150 msgid "Post to Email" msgstr "An E-Mail senden" -#: ../../mod/editpost.php:95 ../../mod/settings.php:617 -#: ../../include/conversation.php:596 +#: ../../mod/editpost.php:103 ../../mod/content.php:708 +#: ../../mod/settings.php:599 ../../include/conversation.php:400 msgid "Edit" msgstr "Bearbeiten" -#: ../../mod/editpost.php:96 ../../mod/wallmessage.php:143 -#: ../../mod/message.php:213 ../../mod/message.php:408 -#: ../../include/conversation.php:990 +#: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150 +#: ../../mod/message.php:291 ../../mod/message.php:476 +#: ../../include/conversation.php:1165 msgid "Upload photo" msgstr "Foto hochladen" -#: ../../mod/editpost.php:97 ../../include/conversation.php:992 +#: ../../mod/editpost.php:105 ../../include/conversation.php:1167 msgid "Attach file" msgstr "Datei anhängen" -#: ../../mod/editpost.php:98 ../../mod/wallmessage.php:144 -#: ../../mod/message.php:214 ../../mod/message.php:409 -#: ../../include/conversation.php:994 +#: ../../mod/editpost.php:106 ../../mod/wallmessage.php:151 +#: ../../mod/message.php:292 ../../mod/message.php:477 +#: ../../include/conversation.php:1169 msgid "Insert web link" msgstr "einen Link einfügen" -#: ../../mod/editpost.php:99 +#: ../../mod/editpost.php:107 msgid "Insert YouTube video" msgstr "YouTube-Video einfügen" -#: ../../mod/editpost.php:100 +#: ../../mod/editpost.php:108 msgid "Insert Vorbis [.ogg] video" msgstr "Vorbis [.ogg] Video einfügen" -#: ../../mod/editpost.php:101 +#: ../../mod/editpost.php:109 msgid "Insert Vorbis [.ogg] audio" msgstr "Vorbis [.ogg] Audio einfügen" -#: ../../mod/editpost.php:102 ../../include/conversation.php:1000 +#: ../../mod/editpost.php:110 ../../include/conversation.php:1175 msgid "Set your location" msgstr "Deinen Standort festlegen" -#: ../../mod/editpost.php:103 ../../include/conversation.php:1002 +#: ../../mod/editpost.php:111 ../../include/conversation.php:1177 msgid "Clear browser location" msgstr "Browser-Standort leeren" -#: ../../mod/editpost.php:105 ../../include/conversation.php:1009 +#: ../../mod/editpost.php:113 ../../include/conversation.php:1184 msgid "Permission settings" msgstr "Berechtigungseinstellungen" -#: ../../mod/editpost.php:113 ../../include/conversation.php:1018 +#: ../../mod/editpost.php:121 ../../include/conversation.php:1193 msgid "CC: email addresses" msgstr "Cc:-E-Mail-Addressen" -#: ../../mod/editpost.php:114 ../../include/conversation.php:1019 +#: ../../mod/editpost.php:122 ../../include/conversation.php:1194 msgid "Public post" msgstr "Öffentlicher Beitrag" -#: ../../mod/editpost.php:117 ../../include/conversation.php:1005 +#: ../../mod/editpost.php:125 ../../include/conversation.php:1180 msgid "Set title" msgstr "Titel setzen" -#: ../../mod/editpost.php:119 ../../include/conversation.php:1007 +#: ../../mod/editpost.php:127 ../../include/conversation.php:1182 msgid "Categories (comma-separated list)" msgstr "Kategorien (kommasepariert)" -#: ../../mod/editpost.php:120 ../../include/conversation.php:1021 +#: ../../mod/editpost.php:128 ../../include/conversation.php:1196 msgid "Example: bob@example.com, mary@example.com" msgstr "Z.B.: bob@example.com, mary@example.com" @@ -798,7 +840,7 @@ msgstr "Ungültige Profil-URL." msgid "Disallowed profile URL." msgstr "Nicht erlaubte Profil-URL." -#: ../../mod/dfrn_request.php:570 ../../mod/contacts.php:122 +#: ../../mod/dfrn_request.php:570 ../../mod/contacts.php:116 msgid "Failed to update contact record." msgstr "Aktualisierung der Kontaktdaten fehlgeschlagen." @@ -818,7 +860,7 @@ msgstr "Momentan bist du mit einer anderen Identität angemeldet. Bitte melde Di #: ../../mod/dfrn_request.php:669 msgid "Hide this contact" -msgstr "Verberge diese Kontakt" +msgstr "Verberge diesen Kontakt" #: ../../mod/dfrn_request.php:672 #, php-format @@ -834,7 +876,7 @@ msgstr "Bitte bestätige deine Kontaktanfrage bei %s." msgid "Confirm" msgstr "Bestätigen" -#: ../../mod/dfrn_request.php:715 ../../include/items.php:2783 +#: ../../mod/dfrn_request.php:715 ../../include/items.php:3210 msgid "[Name Withheld]" msgstr "[Name unterdrückt]" @@ -886,7 +928,7 @@ msgstr "Friendica" msgid "StatusNet/Federated Social Web" msgstr "StatusNet/Federated Social Web" -#: ../../mod/dfrn_request.php:839 ../../mod/settings.php:652 +#: ../../mod/dfrn_request.php:839 ../../mod/settings.php:634 #: ../../include/contact_selectors.php:80 msgid "Diaspora" msgstr "Diaspora" @@ -920,7 +962,7 @@ msgstr "Konnte Tabelle nicht erstellen." #: ../../mod/install.php:133 msgid "Your Friendica site database has been installed." -msgstr "Die Datenbank deiner Friendica Seite wurde installiert." +msgstr "Die Datenbank deiner Friendicaseite wurde installiert." #: ../../mod/install.php:138 msgid "" @@ -1016,7 +1058,7 @@ msgstr "Pfad zu PHP" msgid "" "Enter full path to php executable. You can leave this blank to continue the " "installation." -msgstr "Gib den kompletten Pfad zur ausführbaren Datei von PHP an. Du kannst diesen Feld auch frei lassen und mit der Installation fortfahren." +msgstr "Gib den kompletten Pfad zur ausführbaren Datei von PHP an. Du kannst dieses Feld auch frei lassen und mit der Installation fortfahren." #: ../../mod/install.php:328 msgid "Command line PHP" @@ -1083,7 +1125,7 @@ msgstr "Fehler: Das Apache-Modul mod-rewrite wird benötigt, es ist allerdings n #: ../../mod/install.php:388 msgid "Error: libCURL PHP module required but not installed." -msgstr "Fehler: Das libCURL PHP Modul wird benötigt ist aber nicht installiert." +msgstr "Fehler: Das libCURL PHP Modul wird benötigt, ist aber nicht installiert." #: ../../mod/install.php:392 msgid "" @@ -1112,7 +1154,7 @@ msgstr "Der Installationswizard muss in der Lage sein, eine Datei im Stammverzei msgid "" "This is most often a permission setting, as the web server may not be able " "to write files in your folder - even if you can." -msgstr "In den meisten Fällen ist dies ein Problem mit den Schreibrechten, der Webserver könnte keine Schreiberlaubnis haben, selbst wenn du sie hast." +msgstr "In den meisten Fällen ist dies ein Problem mit den Schreibrechten. Der Webserver könnte keine Schreiberlaubnis haben, selbst wenn du sie hast." #: ../../mod/install.php:423 msgid "" @@ -1161,7 +1203,7 @@ msgid "" msgstr "WICHTIG: Du musst [manuell] einen Cronjob (o.ä.) für den Poller einrichten." #: ../../mod/localtime.php:12 ../../include/event.php:11 -#: ../../include/bb2diaspora.php:243 +#: ../../include/bb2diaspora.php:433 msgid "l F d, Y \\@ g:i A" msgstr "l F d, Y \\@ g:i A" @@ -1194,6 +1236,26 @@ msgstr "Umgerechnete lokale Zeit: %s" msgid "Please select your timezone:" msgstr "Bitte wähle deine Zeitzone." +#: ../../mod/poke.php:192 +msgid "Poke/Prod" +msgstr "Anstupsen etc." + +#: ../../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/match.php:12 msgid "Profile Match" msgstr "Profilübereinstimmungen" @@ -1207,7 +1269,7 @@ msgid "is interested in:" msgstr "ist interessiert an:" #: ../../mod/match.php:58 ../../mod/suggest.php:59 -#: ../../include/contact_widgets.php:9 ../../boot.php:1053 +#: ../../include/contact_widgets.php:9 ../../boot.php:1152 msgid "Connect" msgstr "Verbinden" @@ -1223,6 +1285,138 @@ msgstr "Entfernte Privatsphäreneinstellungen nicht verfügbar." msgid "Visible to:" msgstr "Sichtbar für:" +#: ../../mod/content.php:119 ../../mod/network.php:436 +msgid "No such group" +msgstr "Es gibt keine solche Gruppe" + +#: ../../mod/content.php:130 ../../mod/network.php:447 +msgid "Group is empty" +msgstr "Gruppe ist leer" + +#: ../../mod/content.php:134 ../../mod/network.php:451 +msgid "Group: " +msgstr "Gruppe: " + +#: ../../mod/content.php:438 ../../mod/content.php:720 +#: ../../include/conversation.php:408 ../../include/conversation.php:815 +msgid "Select" +msgstr "Auswählen" + +#: ../../mod/content.php:455 ../../mod/content.php:813 +#: ../../mod/content.php:814 ../../include/conversation.php:596 +#: ../../include/conversation.php:597 ../../include/conversation.php:832 +#, php-format +msgid "View %s's profile @ %s" +msgstr "Das Profil von %s auf %s betrachten." + +#: ../../mod/content.php:465 ../../mod/content.php:825 +#: ../../include/conversation.php:610 ../../include/conversation.php:843 +#, php-format +msgid "%s from %s" +msgstr "%s von %s" + +#: ../../mod/content.php:480 ../../include/conversation.php:858 +msgid "View in context" +msgstr "Im Zusammenhang betrachten" + +#: ../../mod/content.php:586 ../../include/conversation.php:637 +#, php-format +msgid "%d comment" +msgid_plural "%d comments" +msgstr[0] "%d Kommentar" +msgstr[1] "%d Kommentare" + +#: ../../mod/content.php:587 ../../addon/page/page.php:76 +#: ../../addon/page/page.php:110 ../../addon/showmore/showmore.php:119 +#: ../../include/contact_widgets.php:188 ../../include/conversation.php:638 +#: ../../boot.php:584 +msgid "show more" +msgstr "mehr anzeigen" + +#: ../../mod/content.php:665 ../../include/conversation.php:534 +msgid "like" +msgstr "mag ich" + +#: ../../mod/content.php:666 ../../include/conversation.php:535 +msgid "dislike" +msgstr "mag ich nicht" + +#: ../../mod/content.php:668 ../../include/conversation.php:537 +msgid "Share this" +msgstr "Weitersagen" + +#: ../../mod/content.php:668 ../../include/conversation.php:537 +msgid "share" +msgstr "Teilen" + +#: ../../mod/content.php:692 ../../include/conversation.php:561 +msgid "Bold" +msgstr "Fett" + +#: ../../mod/content.php:693 ../../include/conversation.php:562 +msgid "Italic" +msgstr "Kursiv" + +#: ../../mod/content.php:694 ../../include/conversation.php:563 +msgid "Underline" +msgstr "Unterstrichen" + +#: ../../mod/content.php:695 ../../include/conversation.php:564 +msgid "Quote" +msgstr "Zitat" + +#: ../../mod/content.php:696 ../../include/conversation.php:565 +msgid "Code" +msgstr "Code" + +#: ../../mod/content.php:697 ../../include/conversation.php:566 +msgid "Image" +msgstr "Bild" + +#: ../../mod/content.php:698 ../../include/conversation.php:567 +msgid "Link" +msgstr "Verweis" + +#: ../../mod/content.php:699 ../../include/conversation.php:568 +msgid "Video" +msgstr "Video" + +#: ../../mod/content.php:733 ../../include/conversation.php:498 +msgid "add star" +msgstr "markieren" + +#: ../../mod/content.php:734 ../../include/conversation.php:499 +msgid "remove star" +msgstr "Markierung entfernen" + +#: ../../mod/content.php:735 ../../include/conversation.php:500 +msgid "toggle star status" +msgstr "Markierung umschalten" + +#: ../../mod/content.php:738 ../../include/conversation.php:503 +msgid "starred" +msgstr "markiert" + +#: ../../mod/content.php:739 ../../include/conversation.php:504 +msgid "add tag" +msgstr "Tag hinzufügen" + +#: ../../mod/content.php:743 ../../include/conversation.php:412 +msgid "save to folder" +msgstr "In Ordner speichern" + +#: ../../mod/content.php:815 ../../include/conversation.php:598 +msgid "to" +msgstr "zu" + +#: ../../mod/content.php:816 ../../include/conversation.php:599 +msgid "Wall-to-Wall" +msgstr "Wall-to-Wall" + +#: ../../mod/content.php:817 ../../include/conversation.php:600 +msgid "via Wall-To-Wall:" +msgstr "via Wall-To-Wall:" + #: ../../mod/home.php:26 ../../addon/communityhome/communityhome.php:179 #, php-format msgid "Welcome to %s" @@ -1238,8 +1432,8 @@ msgid "Discard" msgstr "Verwerfen" #: ../../mod/notifications.php:51 ../../mod/notifications.php:160 -#: ../../mod/notifications.php:206 ../../mod/contacts.php:316 -#: ../../mod/contacts.php:370 +#: ../../mod/notifications.php:206 ../../mod/contacts.php:314 +#: ../../mod/contacts.php:368 msgid "Ignore" msgstr "Ignorieren" @@ -1264,7 +1458,7 @@ msgstr "Pinnwand" msgid "Introductions" msgstr "Kontaktanfragen" -#: ../../mod/notifications.php:100 ../../mod/message.php:105 +#: ../../mod/notifications.php:100 ../../mod/message.php:176 #: ../../include/nav.php:128 msgid "Messages" msgstr "Nachrichten" @@ -1291,7 +1485,7 @@ msgid "suggested by %s" msgstr "vorgeschlagen von %s" #: ../../mod/notifications.php:153 ../../mod/notifications.php:200 -#: ../../mod/contacts.php:376 +#: ../../mod/contacts.php:374 msgid "Hide this contact from others" msgstr "Verberge diesen Kontakt vor anderen" @@ -1304,7 +1498,7 @@ msgid "if applicable" msgstr "falls anwendbar" #: ../../mod/notifications.php:157 ../../mod/notifications.php:204 -#: ../../mod/admin.php:661 +#: ../../mod/admin.php:681 msgid "Approve" msgstr "Genehmigen" @@ -1413,307 +1607,307 @@ msgstr "Keine weiteren Pinnwand-Benachrichtigungen" msgid "Home Notifications" msgstr "Pinnwand Benachrichtigungen" -#: ../../mod/contacts.php:83 ../../mod/contacts.php:163 +#: ../../mod/contacts.php:77 ../../mod/contacts.php:157 msgid "Could not access contact record." msgstr "Konnte nicht auf die Kontaktdaten zugreifen." -#: ../../mod/contacts.php:97 +#: ../../mod/contacts.php:91 msgid "Could not locate selected profile." msgstr "Konnte das ausgewählte Profil nicht finden." -#: ../../mod/contacts.php:120 +#: ../../mod/contacts.php:114 msgid "Contact updated." msgstr "Kontakt aktualisiert." -#: ../../mod/contacts.php:185 +#: ../../mod/contacts.php:179 msgid "Contact has been blocked" msgstr "Kontakt wurde blockiert" -#: ../../mod/contacts.php:185 +#: ../../mod/contacts.php:179 msgid "Contact has been unblocked" msgstr "Kontakt wurde wieder freigegeben" -#: ../../mod/contacts.php:199 +#: ../../mod/contacts.php:193 msgid "Contact has been ignored" msgstr "Kontakt wurde ignoriert" -#: ../../mod/contacts.php:199 +#: ../../mod/contacts.php:193 msgid "Contact has been unignored" msgstr "Kontakt wird nicht mehr ignoriert" -#: ../../mod/contacts.php:215 +#: ../../mod/contacts.php:209 msgid "Contact has been archived" msgstr "Kontakt wurde archiviert" -#: ../../mod/contacts.php:215 +#: ../../mod/contacts.php:209 msgid "Contact has been unarchived" msgstr "Kontakt wurde aus dem Archiv geholt" -#: ../../mod/contacts.php:228 +#: ../../mod/contacts.php:222 msgid "Contact has been removed." msgstr "Kontakt wurde entfernt." -#: ../../mod/contacts.php:258 +#: ../../mod/contacts.php:256 #, php-format msgid "You are mutual friends with %s" msgstr "Du hast mit %s eine beidseitige Freundschaft" -#: ../../mod/contacts.php:262 +#: ../../mod/contacts.php:260 #, php-format msgid "You are sharing with %s" msgstr "Du teilst mit %s" -#: ../../mod/contacts.php:267 +#: ../../mod/contacts.php:265 #, php-format msgid "%s is sharing with you" msgstr "%s teilt mit Dir" -#: ../../mod/contacts.php:284 +#: ../../mod/contacts.php:282 msgid "Private communications are not available for this contact." msgstr "Private Kommunikation ist für diesen Kontakt nicht verfügbar." -#: ../../mod/contacts.php:287 +#: ../../mod/contacts.php:285 msgid "Never" msgstr "Niemals" -#: ../../mod/contacts.php:291 +#: ../../mod/contacts.php:289 msgid "(Update was successful)" msgstr "(Aktualisierung war erfolgreich)" -#: ../../mod/contacts.php:291 +#: ../../mod/contacts.php:289 msgid "(Update was not successful)" msgstr "(Aktualisierung war nicht erfolgreich)" -#: ../../mod/contacts.php:293 +#: ../../mod/contacts.php:291 msgid "Suggest friends" msgstr "Kontakte vorschlagen" -#: ../../mod/contacts.php:297 +#: ../../mod/contacts.php:295 #, php-format msgid "Network type: %s" -msgstr "Netzwerk Typ: %s" +msgstr "Netzwerktyp: %s" -#: ../../mod/contacts.php:300 ../../include/contact_widgets.php:183 +#: ../../mod/contacts.php:298 ../../include/contact_widgets.php:183 #, php-format msgid "%d contact in common" msgid_plural "%d contacts in common" msgstr[0] "%d gemeinsamer Kontakt" msgstr[1] "%d gemeinsame Kontakte" -#: ../../mod/contacts.php:305 +#: ../../mod/contacts.php:303 msgid "View all contacts" msgstr "Alle Kontakte anzeigen" -#: ../../mod/contacts.php:310 ../../mod/contacts.php:369 -#: ../../mod/admin.php:665 +#: ../../mod/contacts.php:308 ../../mod/contacts.php:367 +#: ../../mod/admin.php:685 msgid "Unblock" msgstr "Entsperren" -#: ../../mod/contacts.php:310 ../../mod/contacts.php:369 -#: ../../mod/admin.php:664 +#: ../../mod/contacts.php:308 ../../mod/contacts.php:367 +#: ../../mod/admin.php:684 msgid "Block" msgstr "Sperren" -#: ../../mod/contacts.php:313 +#: ../../mod/contacts.php:311 msgid "Toggle Blocked status" msgstr "Geblockt-Status ein-/ausschalten" -#: ../../mod/contacts.php:316 ../../mod/contacts.php:370 +#: ../../mod/contacts.php:314 ../../mod/contacts.php:368 msgid "Unignore" msgstr "Ignorieren aufheben" -#: ../../mod/contacts.php:319 +#: ../../mod/contacts.php:317 msgid "Toggle Ignored status" msgstr "Ignoriert-Status ein-/ausschalten" -#: ../../mod/contacts.php:323 +#: ../../mod/contacts.php:321 msgid "Unarchive" -msgstr "Unarchivieren" +msgstr "Aus Archiv zurückholen" -#: ../../mod/contacts.php:323 +#: ../../mod/contacts.php:321 msgid "Archive" msgstr "Archivieren" -#: ../../mod/contacts.php:326 +#: ../../mod/contacts.php:324 msgid "Toggle Archive status" msgstr "Archiviert-Status ein-/ausschalten" -#: ../../mod/contacts.php:329 +#: ../../mod/contacts.php:327 msgid "Repair" msgstr "Reparieren" -#: ../../mod/contacts.php:332 +#: ../../mod/contacts.php:330 msgid "Advanced Contact Settings" msgstr "Fortgeschrittene Kontakteinstellungen" -#: ../../mod/contacts.php:338 +#: ../../mod/contacts.php:336 msgid "Communications lost with this contact!" msgstr "Verbindungen mit diesem Kontakt verloren!" -#: ../../mod/contacts.php:341 +#: ../../mod/contacts.php:339 msgid "Contact Editor" msgstr "Kontakt Editor" -#: ../../mod/contacts.php:344 +#: ../../mod/contacts.php:342 msgid "Profile Visibility" msgstr "Profil-Sichtbarkeit" -#: ../../mod/contacts.php:345 +#: ../../mod/contacts.php:343 #, 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:346 +#: ../../mod/contacts.php:344 msgid "Contact Information / Notes" msgstr "Kontakt Informationen / Notizen" -#: ../../mod/contacts.php:347 +#: ../../mod/contacts.php:345 msgid "Edit contact notes" -msgstr "Notizen zum Kontakt bearbiten" +msgstr "Notizen zum Kontakt bearbeiten" -#: ../../mod/contacts.php:352 ../../mod/contacts.php:544 +#: ../../mod/contacts.php:350 ../../mod/contacts.php:542 #: ../../mod/viewcontacts.php:62 ../../mod/nogroup.php:40 #, php-format msgid "Visit %s's profile [%s]" msgstr "Besuche %ss Profil [%s]" -#: ../../mod/contacts.php:353 +#: ../../mod/contacts.php:351 msgid "Block/Unblock contact" msgstr "Kontakt blockieren/freischalten" -#: ../../mod/contacts.php:354 +#: ../../mod/contacts.php:352 msgid "Ignore contact" msgstr "Ignoriere den Kontakt" -#: ../../mod/contacts.php:355 +#: ../../mod/contacts.php:353 msgid "Repair URL settings" msgstr "URL Einstellungen reparieren" -#: ../../mod/contacts.php:356 +#: ../../mod/contacts.php:354 msgid "View conversations" msgstr "Unterhaltungen anzeigen" -#: ../../mod/contacts.php:358 +#: ../../mod/contacts.php:356 msgid "Delete contact" msgstr "Lösche den Kontakt" -#: ../../mod/contacts.php:362 +#: ../../mod/contacts.php:360 msgid "Last update:" msgstr "letzte Aktualisierung:" -#: ../../mod/contacts.php:364 +#: ../../mod/contacts.php:362 msgid "Update public posts" msgstr "Öffentliche Beiträge aktualisieren" -#: ../../mod/contacts.php:366 ../../mod/admin.php:1136 +#: ../../mod/contacts.php:364 ../../mod/admin.php:1156 msgid "Update now" msgstr "Jetzt aktualisieren" -#: ../../mod/contacts.php:373 +#: ../../mod/contacts.php:371 msgid "Currently blocked" msgstr "Derzeit geblockt" -#: ../../mod/contacts.php:374 +#: ../../mod/contacts.php:372 msgid "Currently ignored" msgstr "Derzeit ignoriert" -#: ../../mod/contacts.php:375 +#: ../../mod/contacts.php:373 msgid "Currently archived" msgstr "Momentan archiviert" -#: ../../mod/contacts.php:376 +#: ../../mod/contacts.php:374 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:429 +#: ../../mod/contacts.php:427 msgid "Suggestions" msgstr "Kontaktvorschläge" -#: ../../mod/contacts.php:432 +#: ../../mod/contacts.php:430 msgid "Suggest potential friends" msgstr "Freunde vorschlagen" -#: ../../mod/contacts.php:435 ../../mod/group.php:191 +#: ../../mod/contacts.php:433 ../../mod/group.php:191 msgid "All Contacts" msgstr "Alle Kontakte" -#: ../../mod/contacts.php:438 +#: ../../mod/contacts.php:436 msgid "Show all contacts" msgstr "Alle Kontakte anzeigen" -#: ../../mod/contacts.php:441 +#: ../../mod/contacts.php:439 msgid "Unblocked" msgstr "Ungeblockt" -#: ../../mod/contacts.php:444 +#: ../../mod/contacts.php:442 msgid "Only show unblocked contacts" msgstr "Nur nicht-blockierte Kontakte anzeigen" -#: ../../mod/contacts.php:448 +#: ../../mod/contacts.php:446 msgid "Blocked" msgstr "Geblockt" -#: ../../mod/contacts.php:451 +#: ../../mod/contacts.php:449 msgid "Only show blocked contacts" msgstr "Nur blockierte Kontakte anzeigen" -#: ../../mod/contacts.php:455 +#: ../../mod/contacts.php:453 msgid "Ignored" msgstr "Ignoriert" -#: ../../mod/contacts.php:458 +#: ../../mod/contacts.php:456 msgid "Only show ignored contacts" msgstr "Nur ignorierte Kontakte anzeigen" -#: ../../mod/contacts.php:462 +#: ../../mod/contacts.php:460 msgid "Archived" msgstr "Archiviert" -#: ../../mod/contacts.php:465 +#: ../../mod/contacts.php:463 msgid "Only show archived contacts" msgstr "Nur archivierte Kontakte anzeigen" -#: ../../mod/contacts.php:469 +#: ../../mod/contacts.php:467 msgid "Hidden" msgstr "Verborgen" -#: ../../mod/contacts.php:472 +#: ../../mod/contacts.php:470 msgid "Only show hidden contacts" msgstr "Nur verborgene Kontakte anzeigen" -#: ../../mod/contacts.php:520 +#: ../../mod/contacts.php:518 msgid "Mutual Friendship" msgstr "Beidseitige Freundschaft" -#: ../../mod/contacts.php:524 +#: ../../mod/contacts.php:522 msgid "is a fan of yours" msgstr "ist ein Fan von dir" -#: ../../mod/contacts.php:528 +#: ../../mod/contacts.php:526 msgid "you are a fan of" msgstr "du bist Fan von" -#: ../../mod/contacts.php:545 ../../mod/nogroup.php:41 +#: ../../mod/contacts.php:543 ../../mod/nogroup.php:41 msgid "Edit contact" msgstr "Kontakt bearbeiten" -#: ../../mod/contacts.php:566 ../../view/theme/diabook/theme.php:129 +#: ../../mod/contacts.php:564 ../../view/theme/diabook/theme.php:129 #: ../../include/nav.php:139 msgid "Contacts" msgstr "Kontakte" -#: ../../mod/contacts.php:570 +#: ../../mod/contacts.php:568 msgid "Search your contacts" msgstr "Suche in deinen Kontakten" -#: ../../mod/contacts.php:571 ../../mod/directory.php:57 +#: ../../mod/contacts.php:569 ../../mod/directory.php:57 msgid "Finding: " msgstr "Funde: " -#: ../../mod/contacts.php:572 ../../mod/directory.php:59 +#: ../../mod/contacts.php:570 ../../mod/directory.php:59 #: ../../include/contact_widgets.php:33 msgid "Find" msgstr "Finde" @@ -1734,11 +1928,11 @@ msgstr "Anfrage zum Zurücksetzen des Passworts auf %s erhalten" #: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107 #: ../../mod/register.php:90 ../../mod/register.php:144 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:752 -#: ../../addon/facebook/facebook.php:692 -#: ../../addon/facebook/facebook.php:1182 +#: ../../addon/facebook/facebook.php:702 +#: ../../addon/facebook/facebook.php:1200 #: ../../addon/public_server/public_server.php:62 -#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:2792 -#: ../../boot.php:703 +#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3219 +#: ../../boot.php:797 msgid "Administrator" msgstr "Administrator" @@ -1748,7 +1942,7 @@ msgid "" "Password reset failed." msgstr "Anfrage konnte nicht verifiziert werden. (Eventuell hast du bereits eine ähnliche Anfrage gestellt.) Zurücksetzen des Passworts gescheitert." -#: ../../mod/lostpass.php:83 ../../boot.php:835 +#: ../../mod/lostpass.php:83 ../../boot.php:934 msgid "Password Reset" msgstr "Passwort zurücksetzen" @@ -1782,535 +1976,540 @@ msgstr "Hast du dein Passwort vergessen?" msgid "" "Enter your email address and submit to have your password reset. Then check " "your email for further instructions." -msgstr "Gib deine Email-Adresse an und fordere ein neues Passwort an. Es werden dir dann weitere Informationen per Mail zugesendet." +msgstr "Gib deine E-Mail-Adresse an und fordere ein neues Passwort an. Es werden dir dann weitere Informationen per Mail zugesendet." #: ../../mod/lostpass.php:121 msgid "Nickname or Email: " -msgstr "Spitzname oder Email:" +msgstr "Spitzname oder E-Mail:" #: ../../mod/lostpass.php:122 msgid "Reset" msgstr "Zurücksetzen" -#: ../../mod/settings.php:50 ../../include/nav.php:137 +#: ../../mod/settings.php:30 ../../include/nav.php:137 msgid "Account settings" msgstr "Kontoeinstellungen" -#: ../../mod/settings.php:55 +#: ../../mod/settings.php:35 msgid "Display settings" msgstr "Anzeige-Einstellungen" -#: ../../mod/settings.php:61 +#: ../../mod/settings.php:41 msgid "Connector settings" msgstr "Connector-Einstellungen" -#: ../../mod/settings.php:66 +#: ../../mod/settings.php:46 msgid "Plugin settings" msgstr "Plugin-Einstellungen" -#: ../../mod/settings.php:71 +#: ../../mod/settings.php:51 msgid "Connected apps" msgstr "Verbundene Programme" -#: ../../mod/settings.php:76 +#: ../../mod/settings.php:56 msgid "Export personal data" msgstr "Persönliche Daten exportieren" -#: ../../mod/settings.php:81 +#: ../../mod/settings.php:61 msgid "Remove account" msgstr "Konto löschen" -#: ../../mod/settings.php:89 ../../mod/admin.php:751 ../../mod/admin.php:956 -#: ../../addon/dav/layout.fnk.php:116 ../../addon/mathjax/mathjax.php:36 -#: ../../view/theme/diabook/theme.php:643 +#: ../../mod/settings.php:69 ../../mod/admin.php:771 ../../mod/admin.php:976 +#: ../../addon/dav/friendica/layout.fnk.php:225 +#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:643 #: ../../view/theme/diabook/theme.php:773 ../../include/nav.php:137 msgid "Settings" msgstr "Einstellungen" -#: ../../mod/settings.php:133 +#: ../../mod/settings.php:113 msgid "Missing some important data!" msgstr "Wichtige Daten fehlen!" -#: ../../mod/settings.php:136 ../../mod/settings.php:581 +#: ../../mod/settings.php:116 ../../mod/settings.php:563 msgid "Update" msgstr "Aktualisierungen" -#: ../../mod/settings.php:241 +#: ../../mod/settings.php:221 msgid "Failed to connect with email account using the settings provided." msgstr "Verbindung zum E-Mail-Konto mit den angegebenen Einstellungen nicht möglich." -#: ../../mod/settings.php:246 +#: ../../mod/settings.php:226 msgid "Email settings updated." -msgstr "EMail Einstellungen bearbeitet." +msgstr "E-Mail Einstellungen bearbeitet." -#: ../../mod/settings.php:305 +#: ../../mod/settings.php:285 msgid "Passwords do not match. Password unchanged." msgstr "Die Passwörter stimmen nicht überein. Das Passwort bleibt unverändert." -#: ../../mod/settings.php:310 +#: ../../mod/settings.php:290 msgid "Empty passwords are not allowed. Password unchanged." msgstr "Leere Passwörter sind nicht erlaubt. Passwort bleibt unverändert." -#: ../../mod/settings.php:321 +#: ../../mod/settings.php:301 msgid "Password changed." msgstr "Passwort ändern." -#: ../../mod/settings.php:323 +#: ../../mod/settings.php:303 msgid "Password update failed. Please try again." msgstr "Aktualisierung des Passworts gescheitert, bitte versuche es noch einmal." -#: ../../mod/settings.php:386 +#: ../../mod/settings.php:368 msgid " Please use a shorter name." msgstr " Bitte verwende einen kürzeren Namen." -#: ../../mod/settings.php:388 +#: ../../mod/settings.php:370 msgid " Name too short." msgstr " Name ist zu kurz." -#: ../../mod/settings.php:394 +#: ../../mod/settings.php:376 msgid " Not valid email." msgstr " Keine gültige E-Mail." -#: ../../mod/settings.php:396 +#: ../../mod/settings.php:378 msgid " Cannot change to that email." msgstr "Ändern der E-Mail nicht möglich. " -#: ../../mod/settings.php:450 +#: ../../mod/settings.php:432 msgid "Private forum has no privacy permissions. Using default privacy group." msgstr "Für das private Forum sind keine Zugriffsrechte eingestellt. Die voreingestellte Gruppe für neue Kontakte wird benutzt." -#: ../../mod/settings.php:454 +#: ../../mod/settings.php:436 msgid "Private forum has no privacy permissions and no default privacy group." msgstr "Für das private Forum sind keine Zugriffsrechte eingestellt, und es gibt keine voreingestellte Gruppe für neue Kontakte." -#: ../../mod/settings.php:484 ../../addon/facebook/facebook.php:492 +#: ../../mod/settings.php:466 ../../addon/facebook/facebook.php:495 #: ../../addon/impressum/impressum.php:77 #: ../../addon/openstreetmap/openstreetmap.php:80 #: ../../addon/mathjax/mathjax.php:66 ../../addon/piwik/piwik.php:105 -#: ../../addon/twitter/twitter.php:376 +#: ../../addon/twitter/twitter.php:389 msgid "Settings updated." msgstr "Einstellungen aktualisiert." -#: ../../mod/settings.php:554 ../../mod/settings.php:580 -#: ../../mod/settings.php:616 +#: ../../mod/settings.php:536 ../../mod/settings.php:562 +#: ../../mod/settings.php:598 msgid "Add application" msgstr "Programm hinzufügen" -#: ../../mod/settings.php:558 ../../mod/settings.php:584 -#: ../../addon/statusnet/statusnet.php:555 +#: ../../mod/settings.php:540 ../../mod/settings.php:566 +#: ../../addon/statusnet/statusnet.php:570 msgid "Consumer Key" msgstr "Consumer Key" -#: ../../mod/settings.php:559 ../../mod/settings.php:585 -#: ../../addon/statusnet/statusnet.php:554 +#: ../../mod/settings.php:541 ../../mod/settings.php:567 +#: ../../addon/statusnet/statusnet.php:569 msgid "Consumer Secret" msgstr "Consumer Secret" -#: ../../mod/settings.php:560 ../../mod/settings.php:586 +#: ../../mod/settings.php:542 ../../mod/settings.php:568 msgid "Redirect" msgstr "Umleiten" -#: ../../mod/settings.php:561 ../../mod/settings.php:587 +#: ../../mod/settings.php:543 ../../mod/settings.php:569 msgid "Icon url" msgstr "Icon URL" -#: ../../mod/settings.php:572 +#: ../../mod/settings.php:554 msgid "You can't edit this application." msgstr "Du kannst dieses Programm nicht bearbeiten." -#: ../../mod/settings.php:615 +#: ../../mod/settings.php:597 msgid "Connected Apps" msgstr "Verbundene Programme" -#: ../../mod/settings.php:619 +#: ../../mod/settings.php:601 msgid "Client key starts with" msgstr "Anwenderschlüssel beginnt mit" -#: ../../mod/settings.php:620 +#: ../../mod/settings.php:602 msgid "No name" msgstr "Kein Name" -#: ../../mod/settings.php:621 +#: ../../mod/settings.php:603 msgid "Remove authorization" msgstr "Autorisierung entziehen" -#: ../../mod/settings.php:632 +#: ../../mod/settings.php:614 msgid "No Plugin settings configured" msgstr "Keine Plugin-Einstellungen konfiguriert" -#: ../../mod/settings.php:640 ../../addon/widgets/widgets.php:123 +#: ../../mod/settings.php:622 ../../addon/widgets/widgets.php:123 msgid "Plugin Settings" msgstr "Plugin-Einstellungen" -#: ../../mod/settings.php:652 ../../mod/settings.php:653 +#: ../../mod/settings.php:634 ../../mod/settings.php:635 #, php-format msgid "Built-in support for %s connectivity is %s" msgstr "Eingebaute Unterstützung für Verbindungen zu %s ist %s" -#: ../../mod/settings.php:652 ../../mod/settings.php:653 +#: ../../mod/settings.php:634 ../../mod/settings.php:635 msgid "enabled" msgstr "eingeschaltet" -#: ../../mod/settings.php:652 ../../mod/settings.php:653 +#: ../../mod/settings.php:634 ../../mod/settings.php:635 msgid "disabled" msgstr "ausgeschaltet" -#: ../../mod/settings.php:653 +#: ../../mod/settings.php:635 msgid "StatusNet" msgstr "StatusNet" -#: ../../mod/settings.php:683 +#: ../../mod/settings.php:667 +msgid "Email access is disabled on this site." +msgstr "Zugriff auf E-Mails für diese Seite deaktiviert." + +#: ../../mod/settings.php:673 msgid "Connector Settings" msgstr "Verbindungs-Einstellungen" -#: ../../mod/settings.php:688 +#: ../../mod/settings.php:678 msgid "Email/Mailbox Setup" msgstr "E-Mail/Postfach-Einstellungen" -#: ../../mod/settings.php:689 +#: ../../mod/settings.php:679 msgid "" "If you wish to communicate with email contacts using this service " "(optional), please specify how to connect to your mailbox." msgstr "Wenn du mit E-Mail-Kontakten über diesen Service kommunizieren möchtest (optional), gib bitte die Einstellungen für dein Postfach an." -#: ../../mod/settings.php:690 +#: ../../mod/settings.php:680 msgid "Last successful email check:" -msgstr "Letzter erfolgreicher Email Check" +msgstr "Letzter erfolgreicher E-Mail Check" -#: ../../mod/settings.php:691 -msgid "Email access is disabled on this site." -msgstr "Zugriff auf E-Mails für diese Seite deaktiviert." - -#: ../../mod/settings.php:692 +#: ../../mod/settings.php:682 msgid "IMAP server name:" msgstr "IMAP-Server-Name:" -#: ../../mod/settings.php:693 +#: ../../mod/settings.php:683 msgid "IMAP port:" msgstr "IMAP-Port:" -#: ../../mod/settings.php:694 +#: ../../mod/settings.php:684 msgid "Security:" msgstr "Sicherheit:" -#: ../../mod/settings.php:694 ../../mod/settings.php:699 +#: ../../mod/settings.php:684 ../../mod/settings.php:689 +#: ../../addon/dav/common/wdcal_edit.inc.php:191 msgid "None" msgstr "Keine" -#: ../../mod/settings.php:695 +#: ../../mod/settings.php:685 msgid "Email login name:" msgstr "E-Mail-Login-Name:" -#: ../../mod/settings.php:696 +#: ../../mod/settings.php:686 msgid "Email password:" msgstr "E-Mail-Passwort:" -#: ../../mod/settings.php:697 +#: ../../mod/settings.php:687 msgid "Reply-to address:" msgstr "Reply-to Adresse:" -#: ../../mod/settings.php:698 +#: ../../mod/settings.php:688 msgid "Send public posts to all email contacts:" msgstr "Sende öffentliche Beiträge an alle E-Mail-Kontakte:" -#: ../../mod/settings.php:699 +#: ../../mod/settings.php:689 msgid "Action after import:" msgstr "Aktion nach Import:" -#: ../../mod/settings.php:699 +#: ../../mod/settings.php:689 msgid "Mark as seen" msgstr "Als gelesen markieren" -#: ../../mod/settings.php:699 +#: ../../mod/settings.php:689 msgid "Move to folder" msgstr "In einen Ordner verschieben" -#: ../../mod/settings.php:700 +#: ../../mod/settings.php:690 msgid "Move to folder:" msgstr "In diesen Ordner verschieben:" -#: ../../mod/settings.php:760 +#: ../../mod/settings.php:750 msgid "Display Settings" msgstr "Anzeige-Einstellungen" -#: ../../mod/settings.php:766 +#: ../../mod/settings.php:756 ../../mod/settings.php:766 msgid "Display Theme:" msgstr "Theme:" -#: ../../mod/settings.php:767 +#: ../../mod/settings.php:757 msgid "Update browser every xx seconds" msgstr "Browser alle xx Sekunden aktualisieren" -#: ../../mod/settings.php:767 +#: ../../mod/settings.php:757 msgid "Minimum of 10 seconds, no maximum" msgstr "Minimal 10 Sekunden, kein Maximum" -#: ../../mod/settings.php:768 +#: ../../mod/settings.php:758 msgid "Number of items to display on the network page:" msgstr "Zahl der Beiträge, die pro Netzwerkseite angezeigt werden sollen: " -#: ../../mod/settings.php:768 +#: ../../mod/settings.php:758 msgid "Maximum of 100 items" msgstr "Maximal 100 Beiträge" -#: ../../mod/settings.php:769 +#: ../../mod/settings.php:759 msgid "Don't show emoticons" msgstr "Keine Smilies anzeigen" -#: ../../mod/settings.php:840 +#: ../../mod/settings.php:835 msgid "Normal Account Page" msgstr "Normales Konto" -#: ../../mod/settings.php:841 +#: ../../mod/settings.php:836 msgid "This account is a normal personal profile" msgstr "Dieses Konto ist ein normales persönliches Profil" -#: ../../mod/settings.php:844 +#: ../../mod/settings.php:839 msgid "Soapbox Page" msgstr "Marktschreier-Konto" -#: ../../mod/settings.php:845 +#: ../../mod/settings.php:840 msgid "Automatically approve all connection/friend requests as read-only fans" msgstr "Kontaktanfragen werden automatisch als Nurlese-Fans akzeptiert" -#: ../../mod/settings.php:848 +#: ../../mod/settings.php:843 msgid "Community Forum/Celebrity Account" msgstr "Forum/Promi-Konto" -#: ../../mod/settings.php:849 +#: ../../mod/settings.php:844 msgid "" "Automatically approve all connection/friend requests as read-write fans" msgstr "Kontaktanfragen werden automatisch als Lese-und-Schreib-Fans akzeptiert" -#: ../../mod/settings.php:852 +#: ../../mod/settings.php:847 msgid "Automatic Friend Page" msgstr "Automatische Freunde Seite" -#: ../../mod/settings.php:853 +#: ../../mod/settings.php:848 msgid "Automatically approve all connection/friend requests as friends" msgstr "Kontaktanfragen werden automatisch als Freund akzeptiert" -#: ../../mod/settings.php:856 +#: ../../mod/settings.php:851 msgid "Private Forum [Experimental]" msgstr "Privates Forum [Versuchsstadium]" -#: ../../mod/settings.php:857 +#: ../../mod/settings.php:852 msgid "Private forum - approved members only" msgstr "Privates Forum, nur für Mitglieder" -#: ../../mod/settings.php:869 +#: ../../mod/settings.php:864 msgid "OpenID:" msgstr "OpenID:" -#: ../../mod/settings.php:869 +#: ../../mod/settings.php:864 msgid "(Optional) Allow this OpenID to login to this account." msgstr "(Optional) Erlaube die Anmeldung für dieses Konto mit dieser OpenID." -#: ../../mod/settings.php:879 +#: ../../mod/settings.php:874 msgid "Publish your default profile in your local site directory?" msgstr "Darf dein Standardprofil im Verzeichnis dieses Servers veröffentlicht werden?" -#: ../../mod/settings.php:885 +#: ../../mod/settings.php:880 msgid "Publish your default profile in the global social directory?" msgstr "Darf dein Standardprofil im weltweiten Verzeichnis veröffentlicht werden?" -#: ../../mod/settings.php:893 +#: ../../mod/settings.php:888 msgid "Hide your contact/friend list from viewers of your default profile?" msgstr "Liste der Kontakte vor Betrachtern des Standardprofils verbergen?" -#: ../../mod/settings.php:897 +#: ../../mod/settings.php:892 msgid "Hide your profile details from unknown viewers?" msgstr "Profil-Details vor unbekannten Betrachtern verbergen?" -#: ../../mod/settings.php:902 +#: ../../mod/settings.php:897 msgid "Allow friends to post to your profile page?" msgstr "Dürfen deine Kontakte auf deine Pinnwand schreiben?" -#: ../../mod/settings.php:908 +#: ../../mod/settings.php:903 msgid "Allow friends to tag your posts?" msgstr "Dürfen deine Kontakte deine Beiträge mit Schlagwörtern versehen?" -#: ../../mod/settings.php:914 +#: ../../mod/settings.php:909 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "Dürfen wir dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?" -#: ../../mod/settings.php:920 +#: ../../mod/settings.php:915 msgid "Permit unknown people to send you private mail?" msgstr "Dürfen dir Unbekannte private Nachrichten schicken?" -#: ../../mod/settings.php:931 +#: ../../mod/settings.php:923 msgid "Profile is not published." msgstr "Profil ist nicht veröffentlicht." -#: ../../mod/settings.php:937 ../../mod/profile_photo.php:213 +#: ../../mod/settings.php:926 ../../mod/profile_photo.php:214 msgid "or" msgstr "oder" -#: ../../mod/settings.php:942 +#: ../../mod/settings.php:931 msgid "Your Identity Address is" msgstr "Die Adresse deines Profils lautet:" -#: ../../mod/settings.php:953 +#: ../../mod/settings.php:942 msgid "Automatically expire posts after this many days:" msgstr "Beiträge verfallen automatisch nach dieser Anzahl von Tagen:" -#: ../../mod/settings.php:953 +#: ../../mod/settings.php:942 msgid "If empty, posts will not expire. Expired posts will be deleted" msgstr "Wenn leer verfallen Beiträge nie automatisch. Verfallene Beiträge werden gelöscht." -#: ../../mod/settings.php:954 +#: ../../mod/settings.php:943 msgid "Advanced expiration settings" msgstr "Erweiterte Verfallseinstellungen" -#: ../../mod/settings.php:955 +#: ../../mod/settings.php:944 msgid "Advanced Expiration" msgstr "Erweitertes Verfallen" -#: ../../mod/settings.php:956 +#: ../../mod/settings.php:945 msgid "Expire posts:" msgstr "Beiträge verfallen lassen:" -#: ../../mod/settings.php:957 +#: ../../mod/settings.php:946 msgid "Expire personal notes:" msgstr "Persönliche Notizen verfallen lassen:" -#: ../../mod/settings.php:958 +#: ../../mod/settings.php:947 msgid "Expire starred posts:" msgstr "Markierte Beiträge verfallen lassen:" -#: ../../mod/settings.php:959 +#: ../../mod/settings.php:948 msgid "Expire photos:" msgstr "Fotos verfallen lassen:" -#: ../../mod/settings.php:960 +#: ../../mod/settings.php:949 msgid "Only expire posts by others:" msgstr "Nur Beiträge anderer verfallen:" -#: ../../mod/settings.php:967 +#: ../../mod/settings.php:956 msgid "Account Settings" msgstr "Kontoeinstellungen" -#: ../../mod/settings.php:975 +#: ../../mod/settings.php:964 msgid "Password Settings" msgstr "Passwort-Einstellungen" -#: ../../mod/settings.php:976 +#: ../../mod/settings.php:965 msgid "New Password:" msgstr "Neues Passwort:" -#: ../../mod/settings.php:977 +#: ../../mod/settings.php:966 msgid "Confirm:" msgstr "Bestätigen:" -#: ../../mod/settings.php:977 +#: ../../mod/settings.php:966 msgid "Leave password fields blank unless changing" msgstr "Lass die Passwort-Felder leer, außer du willst das Passwort ändern" -#: ../../mod/settings.php:981 +#: ../../mod/settings.php:970 msgid "Basic Settings" msgstr "Grundeinstellungen" -#: ../../mod/settings.php:982 ../../include/profile_advanced.php:15 +#: ../../mod/settings.php:971 ../../include/profile_advanced.php:15 msgid "Full Name:" msgstr "Kompletter Name:" -#: ../../mod/settings.php:983 +#: ../../mod/settings.php:972 msgid "Email Address:" msgstr "E-Mail-Adresse:" -#: ../../mod/settings.php:984 +#: ../../mod/settings.php:973 msgid "Your Timezone:" msgstr "Deine Zeitzone:" -#: ../../mod/settings.php:985 +#: ../../mod/settings.php:974 msgid "Default Post Location:" msgstr "Standardstandort:" -#: ../../mod/settings.php:986 +#: ../../mod/settings.php:975 msgid "Use Browser Location:" msgstr "Standort des Browsers verwenden:" -#: ../../mod/settings.php:989 +#: ../../mod/settings.php:978 msgid "Security and Privacy Settings" msgstr "Sicherheits- und Privatsphäre-Einstellungen" -#: ../../mod/settings.php:991 +#: ../../mod/settings.php:980 msgid "Maximum Friend Requests/Day:" msgstr "Maximale Anzahl von Freundschaftsanfragen/Tag:" -#: ../../mod/settings.php:991 ../../mod/settings.php:1010 +#: ../../mod/settings.php:980 ../../mod/settings.php:999 msgid "(to prevent spam abuse)" msgstr "(um SPAM zu vermeiden)" -#: ../../mod/settings.php:992 +#: ../../mod/settings.php:981 msgid "Default Post Permissions" msgstr "Standard-Zugriffsrechte für Beiträge" -#: ../../mod/settings.php:993 +#: ../../mod/settings.php:982 msgid "(click to open/close)" msgstr "(klicke zum öffnen/schließen)" -#: ../../mod/settings.php:1010 +#: ../../mod/settings.php:999 msgid "Maximum private messages per day from unknown people:" msgstr "Maximale Anzahl privater Nachrichten von Unbekannten pro Tag:" -#: ../../mod/settings.php:1013 +#: ../../mod/settings.php:1002 msgid "Notification Settings" msgstr "Benachrichtigungseinstellungen" -#: ../../mod/settings.php:1014 +#: ../../mod/settings.php:1003 msgid "By default post a status message when:" msgstr "Standardmäßig eine Statusnachricht posten, wenn:" -#: ../../mod/settings.php:1015 +#: ../../mod/settings.php:1004 msgid "accepting a friend request" msgstr "– du eine Kontaktanfrage akzeptierst" -#: ../../mod/settings.php:1016 +#: ../../mod/settings.php:1005 msgid "joining a forum/community" msgstr "– du einem Forum/einer Gemeinschaftsseite beitrittst" -#: ../../mod/settings.php:1017 +#: ../../mod/settings.php:1006 msgid "making an interesting profile change" msgstr "– du eine interessante Änderung an deinem Profil durchführst" -#: ../../mod/settings.php:1018 +#: ../../mod/settings.php:1007 msgid "Send a notification email when:" msgstr "Benachrichtigungs-E-Mail senden wenn:" -#: ../../mod/settings.php:1019 +#: ../../mod/settings.php:1008 msgid "You receive an introduction" msgstr "– du eine Kontaktanfrage erhältst" -#: ../../mod/settings.php:1020 +#: ../../mod/settings.php:1009 msgid "Your introductions are confirmed" msgstr "– eine deiner Kontaktanfragen akzeptiert wurde" -#: ../../mod/settings.php:1021 +#: ../../mod/settings.php:1010 msgid "Someone writes on your profile wall" msgstr "– jemand etwas auf deine Pinnwand schreibt" -#: ../../mod/settings.php:1022 +#: ../../mod/settings.php:1011 msgid "Someone writes a followup comment" msgstr "– jemand auch einen Kommentar verfasst" -#: ../../mod/settings.php:1023 +#: ../../mod/settings.php:1012 msgid "You receive a private message" msgstr "– du eine private Nachricht erhältst" -#: ../../mod/settings.php:1024 +#: ../../mod/settings.php:1013 msgid "You receive a friend suggestion" msgstr "– du eine Empfehlung erhältst" -#: ../../mod/settings.php:1025 +#: ../../mod/settings.php:1014 msgid "You are tagged in a post" msgstr "– du in einem Beitrag erwähnt wirst" -#: ../../mod/settings.php:1028 +#: ../../mod/settings.php:1015 +msgid "You are poked/prodded/etc. in a post" +msgstr "– du von jemandem angestupst oder sonstwie behandelt wirst" + +#: ../../mod/settings.php:1018 msgid "Advanced Account/Page Type Settings" msgstr "Erweiterte Konto-/Seitentyp-Einstellungen" -#: ../../mod/settings.php:1029 +#: ../../mod/settings.php:1019 msgid "Change the behaviour of this account for special situations" msgstr "Verhalten dieses Kontos in bestimmten Situationen:" @@ -2362,7 +2561,7 @@ msgstr "Nach Beitragsdatum sortieren" #: ../../mod/network.php:303 msgid "Posts that mention or involve you" -msgstr "Beiträge, in denen es um Dich geht" +msgstr "Beiträge, in denen es um dich geht" #: ../../mod/network.php:306 msgid "New" @@ -2400,18 +2599,6 @@ 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:436 -msgid "No such group" -msgstr "Es gibt keine solche Gruppe" - -#: ../../mod/network.php:447 -msgid "Group is empty" -msgstr "Gruppe ist leer" - -#: ../../mod/network.php:451 -msgid "Group: " -msgstr "Gruppe: " - #: ../../mod/network.php:461 msgid "Contact: " msgstr "Kontakt: " @@ -2424,14 +2611,15 @@ msgstr "Private Nachrichten an diese Person könnten an die Öffentlichkeit gela msgid "Invalid contact." msgstr "Ungültiger Kontakt." -#: ../../mod/notes.php:44 ../../boot.php:1535 +#: ../../mod/notes.php:44 ../../boot.php:1666 msgid "Personal Notes" msgstr "Persönliche Notizen" #: ../../mod/notes.php:63 ../../mod/filer.php:30 -#: ../../addon/facebook/facebook.php:760 -#: ../../addon/privacy_image_cache/privacy_image_cache.php:185 -#: ../../addon/dav/layout.fnk.php:384 ../../include/text.php:652 +#: ../../addon/facebook/facebook.php:770 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:263 +#: ../../addon/dav/friendica/layout.fnk.php:441 +#: ../../addon/dav/friendica/layout.fnk.php:488 ../../include/text.php:681 msgid "Save" msgstr "Speichern" @@ -2440,7 +2628,7 @@ msgstr "Speichern" msgid "Number of daily wall messages for %s exceeded. Message failed." msgstr "Maximale Anzahl der täglichen Pinnwand Nachrichten für %s ist überschritten. Zustellung fehlgeschlagen." -#: ../../mod/wallmessage.php:56 ../../mod/message.php:66 +#: ../../mod/wallmessage.php:56 ../../mod/message.php:59 msgid "No recipient selected." msgstr "Kein Empfänger gewählt." @@ -2448,15 +2636,15 @@ msgstr "Kein Empfänger gewählt." msgid "Unable to check your home location." msgstr "Konnte deinen Heimatort nicht bestimmen." -#: ../../mod/wallmessage.php:62 ../../mod/message.php:73 +#: ../../mod/wallmessage.php:62 ../../mod/message.php:66 msgid "Message could not be sent." msgstr "Nachricht konnte nicht gesendet werden." -#: ../../mod/wallmessage.php:65 ../../mod/message.php:76 +#: ../../mod/wallmessage.php:65 ../../mod/message.php:69 msgid "Message collection failure." msgstr "Konnte Nachrichten nicht abrufen." -#: ../../mod/wallmessage.php:68 ../../mod/message.php:79 +#: ../../mod/wallmessage.php:68 ../../mod/message.php:72 msgid "Message sent." msgstr "Nachricht gesendet." @@ -2464,34 +2652,35 @@ msgstr "Nachricht gesendet." msgid "No recipient." msgstr "Kein Empfänger." -#: ../../mod/wallmessage.php:124 ../../mod/message.php:172 -#: ../../include/conversation.php:943 +#: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131 +#: ../../mod/message.php:242 ../../mod/message.php:250 +#: ../../include/conversation.php:1101 ../../include/conversation.php:1118 msgid "Please enter a link URL:" msgstr "Bitte gib die URL des Links ein:" -#: ../../mod/wallmessage.php:131 ../../mod/message.php:200 +#: ../../mod/wallmessage.php:138 ../../mod/message.php:278 msgid "Send Private Message" msgstr "Private Nachricht senden" -#: ../../mod/wallmessage.php:132 +#: ../../mod/wallmessage.php:139 #, 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:133 ../../mod/message.php:201 -#: ../../mod/message.php:399 +#: ../../mod/wallmessage.php:140 ../../mod/message.php:279 +#: ../../mod/message.php:467 msgid "To:" msgstr "An:" -#: ../../mod/wallmessage.php:134 ../../mod/message.php:206 -#: ../../mod/message.php:401 +#: ../../mod/wallmessage.php:141 ../../mod/message.php:284 +#: ../../mod/message.php:469 msgid "Subject:" msgstr "Betreff:" -#: ../../mod/wallmessage.php:140 ../../mod/message.php:210 -#: ../../mod/message.php:404 ../../mod/invite.php:113 +#: ../../mod/wallmessage.php:147 ../../mod/message.php:288 +#: ../../mod/message.php:472 ../../mod/invite.php:113 msgid "Your message:" msgstr "Deine Nachricht:" @@ -2509,21 +2698,21 @@ msgid "" "enjoyable. Click any item to visit the relevant page. A link to this page " "will be visible from your home page for two weeks after your initial " "registration and then will quietly disappear." -msgstr "Wir möchten Dir einige Tipps und Links anbieten, die Dir helfen könnten, den Einstieg angenehmer zu machen. Klicke auf ein Element, um die entsprechende Seite zu besuchen. Ein Link zu dieser Seite hier bleibt für Dich an Deiner Pinnwand für zwei Wochen nach dem Registrierungsdatum sichtbar und wird dann verschwinden." +msgstr "Wir möchten dir einige Tipps und Links anbieten, die dir helfen könnten, den Einstieg angenehmer zu machen. Klicke auf ein Element, um die entsprechende Seite zu besuchen. Ein Link zu dieser Seite hier bleibt für dich an Deiner Pinnwand für zwei Wochen nach dem Registrierungsdatum sichtbar und wird dann verschwinden." #: ../../mod/newmember.php:16 msgid "" "On your Quick Start page - find a brief introduction to your " -"profile and network tabs, connect to Facebook, make some new connections, " -"and find some groups to join." -msgstr "Auf der Quick Start Seite findest du eine kurze Einleitung in die einzelnen Funktionen deines Profils und die Netzwerk-Reiter, wo du interessante Foren findest, wie du alte Freunde von Facebook wieder findest und neue Kontakte knüpfst." +"profile and network tabs, make some new connections, and find some groups to" +" join." +msgstr "Auf der Quick Start Seite findest du eine kurze Einleitung in die einzelnen Funktionen deines Profils und die Netzwerk-Reiter, wo du interessante Foren findest und neue Kontakte knüpfst." #: ../../mod/newmember.php:18 msgid "" "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." -msgstr "Ändere bitte unter Einstellungen Dein Passwort. Außerdem merke Dir Deine Indentifikations-Adresse. Diese sieht aus wie eine E-Mail-Adresse und wird benötigt, um Freundschaften mit anderen im Friendica Netzwerk zu schliessen." +msgstr "Ä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 Freundschaften mit anderen im Friendica Netzwerk zu schliessen." #: ../../mod/newmember.php:20 msgid "" @@ -2531,7 +2720,7 @@ msgid "" " directory listing is like having an unlisted phone number. In general, you " "should probably publish your listing - unless all of your friends and " "potential friends know exactly how to find you." -msgstr "Ãœberprüfe die restlichen Einstellungen, insbesondere die Einstellungen zur Privatsphäre. Wenn du dein Profil nicht veröffentlichst, ist das als wenn Du Deine Telefonnummer nicht ins Telefonbuch einträgst. Im Allgemeinen solltest du es veröffentlichen - außer all deine Freunde und potentiellen Freunde wissen genau, wie sie dich finden können." +msgstr "Ãœberprüfe die restlichen Einstellungen, insbesondere die Einstellungen zur Privatsphäre. Wenn du dein Profil nicht veröffentlichst, ist das als wenn du deine Telefonnummer nicht ins Telefonbuch einträgst. Im Allgemeinen solltest du es veröffentlichen - außer all deine Freunde und potentiellen Freunde wissen genau, wie sie dich finden können." #: ../../mod/newmember.php:22 msgid "" @@ -2633,7 +2822,7 @@ msgstr "Gruppe nicht gefunden." msgid "Group name changed." msgstr "Gruppenname geändert." -#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:298 +#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:314 msgid "Permission denied" msgstr "Zugriff verweigert" @@ -2674,8 +2863,8 @@ msgid "Profile Visibility Editor" msgstr "Editor für die Profil-Sichtbarkeit" #: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:128 -#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:79 -#: ../../include/nav.php:50 ../../boot.php:1514 +#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:84 +#: ../../include/nav.php:50 ../../boot.php:1642 msgid "Profile" msgstr "Profil" @@ -2691,7 +2880,7 @@ msgstr "Alle Kontakte (mit gesichertem Profilzugriff)" msgid "No contacts." msgstr "Keine Kontakte." -#: ../../mod/viewcontacts.php:76 ../../include/text.php:589 +#: ../../mod/viewcontacts.php:76 ../../include/text.php:618 msgid "View Contacts" msgstr "Kontakte anzeigen" @@ -2756,7 +2945,7 @@ msgstr "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung mögli msgid "Your invitation ID: " msgstr "ID deiner Einladung: " -#: ../../mod/register.php:255 ../../mod/admin.php:421 +#: ../../mod/register.php:255 ../../mod/admin.php:436 msgid "Registration" msgstr "Registrierung" @@ -2779,41 +2968,41 @@ msgstr "Wähle einen Spitznamen für dein Profil. Dieser muss mit einem Buchstab msgid "Choose a nickname: " msgstr "Spitznamen wählen: " -#: ../../mod/register.php:269 ../../include/nav.php:81 ../../boot.php:801 +#: ../../mod/register.php:269 ../../include/nav.php:81 ../../boot.php:896 msgid "Register" msgstr "Registrieren" #: ../../mod/dirfind.php:26 msgid "People Search" -msgstr "Personen Suche" +msgstr "Personensuche" -#: ../../mod/like.php:185 ../../mod/like.php:259 ../../mod/tagger.php:70 -#: ../../addon/facebook/facebook.php:1576 +#: ../../mod/like.php:145 ../../mod/like.php:298 ../../mod/tagger.php:70 +#: ../../addon/facebook/facebook.php:1594 #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 #: ../../view/theme/diabook/theme.php:565 -#: ../../view/theme/diabook/theme.php:574 ../../include/diaspora.php:1709 -#: ../../include/conversation.php:48 ../../include/conversation.php:57 -#: ../../include/conversation.php:121 ../../include/conversation.php:130 +#: ../../view/theme/diabook/theme.php:574 ../../include/diaspora.php:1824 +#: ../../include/conversation.php:109 ../../include/conversation.php:118 +#: ../../include/conversation.php:239 ../../include/conversation.php:248 msgid "status" msgstr "Status" -#: ../../mod/like.php:202 ../../addon/facebook/facebook.php:1580 +#: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1598 #: ../../addon/communityhome/communityhome.php:172 -#: ../../view/theme/diabook/theme.php:579 ../../include/diaspora.php:1725 -#: ../../include/conversation.php:65 +#: ../../view/theme/diabook/theme.php:579 ../../include/diaspora.php:1840 +#: ../../include/conversation.php:126 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "%1$s mag %2$ss %3$s" -#: ../../mod/like.php:204 ../../include/conversation.php:68 +#: ../../mod/like.php:164 ../../include/conversation.php:129 #, php-format msgid "%1$s doesn't like %2$s's %3$s" msgstr "%1$s mag %2$ss %3$s nicht" #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159 -#: ../../mod/admin.php:700 ../../mod/admin.php:899 ../../mod/display.php:37 -#: ../../mod/display.php:142 ../../include/items.php:3234 +#: ../../mod/admin.php:720 ../../mod/admin.php:919 ../../mod/display.php:29 +#: ../../mod/display.php:135 ../../include/items.php:3697 msgid "Item not found." msgstr "Beitrag nicht gefunden." @@ -2822,7 +3011,7 @@ msgid "Access denied." msgstr "Zugriff verweigert." #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:130 -#: ../../include/nav.php:51 ../../boot.php:1520 +#: ../../include/nav.php:51 ../../boot.php:1649 msgid "Photos" msgstr "Bilder" @@ -2843,53 +3032,66 @@ msgstr "Registrierung für %s wurde zurückgezogen" msgid "Please login." msgstr "Bitte melde dich an." -#: ../../mod/item.php:89 +#: ../../mod/item.php:91 msgid "Unable to locate original post." msgstr "Konnte den Originalbeitrag nicht finden." -#: ../../mod/item.php:258 +#: ../../mod/item.php:275 msgid "Empty post discarded." msgstr "Leerer Beitrag wurde verworfen." -#: ../../mod/item.php:379 ../../mod/wall_upload.php:102 -#: ../../mod/wall_upload.php:111 ../../mod/wall_upload.php:118 +#: ../../mod/item.php:396 ../../mod/wall_upload.php:122 +#: ../../mod/wall_upload.php:131 ../../mod/wall_upload.php:138 #: ../../include/message.php:144 msgid "Wall Photos" msgstr "Pinnwand-Bilder" -#: ../../mod/item.php:800 +#: ../../mod/item.php:809 msgid "System error. Post not saved." msgstr "Systemfehler. Beitrag konnte nicht gespeichert werden." -#: ../../mod/item.php:825 +#: ../../mod/item.php:834 #, 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:827 +#: ../../mod/item.php:836 #, php-format msgid "You may visit them online at %s" msgstr "Du kannst sie online unter %s besuchen" -#: ../../mod/item.php:828 +#: ../../mod/item.php:837 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:830 +#: ../../mod/item.php:839 #, php-format msgid "%s posted an update." msgstr "%s hat ein Update veröffentlicht." +#: ../../mod/mood.php:62 ../../include/conversation.php:217 +#, php-format +msgid "%1$s is currently %2$s" +msgstr "%1$s ist momentan %2$s" + +#: ../../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 Freunden" + #: ../../mod/profile_photo.php:30 msgid "Image uploaded but image cropping failed." msgstr "Bilder hochgeladen, aber das Zuschneiden ist fehlgeschlagen." #: ../../mod/profile_photo.php:63 ../../mod/profile_photo.php:70 -#: ../../mod/profile_photo.php:77 ../../mod/profile_photo.php:266 +#: ../../mod/profile_photo.php:77 ../../mod/profile_photo.php:273 #, php-format msgid "Image size reduction [%s] failed." msgstr "Verkleinern der Bildgröße von [%s] ist gescheitert." @@ -2909,39 +3111,40 @@ msgstr "Bild konnte nicht verarbeitet werden" msgid "Image exceeds size limit of %d" msgstr "Bildgröße überschreitet das Limit von %d" -#: ../../mod/profile_photo.php:209 +#: ../../mod/profile_photo.php:210 msgid "Upload File:" msgstr "Datei hochladen:" -#: ../../mod/profile_photo.php:210 +#: ../../mod/profile_photo.php:211 msgid "Upload Profile Photo" msgstr "Profilbild hochladen" -#: ../../mod/profile_photo.php:211 +#: ../../mod/profile_photo.php:212 +#: ../../addon/dav/friendica/layout.fnk.php:152 msgid "Upload" msgstr "Hochladen" -#: ../../mod/profile_photo.php:213 +#: ../../mod/profile_photo.php:214 msgid "skip this step" msgstr "diesen Schritt überspringen" -#: ../../mod/profile_photo.php:213 +#: ../../mod/profile_photo.php:214 msgid "select a photo from your photo albums" msgstr "wähle ein Foto von deinen Fotoalben" -#: ../../mod/profile_photo.php:226 +#: ../../mod/profile_photo.php:227 msgid "Crop Image" msgstr "Bild zurechtschneiden" -#: ../../mod/profile_photo.php:227 +#: ../../mod/profile_photo.php:228 msgid "Please adjust the image cropping for optimum viewing." msgstr "Passe bitte den Bildausschnitt an, damit das Bild optimal dargestellt werden kann." -#: ../../mod/profile_photo.php:229 +#: ../../mod/profile_photo.php:230 msgid "Done Editing" msgstr "Bearbeitung abgeschlossen" -#: ../../mod/profile_photo.php:257 +#: ../../mod/profile_photo.php:264 msgid "Image uploaded successfully." msgstr "Bild erfolgreich auf den Server geladen." @@ -2967,67 +3170,67 @@ msgstr "Bitte gib dein Passwort zur Verifikation ein:" msgid "New Message" msgstr "Neue Nachricht" -#: ../../mod/message.php:70 +#: ../../mod/message.php:63 msgid "Unable to locate contact information." msgstr "Konnte die Kontaktinformationen nicht finden." -#: ../../mod/message.php:120 +#: ../../mod/message.php:191 msgid "Message deleted." msgstr "Nachricht gelöscht." -#: ../../mod/message.php:150 +#: ../../mod/message.php:221 msgid "Conversation removed." msgstr "Unterhaltung gelöscht." -#: ../../mod/message.php:247 +#: ../../mod/message.php:327 msgid "No messages." msgstr "Keine Nachrichten." -#: ../../mod/message.php:254 +#: ../../mod/message.php:334 #, php-format msgid "Unknown sender - %s" msgstr "'Unbekannter Absender - %s" -#: ../../mod/message.php:257 +#: ../../mod/message.php:337 #, php-format msgid "You and %s" msgstr "Du und %s" -#: ../../mod/message.php:260 +#: ../../mod/message.php:340 #, php-format msgid "%s and You" -msgstr "%s und Du" +msgstr "%s und du" -#: ../../mod/message.php:270 ../../mod/message.php:392 +#: ../../mod/message.php:350 ../../mod/message.php:460 msgid "Delete conversation" msgstr "Unterhaltung löschen" -#: ../../mod/message.php:273 +#: ../../mod/message.php:353 msgid "D, d M Y - g:i A" msgstr "D, d. M Y - g:i A" -#: ../../mod/message.php:275 +#: ../../mod/message.php:355 #, php-format msgid "%d message" msgid_plural "%d messages" msgstr[0] "%d Nachricht" msgstr[1] "%d Nachrichten" -#: ../../mod/message.php:310 +#: ../../mod/message.php:390 msgid "Message not available." msgstr "Nachricht nicht verfügbar." -#: ../../mod/message.php:375 +#: ../../mod/message.php:443 msgid "Delete message" msgstr "Nachricht löschen" -#: ../../mod/message.php:394 +#: ../../mod/message.php:462 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:398 +#: ../../mod/message.php:466 msgid "Send Reply" msgstr "Antwort senden" @@ -3044,19 +3247,19 @@ msgstr "Keine Freunde zum Anzeigen." msgid "Theme settings updated." msgstr "Themeneinstellungen aktualisiert." -#: ../../mod/admin.php:96 ../../mod/admin.php:419 +#: ../../mod/admin.php:96 ../../mod/admin.php:434 msgid "Site" msgstr "Seite" -#: ../../mod/admin.php:97 ../../mod/admin.php:655 ../../mod/admin.php:667 +#: ../../mod/admin.php:97 ../../mod/admin.php:675 ../../mod/admin.php:687 msgid "Users" msgstr "Nutzer" -#: ../../mod/admin.php:98 ../../mod/admin.php:749 ../../mod/admin.php:791 +#: ../../mod/admin.php:98 ../../mod/admin.php:769 ../../mod/admin.php:811 msgid "Plugins" msgstr "Plugins" -#: ../../mod/admin.php:99 ../../mod/admin.php:954 ../../mod/admin.php:990 +#: ../../mod/admin.php:99 ../../mod/admin.php:974 ../../mod/admin.php:1010 msgid "Themes" msgstr "Themen" @@ -3064,7 +3267,7 @@ msgstr "Themen" msgid "DB updates" msgstr "DB Updates" -#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1077 +#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1097 msgid "Logs" msgstr "Protokolle" @@ -3080,561 +3283,589 @@ msgstr "Plugin Features" msgid "User registrations waiting for confirmation" msgstr "Nutzeranmeldungen die auf Bestätigung warten" -#: ../../mod/admin.php:183 ../../mod/admin.php:637 +#: ../../mod/admin.php:183 ../../mod/admin.php:657 msgid "Normal Account" msgstr "Normales Konto" -#: ../../mod/admin.php:184 ../../mod/admin.php:638 +#: ../../mod/admin.php:184 ../../mod/admin.php:658 msgid "Soapbox Account" msgstr "Marktschreier-Konto" -#: ../../mod/admin.php:185 ../../mod/admin.php:639 +#: ../../mod/admin.php:185 ../../mod/admin.php:659 msgid "Community/Celebrity Account" msgstr "Forum/Promi-Konto" -#: ../../mod/admin.php:186 ../../mod/admin.php:640 +#: ../../mod/admin.php:186 ../../mod/admin.php:660 msgid "Automatic Friend Account" msgstr "Automatisches Freundekonto" -#: ../../mod/admin.php:205 +#: ../../mod/admin.php:187 +msgid "Blog Account" +msgstr "Blog Account" + +#: ../../mod/admin.php:188 +msgid "Private Forum" +msgstr "Privates Forum" + +#: ../../mod/admin.php:207 msgid "Message queues" msgstr "Nachrichten-Warteschlangen" -#: ../../mod/admin.php:210 ../../mod/admin.php:418 ../../mod/admin.php:654 -#: ../../mod/admin.php:748 ../../mod/admin.php:790 ../../mod/admin.php:953 -#: ../../mod/admin.php:989 ../../mod/admin.php:1076 +#: ../../mod/admin.php:212 ../../mod/admin.php:433 ../../mod/admin.php:674 +#: ../../mod/admin.php:768 ../../mod/admin.php:810 ../../mod/admin.php:973 +#: ../../mod/admin.php:1009 ../../mod/admin.php:1096 msgid "Administration" msgstr "Administration" -#: ../../mod/admin.php:211 +#: ../../mod/admin.php:213 msgid "Summary" msgstr "Zusammenfassung" -#: ../../mod/admin.php:213 +#: ../../mod/admin.php:215 msgid "Registered users" msgstr "Registrierte Nutzer" -#: ../../mod/admin.php:215 +#: ../../mod/admin.php:217 msgid "Pending registrations" msgstr "Anstehende Anmeldungen" -#: ../../mod/admin.php:216 +#: ../../mod/admin.php:218 msgid "Version" msgstr "Version" -#: ../../mod/admin.php:218 +#: ../../mod/admin.php:220 msgid "Active plugins" msgstr "Aktive Plugins" -#: ../../mod/admin.php:357 +#: ../../mod/admin.php:367 msgid "Site settings updated." msgstr "Seiteneinstellungen aktualisiert." -#: ../../mod/admin.php:405 +#: ../../mod/admin.php:396 +msgid "Don't apply a special theme for mobile devices." +msgstr "Kein spezielles Theme für mobile Geräte verwenden." + +#: ../../mod/admin.php:420 msgid "Closed" msgstr "Geschlossen" -#: ../../mod/admin.php:406 +#: ../../mod/admin.php:421 msgid "Requires approval" msgstr "Bedarf der Zustimmung" -#: ../../mod/admin.php:407 +#: ../../mod/admin.php:422 msgid "Open" msgstr "Offen" -#: ../../mod/admin.php:411 +#: ../../mod/admin.php:426 msgid "No SSL policy, links will track page SSL state" msgstr "Keine SSL Richtlinie, Links werden das verwendete Protokoll beibehalten" -#: ../../mod/admin.php:412 +#: ../../mod/admin.php:427 msgid "Force all links to use SSL" msgstr "SSL für alle Links erzwingen" -#: ../../mod/admin.php:413 +#: ../../mod/admin.php:428 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:422 +#: ../../mod/admin.php:437 msgid "File upload" msgstr "Datei hochladen" -#: ../../mod/admin.php:423 +#: ../../mod/admin.php:438 msgid "Policies" msgstr "Regeln" -#: ../../mod/admin.php:424 +#: ../../mod/admin.php:439 msgid "Advanced" msgstr "Erweitert" -#: ../../mod/admin.php:428 ../../addon/statusnet/statusnet.php:552 +#: ../../mod/admin.php:443 ../../addon/statusnet/statusnet.php:567 msgid "Site name" msgstr "Seitenname" -#: ../../mod/admin.php:429 +#: ../../mod/admin.php:444 msgid "Banner/Logo" msgstr "Banner/Logo" -#: ../../mod/admin.php:430 +#: ../../mod/admin.php:445 msgid "System language" msgstr "Systemsprache" -#: ../../mod/admin.php:431 +#: ../../mod/admin.php:446 msgid "System theme" msgstr "Systemweites Thema" -#: ../../mod/admin.php:431 +#: ../../mod/admin.php:446 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:432 +#: ../../mod/admin.php:447 +msgid "Mobile system theme" +msgstr "Systemweites mobiles Thema" + +#: ../../mod/admin.php:447 +msgid "Theme for mobile devices" +msgstr "Thema für mobile Geräte" + +#: ../../mod/admin.php:448 msgid "SSL link policy" msgstr "Regeln für SSL Links" -#: ../../mod/admin.php:432 +#: ../../mod/admin.php:448 msgid "Determines whether generated links should be forced to use SSL" msgstr "Bestimmt, ob generierte Links SSL verwenden müssen" -#: ../../mod/admin.php:433 +#: ../../mod/admin.php:449 msgid "Maximum image size" msgstr "Maximale Größe von Bildern" -#: ../../mod/admin.php:433 +#: ../../mod/admin.php:449 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "Maximale Upload-Größe von Bildern in Bytes. Standard ist 0, d.h. ohne Limit." -#: ../../mod/admin.php:435 +#: ../../mod/admin.php:451 msgid "Register policy" msgstr "Registrierungsmethode" -#: ../../mod/admin.php:436 +#: ../../mod/admin.php:452 msgid "Register text" msgstr "Registrierungstext" -#: ../../mod/admin.php:436 +#: ../../mod/admin.php:452 msgid "Will be displayed prominently on the registration page." msgstr "Wird gut sichtbar auf der Registrierungsseite angezeigt." -#: ../../mod/admin.php:437 +#: ../../mod/admin.php:453 msgid "Accounts abandoned after x days" msgstr "Nutzerkonten gelten nach x Tagen als unbenutzt" -#: ../../mod/admin.php:437 +#: ../../mod/admin.php:453 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:438 +#: ../../mod/admin.php:454 msgid "Allowed friend domains" msgstr "Erlaubte Domains für Kontakte" -#: ../../mod/admin.php:438 +#: ../../mod/admin.php:454 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "Liste der Domains, die für Freundschaften erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben." -#: ../../mod/admin.php:439 +#: ../../mod/admin.php:455 msgid "Allowed email domains" -msgstr "Erlaubte Domains für Emails" +msgstr "Erlaubte Domains für E-Mails" -#: ../../mod/admin.php:439 +#: ../../mod/admin.php:455 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:440 +#: ../../mod/admin.php:456 msgid "Block public" msgstr "Öffentlichen Zugriff blockieren" -#: ../../mod/admin.php:440 +#: ../../mod/admin.php:456 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:441 +#: ../../mod/admin.php:457 msgid "Force publish" msgstr "Erzwinge Veröffentlichung" -#: ../../mod/admin.php:441 +#: ../../mod/admin.php:457 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:442 +#: ../../mod/admin.php:458 msgid "Global directory update URL" msgstr "URL für Updates beim weltweiten Verzeichnis" -#: ../../mod/admin.php:442 +#: ../../mod/admin.php:458 msgid "" "URL to update the global directory. If this is not set, the global directory" " is completely unavailable to the application." msgstr "URL für Update des globalen Verzeichnisses. Wenn nichts eingetragen ist, bleibt das globale Verzeichnis unerreichbar." -#: ../../mod/admin.php:444 +#: ../../mod/admin.php:459 +msgid "Allow threaded items" +msgstr "Erlaube Threads in Diskussionen" + +#: ../../mod/admin.php:459 +msgid "Allow infinite level threading for items on this site." +msgstr "Erlaube ein unendliches Level für Threads auf dieser Seite." + +#: ../../mod/admin.php:461 msgid "Block multiple registrations" msgstr "Unterbinde Mehrfachregistrierung" -#: ../../mod/admin.php:444 +#: ../../mod/admin.php:461 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:445 +#: ../../mod/admin.php:462 msgid "OpenID support" msgstr "OpenID Unterstützung" -#: ../../mod/admin.php:445 +#: ../../mod/admin.php:462 msgid "OpenID support for registration and logins." msgstr "OpenID-Unterstützung für Registrierung und Login." -#: ../../mod/admin.php:446 +#: ../../mod/admin.php:463 msgid "Fullname check" msgstr "Namen auf Vollständigkeit überprüfen" -#: ../../mod/admin.php:446 +#: ../../mod/admin.php:463 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:447 +#: ../../mod/admin.php:464 msgid "UTF-8 Regular expressions" msgstr "UTF-8 Reguläre Ausdrücke" -#: ../../mod/admin.php:447 +#: ../../mod/admin.php:464 msgid "Use PHP UTF8 regular expressions" msgstr "PHP UTF8 Ausdrücke verwenden" -#: ../../mod/admin.php:448 +#: ../../mod/admin.php:465 msgid "Show Community Page" msgstr "Gemeinschaftsseite anzeigen" -#: ../../mod/admin.php:448 +#: ../../mod/admin.php:465 msgid "" "Display a Community page showing all recent public postings on this site." msgstr "Zeige die Gemeinschaftsseite mit allen öffentlichen Beiträgen auf diesem Server." -#: ../../mod/admin.php:449 +#: ../../mod/admin.php:466 msgid "Enable OStatus support" msgstr "OStatus Unterstützung aktivieren" -#: ../../mod/admin.php:449 +#: ../../mod/admin.php:466 msgid "" "Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All " "communications in OStatus are public, so privacy warnings will be " "occasionally displayed." msgstr "Biete die eingebaute OStatus (identi.ca, status.net, etc.) Unterstützung an. Jede Kommunikation in OStatus ist öffentlich, so Privatsphäre Warnungen werden bei Bedarf angezeigt." -#: ../../mod/admin.php:450 +#: ../../mod/admin.php:467 msgid "Enable Diaspora support" msgstr "Diaspora-Support aktivieren" -#: ../../mod/admin.php:450 +#: ../../mod/admin.php:467 msgid "Provide built-in Diaspora network compatibility." msgstr "Verwende die eingebaute Diaspora-Verknüpfung." -#: ../../mod/admin.php:451 +#: ../../mod/admin.php:468 msgid "Only allow Friendica contacts" msgstr "Nur Friendica-Kontakte erlauben" -#: ../../mod/admin.php:451 +#: ../../mod/admin.php:468 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:452 +#: ../../mod/admin.php:469 msgid "Verify SSL" msgstr "SSL Ãœberprüfen" -#: ../../mod/admin.php:452 +#: ../../mod/admin.php:469 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:453 +#: ../../mod/admin.php:470 msgid "Proxy user" msgstr "Proxy Nutzer" -#: ../../mod/admin.php:454 +#: ../../mod/admin.php:471 msgid "Proxy URL" msgstr "Proxy URL" -#: ../../mod/admin.php:455 +#: ../../mod/admin.php:472 msgid "Network timeout" msgstr "Netzwerk Wartezeit" -#: ../../mod/admin.php:455 +#: ../../mod/admin.php:472 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:456 +#: ../../mod/admin.php:473 msgid "Delivery interval" msgstr "Zustellungsintervall" -#: ../../mod/admin.php:456 +#: ../../mod/admin.php:473 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:457 +#: ../../mod/admin.php:474 msgid "Poll interval" msgstr "Abfrageintervall" -#: ../../mod/admin.php:457 +#: ../../mod/admin.php:474 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:458 +#: ../../mod/admin.php:475 msgid "Maximum Load Average" msgstr "Maximum Load Average" -#: ../../mod/admin.php:458 +#: ../../mod/admin.php:475 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:472 +#: ../../mod/admin.php:492 msgid "Update has been marked successful" msgstr "Update wurde als erfolgreich markiert" -#: ../../mod/admin.php:482 +#: ../../mod/admin.php:502 #, php-format msgid "Executing %s failed. Check system logs." msgstr "Ausführung von %s schlug fehl. Systemprotokolle prüfen." -#: ../../mod/admin.php:485 +#: ../../mod/admin.php:505 #, php-format msgid "Update %s was successfully applied." msgstr "Update %s war erfolgreich." -#: ../../mod/admin.php:489 +#: ../../mod/admin.php:509 #, 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:492 +#: ../../mod/admin.php:512 #, php-format msgid "Update function %s could not be found." msgstr "Updatefunktion %s konnte nicht gefunden werden." -#: ../../mod/admin.php:507 +#: ../../mod/admin.php:527 msgid "No failed updates." msgstr "Keine fehlgeschlagenen Updates." -#: ../../mod/admin.php:511 +#: ../../mod/admin.php:531 msgid "Failed Updates" msgstr "Fehlgeschlagene Updates" -#: ../../mod/admin.php:512 +#: ../../mod/admin.php:532 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:513 +#: ../../mod/admin.php:533 msgid "Mark success (if update was manually applied)" msgstr "Als erfolgreich markieren (falls das Update manuell installiert wurde)" -#: ../../mod/admin.php:514 +#: ../../mod/admin.php:534 msgid "Attempt to execute this update step automatically" msgstr "Versuchen, diesen Schritt automatisch auszuführen" -#: ../../mod/admin.php:539 +#: ../../mod/admin.php:559 #, 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:546 +#: ../../mod/admin.php:566 #, 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:585 +#: ../../mod/admin.php:605 #, php-format msgid "User '%s' deleted" msgstr "Nutzer '%s' gelöscht" -#: ../../mod/admin.php:593 +#: ../../mod/admin.php:613 #, php-format msgid "User '%s' unblocked" msgstr "Nutzer '%s' entsperrt" -#: ../../mod/admin.php:593 +#: ../../mod/admin.php:613 #, php-format msgid "User '%s' blocked" msgstr "Nutzer '%s' gesperrt" -#: ../../mod/admin.php:657 +#: ../../mod/admin.php:677 msgid "select all" msgstr "Alle auswählen" -#: ../../mod/admin.php:658 +#: ../../mod/admin.php:678 msgid "User registrations waiting for confirm" msgstr "Neuanmeldungen, die auf deine Bestätigung warten" -#: ../../mod/admin.php:659 +#: ../../mod/admin.php:679 msgid "Request date" msgstr "Anfragedatum" -#: ../../mod/admin.php:659 ../../mod/admin.php:668 +#: ../../mod/admin.php:679 ../../mod/admin.php:688 #: ../../include/contact_selectors.php:79 msgid "Email" -msgstr "Email" +msgstr "E-Mail" -#: ../../mod/admin.php:660 +#: ../../mod/admin.php:680 msgid "No registrations." msgstr "Keine Neuanmeldungen." -#: ../../mod/admin.php:662 +#: ../../mod/admin.php:682 msgid "Deny" msgstr "Verwehren" -#: ../../mod/admin.php:668 +#: ../../mod/admin.php:688 msgid "Register date" msgstr "Anmeldedatum" -#: ../../mod/admin.php:668 +#: ../../mod/admin.php:688 msgid "Last login" msgstr "Letzte Anmeldung" -#: ../../mod/admin.php:668 +#: ../../mod/admin.php:688 msgid "Last item" msgstr "Letzter Beitrag" -#: ../../mod/admin.php:668 +#: ../../mod/admin.php:688 msgid "Account" msgstr "Nutzerkonto" -#: ../../mod/admin.php:670 +#: ../../mod/admin.php:690 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:671 +#: ../../mod/admin.php:691 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:712 +#: ../../mod/admin.php:732 #, php-format msgid "Plugin %s disabled." msgstr "Plugin %s deaktiviert." -#: ../../mod/admin.php:716 +#: ../../mod/admin.php:736 #, php-format msgid "Plugin %s enabled." msgstr "Plugin %s aktiviert." -#: ../../mod/admin.php:726 ../../mod/admin.php:924 +#: ../../mod/admin.php:746 ../../mod/admin.php:944 msgid "Disable" msgstr "Ausschalten" -#: ../../mod/admin.php:728 ../../mod/admin.php:926 +#: ../../mod/admin.php:748 ../../mod/admin.php:946 msgid "Enable" msgstr "Einschalten" -#: ../../mod/admin.php:750 ../../mod/admin.php:955 +#: ../../mod/admin.php:770 ../../mod/admin.php:975 msgid "Toggle" msgstr "Umschalten" -#: ../../mod/admin.php:758 ../../mod/admin.php:965 +#: ../../mod/admin.php:778 ../../mod/admin.php:985 msgid "Author: " msgstr "Autor:" -#: ../../mod/admin.php:759 ../../mod/admin.php:966 +#: ../../mod/admin.php:779 ../../mod/admin.php:986 msgid "Maintainer: " msgstr "Betreuer:" -#: ../../mod/admin.php:888 +#: ../../mod/admin.php:908 msgid "No themes found." msgstr "Keine Themen gefunden." -#: ../../mod/admin.php:947 +#: ../../mod/admin.php:967 msgid "Screenshot" msgstr "Bildschirmfoto" -#: ../../mod/admin.php:995 +#: ../../mod/admin.php:1015 msgid "[Experimental]" msgstr "[Experimentell]" -#: ../../mod/admin.php:996 +#: ../../mod/admin.php:1016 msgid "[Unsupported]" msgstr "[Nicht unterstützt]" -#: ../../mod/admin.php:1023 +#: ../../mod/admin.php:1043 msgid "Log settings updated." msgstr "Protokolleinstellungen aktualisiert." -#: ../../mod/admin.php:1079 +#: ../../mod/admin.php:1099 msgid "Clear" msgstr "löschen" -#: ../../mod/admin.php:1085 +#: ../../mod/admin.php:1105 msgid "Debugging" msgstr "Protokoll führen" -#: ../../mod/admin.php:1086 +#: ../../mod/admin.php:1106 msgid "Log file" msgstr "Protokolldatei" -#: ../../mod/admin.php:1086 +#: ../../mod/admin.php:1106 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:1087 +#: ../../mod/admin.php:1107 msgid "Log level" msgstr "Protokoll-Level" -#: ../../mod/admin.php:1137 +#: ../../mod/admin.php:1157 msgid "Close" msgstr "Schließen" -#: ../../mod/admin.php:1143 +#: ../../mod/admin.php:1163 msgid "FTP Host" msgstr "FTP Host" -#: ../../mod/admin.php:1144 +#: ../../mod/admin.php:1164 msgid "FTP Path" msgstr "FTP Pfad" -#: ../../mod/admin.php:1145 +#: ../../mod/admin.php:1165 msgid "FTP User" msgstr "FTP Nutzername" -#: ../../mod/admin.php:1146 +#: ../../mod/admin.php:1166 msgid "FTP Password" msgstr "FTP Passwort" -#: ../../mod/profile.php:21 ../../boot.php:966 +#: ../../mod/profile.php:22 ../../boot.php:1065 msgid "Requested profile is not available." msgstr "Das angefragte Profil ist nicht vorhanden." -#: ../../mod/profile.php:141 ../../mod/display.php:75 +#: ../../mod/profile.php:142 ../../mod/display.php:67 msgid "Access to this profile has been restricted." msgstr "Der Zugriff zu diesem Profil wurde eingeschränkt." -#: ../../mod/profile.php:166 +#: ../../mod/profile.php:167 msgid "Tips for New Members" msgstr "Tipps für neue Nutzer" @@ -3713,7 +3944,11 @@ msgstr "Gemeinsame Freunde" msgid "No contacts in common." msgstr "Keine gemeinsamen Kontakte." -#: ../../mod/display.php:135 +#: ../../mod/share.php:28 +msgid "link" +msgstr "Link" + +#: ../../mod/display.php:128 msgid "Item has been removed." msgstr "Eintrag wurde entfernt." @@ -3725,13 +3960,13 @@ msgstr "Anwendungen" msgid "No installed applications." msgstr "Keine Applikationen installiert." -#: ../../mod/search.php:83 ../../include/text.php:649 -#: ../../include/text.php:650 ../../include/nav.php:91 +#: ../../mod/search.php:83 ../../include/text.php:678 +#: ../../include/text.php:679 ../../include/nav.php:91 msgid "Search" msgstr "Suche" -#: ../../mod/profiles.php:21 ../../mod/profiles.php:395 -#: ../../mod/profiles.php:509 ../../mod/dfrn_confirm.php:62 +#: ../../mod/profiles.php:21 ../../mod/profiles.php:423 +#: ../../mod/profiles.php:537 ../../mod/dfrn_confirm.php:62 msgid "Profile not found." msgstr "Profil nicht gefunden." @@ -3739,289 +3974,306 @@ msgstr "Profil nicht gefunden." msgid "Profile Name is required." msgstr "Profilname ist erforderlich." -#: ../../mod/profiles.php:152 +#: ../../mod/profiles.php:160 msgid "Marital Status" msgstr "Familienstand" -#: ../../mod/profiles.php:156 +#: ../../mod/profiles.php:164 msgid "Romantic Partner" msgstr "Romanze" -#: ../../mod/profiles.php:160 +#: ../../mod/profiles.php:168 +msgid "Likes" +msgstr "Likes" + +#: ../../mod/profiles.php:172 +msgid "Dislikes" +msgstr "Dislikes" + +#: ../../mod/profiles.php:176 msgid "Work/Employment" msgstr "Arbeit / Beschäftigung" -#: ../../mod/profiles.php:163 +#: ../../mod/profiles.php:179 msgid "Religion" msgstr "Religion" -#: ../../mod/profiles.php:167 +#: ../../mod/profiles.php:183 msgid "Political Views" msgstr "Politische Ansichten" -#: ../../mod/profiles.php:171 +#: ../../mod/profiles.php:187 msgid "Gender" msgstr "Geschlecht" -#: ../../mod/profiles.php:175 +#: ../../mod/profiles.php:191 msgid "Sexual Preference" msgstr "Sexuelle Vorlieben" -#: ../../mod/profiles.php:179 +#: ../../mod/profiles.php:195 msgid "Homepage" msgstr "Webseite" -#: ../../mod/profiles.php:183 +#: ../../mod/profiles.php:199 msgid "Interests" msgstr "Interessen" -#: ../../mod/profiles.php:187 +#: ../../mod/profiles.php:203 msgid "Address" msgstr "Adresse" -#: ../../mod/profiles.php:194 ../../addon/dav/layout.fnk.php:310 +#: ../../mod/profiles.php:210 ../../addon/dav/common/wdcal_edit.inc.php:183 msgid "Location" msgstr "Wohnort" -#: ../../mod/profiles.php:273 +#: ../../mod/profiles.php:293 msgid "Profile updated." msgstr "Profil aktualisiert." -#: ../../mod/profiles.php:340 +#: ../../mod/profiles.php:360 msgid " and " msgstr " und " -#: ../../mod/profiles.php:348 +#: ../../mod/profiles.php:368 msgid "public profile" msgstr "öffentliches Profil" -#: ../../mod/profiles.php:351 +#: ../../mod/profiles.php:371 #, 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:352 +#: ../../mod/profiles.php:372 #, php-format msgid " - Visit %1$s's %2$s" msgstr " – %1$ss %2$s besuchen" -#: ../../mod/profiles.php:355 +#: ../../mod/profiles.php:375 #, 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:414 +#: ../../mod/profiles.php:442 msgid "Profile deleted." msgstr "Profil gelöscht." -#: ../../mod/profiles.php:432 ../../mod/profiles.php:466 +#: ../../mod/profiles.php:460 ../../mod/profiles.php:494 msgid "Profile-" msgstr "Profil-" -#: ../../mod/profiles.php:451 ../../mod/profiles.php:493 +#: ../../mod/profiles.php:479 ../../mod/profiles.php:521 msgid "New profile created." msgstr "Neues Profil angelegt." -#: ../../mod/profiles.php:472 +#: ../../mod/profiles.php:500 msgid "Profile unavailable to clone." msgstr "Profil nicht zum Duplizieren verfügbar." -#: ../../mod/profiles.php:530 +#: ../../mod/profiles.php:562 msgid "Hide your contact/friend list from viewers of this profile?" msgstr "Liste der Kontakte vor Betrachtern dieses Profils verbergen?" -#: ../../mod/profiles.php:553 +#: ../../mod/profiles.php:582 msgid "Edit Profile Details" msgstr "Profil bearbeiten" -#: ../../mod/profiles.php:555 +#: ../../mod/profiles.php:584 msgid "View this profile" msgstr "Dieses Profil anzeigen" -#: ../../mod/profiles.php:556 +#: ../../mod/profiles.php:585 msgid "Create a new profile using these settings" msgstr "Neues Profil anlegen und diese Einstellungen verwenden" -#: ../../mod/profiles.php:557 +#: ../../mod/profiles.php:586 msgid "Clone this profile" msgstr "Dieses Profil duplizieren" -#: ../../mod/profiles.php:558 +#: ../../mod/profiles.php:587 msgid "Delete this profile" msgstr "Dieses Profil löschen" -#: ../../mod/profiles.php:559 +#: ../../mod/profiles.php:588 msgid "Profile Name:" msgstr "Profilname:" -#: ../../mod/profiles.php:560 +#: ../../mod/profiles.php:589 msgid "Your Full Name:" msgstr "Dein kompletter Name:" -#: ../../mod/profiles.php:561 +#: ../../mod/profiles.php:590 msgid "Title/Description:" msgstr "Titel/Beschreibung:" -#: ../../mod/profiles.php:562 +#: ../../mod/profiles.php:591 msgid "Your Gender:" msgstr "Dein Geschlecht:" -#: ../../mod/profiles.php:563 +#: ../../mod/profiles.php:592 #, php-format msgid "Birthday (%s):" msgstr "Geburtstag (%s):" -#: ../../mod/profiles.php:564 +#: ../../mod/profiles.php:593 msgid "Street Address:" msgstr "Adresse:" -#: ../../mod/profiles.php:565 +#: ../../mod/profiles.php:594 msgid "Locality/City:" msgstr "Wohnort:" -#: ../../mod/profiles.php:566 +#: ../../mod/profiles.php:595 msgid "Postal/Zip Code:" msgstr "Postleitzahl:" -#: ../../mod/profiles.php:567 +#: ../../mod/profiles.php:596 msgid "Country:" msgstr "Land:" -#: ../../mod/profiles.php:568 +#: ../../mod/profiles.php:597 msgid "Region/State:" msgstr "Region/Bundesstaat:" -#: ../../mod/profiles.php:569 +#: ../../mod/profiles.php:598 msgid "♥ Marital Status:" msgstr "♥ Beziehungsstatus:" -#: ../../mod/profiles.php:570 +#: ../../mod/profiles.php:599 msgid "Who: (if applicable)" msgstr "Wer: (falls anwendbar)" -#: ../../mod/profiles.php:571 +#: ../../mod/profiles.php:600 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "Beispiele: cathy123, Cathy Williams, cathy@example.com" -#: ../../mod/profiles.php:572 +#: ../../mod/profiles.php:601 msgid "Since [date]:" msgstr "Seit [Datum]:" -#: ../../mod/profiles.php:573 ../../include/profile_advanced.php:46 +#: ../../mod/profiles.php:602 ../../include/profile_advanced.php:46 msgid "Sexual Preference:" msgstr "Sexuelle Vorlieben:" -#: ../../mod/profiles.php:574 +#: ../../mod/profiles.php:603 msgid "Homepage URL:" msgstr "Adresse der Homepage:" -#: ../../mod/profiles.php:575 ../../include/profile_advanced.php:50 +#: ../../mod/profiles.php:604 ../../include/profile_advanced.php:50 msgid "Hometown:" msgstr "Heimatort:" -#: ../../mod/profiles.php:576 ../../include/profile_advanced.php:54 +#: ../../mod/profiles.php:605 ../../include/profile_advanced.php:54 msgid "Political Views:" msgstr "Politische Ansichten:" -#: ../../mod/profiles.php:577 +#: ../../mod/profiles.php:606 msgid "Religious Views:" msgstr "Religiöse Ansichten:" -#: ../../mod/profiles.php:578 +#: ../../mod/profiles.php:607 msgid "Public Keywords:" msgstr "Öffentliche Schlüsselwörter:" -#: ../../mod/profiles.php:579 +#: ../../mod/profiles.php:608 msgid "Private Keywords:" msgstr "Private Schlüsselwörter:" -#: ../../mod/profiles.php:580 +#: ../../mod/profiles.php:609 ../../include/profile_advanced.php:62 +msgid "Likes:" +msgstr "Likes:" + +#: ../../mod/profiles.php:610 ../../include/profile_advanced.php:64 +msgid "Dislikes:" +msgstr "Dislikes:" + +#: ../../mod/profiles.php:611 msgid "Example: fishing photography software" msgstr "Beispiel: Fischen Fotografie Software" -#: ../../mod/profiles.php:581 +#: ../../mod/profiles.php:612 msgid "(Used for suggesting potential friends, can be seen by others)" msgstr "(Wird verwendet, um potentielle Freunde zu finden, könnte von Fremden eingesehen werden)" -#: ../../mod/profiles.php:582 +#: ../../mod/profiles.php:613 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:583 +#: ../../mod/profiles.php:614 msgid "Tell us about yourself..." msgstr "Erzähle uns ein bisschen von dir …" -#: ../../mod/profiles.php:584 +#: ../../mod/profiles.php:615 msgid "Hobbies/Interests" msgstr "Hobbies/Interessen" -#: ../../mod/profiles.php:585 +#: ../../mod/profiles.php:616 msgid "Contact information and Social Networks" msgstr "Kontaktinformationen und Soziale Netzwerke" -#: ../../mod/profiles.php:586 +#: ../../mod/profiles.php:617 msgid "Musical interests" msgstr "Musikalische Interessen" -#: ../../mod/profiles.php:587 +#: ../../mod/profiles.php:618 msgid "Books, literature" msgstr "Literatur/Bücher" -#: ../../mod/profiles.php:588 +#: ../../mod/profiles.php:619 msgid "Television" msgstr "Fernsehen" -#: ../../mod/profiles.php:589 +#: ../../mod/profiles.php:620 msgid "Film/dance/culture/entertainment" msgstr "Filme/Tänze/Kultur/Unterhaltung" -#: ../../mod/profiles.php:590 +#: ../../mod/profiles.php:621 msgid "Love/romance" msgstr "Liebesleben" -#: ../../mod/profiles.php:591 +#: ../../mod/profiles.php:622 msgid "Work/employment" msgstr "Arbeit/Beschäftigung" -#: ../../mod/profiles.php:592 +#: ../../mod/profiles.php:623 msgid "School/education" msgstr "Schule/Ausbildung" -#: ../../mod/profiles.php:597 +#: ../../mod/profiles.php:628 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:607 ../../mod/directory.php:111 +#: ../../mod/profiles.php:638 ../../mod/directory.php:109 msgid "Age: " msgstr "Alter: " -#: ../../mod/profiles.php:644 +#: ../../mod/profiles.php:677 msgid "Edit/Manage Profiles" msgstr "Verwalte/Editiere Profile" -#: ../../mod/profiles.php:645 ../../boot.php:1075 +#: ../../mod/profiles.php:678 ../../boot.php:1174 msgid "Change profile photo" msgstr "Profilbild ändern" -#: ../../mod/profiles.php:646 ../../boot.php:1076 +#: ../../mod/profiles.php:679 ../../boot.php:1175 msgid "Create New Profile" msgstr "Neues Profil anlegen" -#: ../../mod/profiles.php:657 ../../boot.php:1086 +#: ../../mod/profiles.php:690 ../../boot.php:1185 msgid "Profile Image" msgstr "Profilbild" -#: ../../mod/profiles.php:659 ../../boot.php:1089 +#: ../../mod/profiles.php:692 ../../boot.php:1188 msgid "visible to everybody" msgstr "sichtbar für jeden" -#: ../../mod/profiles.php:660 ../../boot.php:1090 +#: ../../mod/profiles.php:693 ../../boot.php:1189 msgid "Edit visibility" msgstr "Sichtbarkeit bearbeiten" -#: ../../mod/filer.php:29 ../../include/conversation.php:947 +#: ../../mod/filer.php:29 ../../include/conversation.php:1105 +#: ../../include/conversation.php:1122 msgid "Save to Folder:" msgstr "In diesen Ordner verschieben:" @@ -4029,7 +4281,7 @@ msgstr "In diesen Ordner verschieben:" msgid "- select -" msgstr "- auswählen -" -#: ../../mod/tagger.php:103 ../../include/conversation.php:138 +#: ../../mod/tagger.php:103 ../../include/conversation.php:256 #, 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" @@ -4069,6 +4321,50 @@ msgstr "Hinzufügen" msgid "No entries." msgstr "Keine Einträge" +#: ../../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: " +msgstr "bb2html: " + +#: ../../mod/babel.php:39 +msgid "bb2html2bb: " +msgstr "bb2html2bb: " + +#: ../../mod/babel.php:43 +msgid "bb2md: " +msgstr "bb2md: " + +#: ../../mod/babel.php:47 +msgid "bb2md2html: " +msgstr "bb2md2html: " + +#: ../../mod/babel.php:51 +msgid "bb2dia2bb: " +msgstr "bb2dia2bb: " + +#: ../../mod/babel.php:55 +msgid "bb2md2html2bb: " +msgstr "bb2md2html2bb: " + +#: ../../mod/babel.php:65 +msgid "Source input (Diaspora format): " +msgstr "Texteingabe (Diaspora Format): " + +#: ../../mod/babel.php:70 +msgid "diaspora2bb: " +msgstr "diaspora2bb: " + #: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:626 #: ../../include/contact_widgets.php:34 msgid "Friend Suggestions" @@ -4096,11 +4392,30 @@ msgstr "Auf diesem Server suchen" msgid "Site Directory" msgstr "Verzeichnis" -#: ../../mod/directory.php:114 +#: ../../mod/directory.php:112 msgid "Gender: " msgstr "Geschlecht:" -#: ../../mod/directory.php:140 +#: ../../mod/directory.php:134 ../../include/profile_advanced.php:17 +#: ../../boot.php:1210 +msgid "Gender:" +msgstr "Geschlecht:" + +#: ../../mod/directory.php:136 ../../include/profile_advanced.php:37 +#: ../../boot.php:1213 +msgid "Status:" +msgstr "Status:" + +#: ../../mod/directory.php:138 ../../include/profile_advanced.php:48 +#: ../../boot.php:1215 +msgid "Homepage:" +msgstr "Homepage:" + +#: ../../mod/directory.php:140 ../../include/profile_advanced.php:58 +msgid "About:" +msgstr "Über:" + +#: ../../mod/directory.php:178 msgid "No entries (some entries may be hidden)." msgstr "Keine Einträge (einige Einträge könnten versteckt sein)." @@ -4111,7 +4426,7 @@ msgstr "%s: Keine gültige Email Adresse." #: ../../mod/invite.php:59 msgid "Please join us on Friendica" -msgstr "Bitte trete uns auf Friendica bei" +msgstr "Bitte trete bei uns auf Friendica bei" #: ../../mod/invite.php:69 #, php-format @@ -4157,7 +4472,7 @@ msgstr "Friendica Server verbinden sich alle untereinander, um ein großes daten msgid "" "Our apologies. This system is not currently configured to connect with other" " public sites or invite members." -msgstr "Es tut uns Leid. Dieses System ist zurzeit nicht dafür konfiguriert, sich mit anderen öffentlichen Seiten zu verbinden oder Mitglieder einzuladen." +msgstr "Es tut uns leid. Dieses System ist zurzeit nicht dafür konfiguriert, sich mit anderen öffentlichen Seiten zu verbinden oder Mitglieder einzuladen." #: ../../mod/invite.php:111 msgid "Send invitations" @@ -4217,14 +4532,14 @@ msgstr "Zeitweiser Fehler. Bitte warte einige Momente und versuche es dann noch #: ../../mod/dfrn_confirm.php:275 msgid "Introduction failed or was revoked." -msgstr "Kontaktanfrage schlug fehl oder wurde zurück gezogen." +msgstr "Kontaktanfrage schlug fehl oder wurde zurückgezogen." #: ../../mod/dfrn_confirm.php:420 msgid "Unable to set contact photo." msgstr "Konnte das Bild des Kontakts nicht speichern." -#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:510 -#: ../../include/conversation.php:101 +#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:608 +#: ../../include/conversation.php:162 #, php-format msgid "%1$s is now friends with %2$s" msgstr "%1$s ist nun mit %2$s befreundet" @@ -4236,7 +4551,7 @@ msgstr "Für '%s' wurde kein Nutzer gefunden" #: ../../mod/dfrn_confirm.php:572 msgid "Our site encryption key is apparently messed up." -msgstr "Der Verschlüsselungsschlüssel unserer Seite ist anscheinend im Arsch." +msgstr "Der Verschlüsselungsschlüssel unserer Seite ist anscheinend nicht in Ordnung." #: ../../mod/dfrn_confirm.php:583 msgid "Empty site URL was provided or URL could not be decrypted by us." @@ -4275,204 +4590,221 @@ msgstr "Auf %s wurde die Verbindung akzeptiert" msgid "%1$s has joined %2$s" msgstr "%1$s ist %2$s beigetreten" -#: ../../addon/facebook/facebook.php:513 +#: ../../addon/fromgplus/fromgplus.php:29 +msgid "Google+ Import Settings" +msgstr "Google+ Import Einstellungen" + +#: ../../addon/fromgplus/fromgplus.php:32 +msgid "Enable Google+ Import" +msgstr "Aktiviere Google+ Import" + +#: ../../addon/fromgplus/fromgplus.php:35 +msgid "Google Account ID" +msgstr "Google Account ID" + +#: ../../addon/fromgplus/fromgplus.php:55 +msgid "Google+ Import Settings saved." +msgstr "Google+ Import Einstellungen gespeichert." + +#: ../../addon/facebook/facebook.php:523 msgid "Facebook disabled" msgstr "Facebook deaktiviert" -#: ../../addon/facebook/facebook.php:518 +#: ../../addon/facebook/facebook.php:528 msgid "Updating contacts" msgstr "Aktualisiere Kontakte" -#: ../../addon/facebook/facebook.php:541 +#: ../../addon/facebook/facebook.php:551 msgid "Facebook API key is missing." msgstr "Facebook-API-Schlüssel nicht gefunden" -#: ../../addon/facebook/facebook.php:548 +#: ../../addon/facebook/facebook.php:558 msgid "Facebook Connect" msgstr "Mit Facebook verbinden" -#: ../../addon/facebook/facebook.php:554 +#: ../../addon/facebook/facebook.php:564 msgid "Install Facebook connector for this account." msgstr "Facebook-Connector für dieses Konto installieren." -#: ../../addon/facebook/facebook.php:561 +#: ../../addon/facebook/facebook.php:571 msgid "Remove Facebook connector" msgstr "Facebook-Connector entfernen" -#: ../../addon/facebook/facebook.php:566 +#: ../../addon/facebook/facebook.php:576 msgid "" "Re-authenticate [This is necessary whenever your Facebook password is " "changed.]" -msgstr "Neu authentifizieren [Das ist immer dann nötig, wenn Du Dein Facebook-Passwort geändert hast.]" +msgstr "Neu authentifizieren [Das ist immer dann nötig, wenn du dein Facebook-Passwort geändert hast.]" -#: ../../addon/facebook/facebook.php:573 +#: ../../addon/facebook/facebook.php:583 msgid "Post to Facebook by default" msgstr "Veröffentliche standardmäßig bei Facebook" -#: ../../addon/facebook/facebook.php:579 +#: ../../addon/facebook/facebook.php:589 msgid "" "Facebook friend linking has been disabled on this site. The following " "settings will have no effect." msgstr "Das Verlinken von Facebookkontakten wurde auf dieser Seite deaktiviert. Die folgenden Einstellungen haben keinen Effekt." -#: ../../addon/facebook/facebook.php:583 +#: ../../addon/facebook/facebook.php:593 msgid "" "Facebook friend linking has been disabled on this site. If you disable it, " "you will be unable to re-enable it." msgstr "Das Verlinken von Facebookkontakten wurde auf dieser Seite deaktiviert. Wenn du es ausgeschaltet hast, kannst du es nicht wieder aktivieren." -#: ../../addon/facebook/facebook.php:586 +#: ../../addon/facebook/facebook.php:596 msgid "Link all your Facebook friends and conversations on this website" msgstr "All meine Facebook-Kontakte und -Konversationen hier auf diese Website importieren" -#: ../../addon/facebook/facebook.php:588 +#: ../../addon/facebook/facebook.php:598 msgid "" "Facebook conversations consist of your profile wall and your friend" " stream." msgstr "Facebook-Konversationen bestehen aus deinen Beiträgen auf deinerPinnwand, sowie den Beiträgen deiner Freunde Stream." -#: ../../addon/facebook/facebook.php:589 +#: ../../addon/facebook/facebook.php:599 msgid "On this website, your Facebook friend stream is only visible to you." msgstr "Hier auf dieser Webseite kannst nur du die Beiträge Deiner Facebook-Freunde (Stream) sehen." -#: ../../addon/facebook/facebook.php:590 +#: ../../addon/facebook/facebook.php:600 msgid "" "The following settings determine the privacy of your Facebook profile wall " "on this website." -msgstr "Mit den folgenden Einstellungen kannst Du die Privatsphäre der Kopie Deiner Facebook-Pinnwand hier auf dieser Seite einstellen." +msgstr "Mit den folgenden Einstellungen kannst du die Privatsphäre der Kopie Deiner Facebook-Pinnwand hier auf dieser Seite einstellen." -#: ../../addon/facebook/facebook.php:594 +#: ../../addon/facebook/facebook.php:604 msgid "" "On this website your Facebook profile wall conversations will only be " "visible to you" msgstr "Meine Facebook-Pinnwand hier auf dieser Webseite nur für mich sichtbar machen" -#: ../../addon/facebook/facebook.php:599 +#: ../../addon/facebook/facebook.php:609 msgid "Do not import your Facebook profile wall conversations" msgstr "Facebook-Pinnwand nicht importieren" -#: ../../addon/facebook/facebook.php:601 +#: ../../addon/facebook/facebook.php:611 msgid "" "If you choose to link conversations and leave both of these boxes unchecked," " your Facebook profile wall will be merged with your profile wall on this " "website and your privacy settings on this website will be used to determine " "who may see the conversations." -msgstr "Wenn Du Facebook-Konversationen importierst und diese beiden Häkchen nicht setzt, wird Deine Facebook-Pinnwand mit der Pinnwand hier auf dieser Webseite vereinigt. Die Privatsphäre-Einstellungen für Deine Pinnwand auf dieser Webseite geben dann an, wer die Konversationen sehen kann." +msgstr "Wenn du Facebook-Konversationen importierst und diese beiden Häkchen nicht setzt, wird deine Facebook-Pinnwand mit der Pinnwand hier auf dieser Webseite vereinigt. Die Privatsphäre-Einstellungen für deine Pinnwand auf dieser Webseite geben dann an, wer die Konversationen sehen kann." -#: ../../addon/facebook/facebook.php:606 +#: ../../addon/facebook/facebook.php:616 msgid "Comma separated applications to ignore" msgstr "Kommaseparierte Anwendungen, die ignoriert werden sollen" -#: ../../addon/facebook/facebook.php:690 +#: ../../addon/facebook/facebook.php:700 msgid "Problems with Facebook Real-Time Updates" msgstr "Probleme mit Facebook Echtzeit-Updates" -#: ../../addon/facebook/facebook.php:718 +#: ../../addon/facebook/facebook.php:728 #: ../../include/contact_selectors.php:81 msgid "Facebook" msgstr "Facebook" -#: ../../addon/facebook/facebook.php:719 +#: ../../addon/facebook/facebook.php:729 msgid "Facebook Connector Settings" msgstr "Facebook-Verbindungseinstellungen" -#: ../../addon/facebook/facebook.php:734 +#: ../../addon/facebook/facebook.php:744 msgid "Facebook API Key" msgstr "Facebook API Schlüssel" -#: ../../addon/facebook/facebook.php:744 +#: ../../addon/facebook/facebook.php:754 msgid "" "Error: it appears that you have specified the App-ID and -Secret in your " ".htconfig.php file. As long as they are specified there, they cannot be set " "using this form.

    " msgstr "Fehler: du scheinst die App-ID und das App-Geheimnis in deiner .htconfig.php Datei angegeben zu haben. Solange sie dort festgelegt werden kannst du dieses Formular hier nicht verwenden.

    " -#: ../../addon/facebook/facebook.php:749 +#: ../../addon/facebook/facebook.php:759 msgid "" "Error: the given API Key seems to be incorrect (the application access token" " could not be retrieved)." msgstr "Fehler: der angegebene API Schlüssel scheint nicht korrekt zu sein (Zugriffstoken konnte nicht empfangen werden)." -#: ../../addon/facebook/facebook.php:751 +#: ../../addon/facebook/facebook.php:761 msgid "The given API Key seems to work correctly." msgstr "Der angegebene API Schlüssel scheint korrekt zu funktionieren." -#: ../../addon/facebook/facebook.php:753 +#: ../../addon/facebook/facebook.php:763 msgid "" -"The correctness of the API Key could not be detected. Somthing strange's " +"The correctness of the API Key could not be detected. Something strange's " "going on." -msgstr "Die Echtheit des API Schlüssels konnte nicht überprüft werden. Etwas Merkwürdiges ist hier im Gange." +msgstr "Die Richtigkeit des API Schlüssels konnte nicht gefunden werden. Irgendwas stimmt nicht." -#: ../../addon/facebook/facebook.php:756 +#: ../../addon/facebook/facebook.php:766 msgid "App-ID / API-Key" msgstr "App-ID / API-Key" -#: ../../addon/facebook/facebook.php:757 +#: ../../addon/facebook/facebook.php:767 msgid "Application secret" msgstr "Anwendungs-Geheimnis" -#: ../../addon/facebook/facebook.php:758 +#: ../../addon/facebook/facebook.php:768 #, php-format msgid "Polling Interval in minutes (minimum %1$s minutes)" msgstr "Abfrageintervall in Minuten (min %1$s Minuten)" -#: ../../addon/facebook/facebook.php:759 +#: ../../addon/facebook/facebook.php:769 msgid "" "Synchronize comments (no comments on Facebook are missed, at the cost of " "increased system load)" msgstr "Kommentare synchronisieren (Kein Kommentar von Facebook geht verloren, verursacht höhere Last auf dem Server)" -#: ../../addon/facebook/facebook.php:763 +#: ../../addon/facebook/facebook.php:773 msgid "Real-Time Updates" msgstr "Echtzeit Aktualisierungen" -#: ../../addon/facebook/facebook.php:767 +#: ../../addon/facebook/facebook.php:777 msgid "Real-Time Updates are activated." msgstr "Echtzeit-Updates sind aktiviert." -#: ../../addon/facebook/facebook.php:768 +#: ../../addon/facebook/facebook.php:778 msgid "Deactivate Real-Time Updates" msgstr "Echtzeit-Updates deaktivieren" -#: ../../addon/facebook/facebook.php:770 +#: ../../addon/facebook/facebook.php:780 msgid "Real-Time Updates not activated." msgstr "Echtzeit-Updates nicht aktiviert." -#: ../../addon/facebook/facebook.php:770 +#: ../../addon/facebook/facebook.php:780 msgid "Activate Real-Time Updates" msgstr "Echtzeit-Updates aktivieren" -#: ../../addon/facebook/facebook.php:789 ../../addon/dav/layout.fnk.php:360 +#: ../../addon/facebook/facebook.php:799 +#: ../../addon/dav/friendica/layout.fnk.php:361 msgid "The new values have been saved." msgstr "Die neuen Einstellungen wurden gespeichert." -#: ../../addon/facebook/facebook.php:813 +#: ../../addon/facebook/facebook.php:823 msgid "Post to Facebook" msgstr "Bei Facebook veröffentlichen" -#: ../../addon/facebook/facebook.php:911 +#: ../../addon/facebook/facebook.php:921 msgid "" "Post to Facebook cancelled because of multi-network access permission " "conflict." msgstr "Beitrag wurde nicht bei Facebook veröffentlicht, da Konflikte bei den Multi-Netzwerk-Zugriffsrechten vorliegen." -#: ../../addon/facebook/facebook.php:1131 +#: ../../addon/facebook/facebook.php:1149 msgid "View on Friendica" msgstr "In Friendica betrachten" -#: ../../addon/facebook/facebook.php:1164 +#: ../../addon/facebook/facebook.php:1182 msgid "Facebook post failed. Queued for retry." msgstr "Veröffentlichung bei Facebook gescheitert. Wir versuchen es später erneut." -#: ../../addon/facebook/facebook.php:1204 +#: ../../addon/facebook/facebook.php:1222 msgid "Your Facebook connection became invalid. Please Re-authenticate." msgstr "Deine Facebook Anmeldedaten sind ungültig geworden. Bitte re-authentifiziere dich." -#: ../../addon/facebook/facebook.php:1205 +#: ../../addon/facebook/facebook.php:1223 msgid "Facebook connection became invalid" msgstr "Facebook Anmeldedaten sind ungültig geworden" -#: ../../addon/facebook/facebook.php:1206 +#: ../../addon/facebook/facebook.php:1224 #, php-format msgid "" "Hi %1$s,\n" @@ -4492,23 +4824,35 @@ msgstr "StatusNet AutoFollow Einstellungen" msgid "Automatically follow any StatusNet followers/mentioners" msgstr "Automatisch allen StatusNet Followern/Erwähnungen folgen" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:182 +#: ../../addon/bg/bg.php:51 +msgid "Bg settings updated." +msgstr "Bg Einstellungen sind aktualisiert." + +#: ../../addon/bg/bg.php:82 +msgid "Bg Settings" +msgstr "Bg Einstellungen" + +#: ../../addon/bg/bg.php:84 ../../addon/numfriends/numfriends.php:79 +msgid "How many contacts to display on profile sidebar" +msgstr "Wie viele Kontakte sollen in der Seitenleiste angezeigt werden" + +#: ../../addon/privacy_image_cache/privacy_image_cache.php:260 msgid "Lifetime of the cache (in hours)" msgstr "Lebenszeit des Caches (in Stunden)" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:187 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:265 msgid "Cache Statistics" msgstr "Cache Statistik" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:190 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:268 msgid "Number of items" msgstr "Anzahl der Einträge" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:192 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:270 msgid "Size of the cache" msgstr "Größe des Caches" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:194 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:272 msgid "Delete the whole cache" msgstr "Cache leeren" @@ -4517,7 +4861,7 @@ msgstr "Cache leeren" msgid "%d person likes this" msgid_plural "%d people like this" msgstr[0] "%d Person mag das" -msgstr[1] "%d Leuten mögen das" +msgstr[1] "%d Leute mögen das" #: ../../addon/widgets/widget_like.php:61 #, php-format @@ -4546,6 +4890,157 @@ msgstr "Verfügbare Widgets" msgid "Connect on Friendica!" msgstr "In Friendica verbinden!" +#: ../../addon/morepokes/morepokes.php:19 +msgid "bitchslap" +msgstr "abwatschen" + +#: ../../addon/morepokes/morepokes.php:19 +msgid "bitchslapped" +msgstr "watschte" + +#: ../../addon/morepokes/morepokes.php:20 +msgid "shag" +msgstr "poppen" + +#: ../../addon/morepokes/morepokes.php:20 +msgid "shagged" +msgstr "poppte" + +#: ../../addon/morepokes/morepokes.php:21 +msgid "do something obscenely biological to" +msgstr "mit ihm/ihr etwas obszönes Körperliches machen" + +#: ../../addon/morepokes/morepokes.php:21 +msgid "did something obscenely biological to" +msgstr "machte etwas obszönes Körperliches mit" + +#: ../../addon/morepokes/morepokes.php:22 +msgid "point out the new poke feature to" +msgstr "die neue Anstups-Funktion zeigen" + +#: ../../addon/morepokes/morepokes.php:22 +msgid "pointed out the new poke feature to" +msgstr "zeigte die neue Anstups-Funktion" + +#: ../../addon/morepokes/morepokes.php:23 +msgid "declare undying love for" +msgstr "unterbliche Liebe verkünden" + +#: ../../addon/morepokes/morepokes.php:23 +msgid "declared undying love for" +msgstr "verkündete unsterbliche Liebe für" + +#: ../../addon/morepokes/morepokes.php:24 +msgid "set fire to" +msgstr "" + +#: ../../addon/morepokes/morepokes.php:25 +msgid "patent" +msgstr "patentieren" + +#: ../../addon/morepokes/morepokes.php:25 +msgid "patented" +msgstr "patentierte" + +#: ../../addon/morepokes/morepokes.php:26 +msgid "stroke beard" +msgstr "sich den Bart kratzen" + +#: ../../addon/morepokes/morepokes.php:26 +msgid "stroked their beard at" +msgstr "kratzte sich den Bart in Richtung" + +#: ../../addon/morepokes/morepokes.php:27 +msgid "" +"bemoan the declining standards of modern secondary and tertiary education to" +msgstr "sich über die sinkenden Standards der Schul- und Hochschulbildung beklagen" + +#: ../../addon/morepokes/morepokes.php:27 +msgid "" +"bemoans the declining standards of modern secondary and tertiary education " +"to" +msgstr "beklagte sich über die sinkenden Standards der Schul- und Hochschulbildung bei" + +#: ../../addon/morepokes/morepokes.php:28 +msgid "hug" +msgstr "umarmen" + +#: ../../addon/morepokes/morepokes.php:28 +msgid "hugged" +msgstr "umarmte" + +#: ../../addon/morepokes/morepokes.php:29 +msgid "kiss" +msgstr "küssen" + +#: ../../addon/morepokes/morepokes.php:29 +msgid "kissed" +msgstr "küsste" + +#: ../../addon/morepokes/morepokes.php:30 +msgid "raise eyebrows at" +msgstr "Augenbrauen hochziehen" + +#: ../../addon/morepokes/morepokes.php:30 +msgid "raised their eyebrows at" +msgstr "zog die Augenbrauen hoch in Richtung" + +#: ../../addon/morepokes/morepokes.php:31 +msgid "insult" +msgstr "beleidigen" + +#: ../../addon/morepokes/morepokes.php:31 +msgid "insulted" +msgstr "beleidigte" + +#: ../../addon/morepokes/morepokes.php:32 +msgid "praise" +msgstr "preisen" + +#: ../../addon/morepokes/morepokes.php:32 +msgid "praised" +msgstr "pries" + +#: ../../addon/morepokes/morepokes.php:33 +msgid "be dubious of" +msgstr "ungewiss sein" + +#: ../../addon/morepokes/morepokes.php:33 +msgid "was dubious of" +msgstr "war ungewiss über" + +#: ../../addon/morepokes/morepokes.php:34 +msgid "eat" +msgstr "essen" + +#: ../../addon/morepokes/morepokes.php:34 +msgid "ate" +msgstr "aß" + +#: ../../addon/morepokes/morepokes.php:35 +msgid "giggle and fawn at" +msgstr "kichern und einschleimen" + +#: ../../addon/morepokes/morepokes.php:35 +msgid "giggled and fawned at" +msgstr "kicherte und schleimte sich ein bei" + +#: ../../addon/morepokes/morepokes.php:36 +msgid "doubt" +msgstr "bezweifeln" + +#: ../../addon/morepokes/morepokes.php:36 +msgid "doubted" +msgstr "bezweifelte" + +#: ../../addon/morepokes/morepokes.php:37 +msgid "glare" +msgstr "zornig anstarren" + +#: ../../addon/morepokes/morepokes.php:37 +msgid "glared at" +msgstr "starrte zornig auf" + #: ../../addon/yourls/yourls.php:55 msgid "YourLS Settings" msgstr "YourLS Einstellungen" @@ -4629,15 +5124,34 @@ msgstr "NSFW-Einstellungen gespeichert" msgid "%s - Click to open/close" msgstr "%s – Zum Öffnen/Schließen klicken" -#: ../../addon/page/page.php:48 +#: ../../addon/page/page.php:61 ../../addon/page/page.php:91 +#: ../../addon/forumlist/forumlist.php:54 msgid "Forums" msgstr "Foren" -#: ../../addon/page/page.php:63 ../../addon/showmore/showmore.php:87 -#: ../../include/contact_widgets.php:188 ../../include/conversation.php:476 -#: ../../boot.php:524 -msgid "show more" -msgstr "mehr anzeigen" +#: ../../addon/page/page.php:129 ../../addon/forumlist/forumlist.php:88 +msgid "Forums:" +msgstr "Foren:" + +#: ../../addon/page/page.php:165 +msgid "Page settings updated." +msgstr "Seiteneinstellungen aktualisiert." + +#: ../../addon/page/page.php:194 +msgid "Page Settings" +msgstr "Seiteneinstellungen" + +#: ../../addon/page/page.php:196 ../../addon/forumlist/forumlist.php:155 +msgid "How many forums to display on sidebar without paging" +msgstr "Wie viele Foren sollen in der Seitenleiste ohne Umblättern angezeigt werden" + +#: ../../addon/page/page.php:199 +msgid "Randomise Page/Forum list" +msgstr "Zufällige Seiten/Foren Liste" + +#: ../../addon/page/page.php:202 +msgid "Show pages/forums on profile page" +msgstr "Foren/Seiten auf der Profilseite anzeigen" #: ../../addon/planets/planets.php:150 msgid "Planets Settings" @@ -4651,7 +5165,7 @@ msgstr "Aktiviere Planeten Plugin" #: ../../addon/communityhome/communityhome.php:34 #: ../../addon/communityhome/twillingham/communityhome.php:28 #: ../../addon/communityhome/twillingham/communityhome.php:34 -#: ../../include/nav.php:64 ../../boot.php:822 +#: ../../include/nav.php:64 ../../boot.php:921 msgid "Login" msgstr "Anmeldung" @@ -4679,208 +5193,553 @@ msgid "Latest likes" msgstr "Neueste Favoriten" #: ../../addon/communityhome/communityhome.php:155 -#: ../../view/theme/diabook/theme.php:562 ../../include/text.php:1314 -#: ../../include/conversation.php:45 ../../include/conversation.php:118 +#: ../../view/theme/diabook/theme.php:562 ../../include/text.php:1397 +#: ../../include/conversation.php:106 ../../include/conversation.php:236 msgid "event" msgstr "Veranstaltung" -#: ../../addon/dav/common/wdcal_configuration.php:126 -msgid "U.S. Time Format (mm/dd/YYYY)" -msgstr "U.S. Datumsformat (mm/dd/YYYY)" - -#: ../../addon/dav/common/wdcal_configuration.php:205 -msgid "German Time Format (dd.mm.YYYY)" -msgstr "Deutsches Datumsformat (dd.mm.YYYY)" - -#: ../../addon/dav/common/calendar.fnk.php:517 -#: ../../addon/dav/common/calendar.fnk.php:533 -#: ../../addon/dav/layout.fnk.php:200 -msgid "Error" -msgstr "Fehler" - -#: ../../addon/dav/common/calendar.fnk.php:568 -#: ../../addon/dav/common/calendar.fnk.php:637 -#: ../../addon/dav/common/calendar.fnk.php:664 -#: ../../addon/dav/layout.fnk.php:231 +#: ../../addon/dav/common/wdcal_backend.inc.php:92 +#: ../../addon/dav/common/wdcal_backend.inc.php:166 +#: ../../addon/dav/common/wdcal_backend.inc.php:178 +#: ../../addon/dav/common/wdcal_backend.inc.php:206 +#: ../../addon/dav/common/wdcal_backend.inc.php:214 +#: ../../addon/dav/common/wdcal_backend.inc.php:229 msgid "No access" msgstr "Kein Zugriff" -#: ../../addon/dav/layout.fnk.php:119 -msgid "New event" -msgstr "Neue Veranstaltung" +#: ../../addon/dav/common/wdcal_edit.inc.php:30 +#: ../../addon/dav/common/wdcal_edit.inc.php:738 +msgid "Could not open component for editing" +msgstr "Kalender-Editierfunktion konnte nicht geöffnet werden" -#: ../../addon/dav/layout.fnk.php:123 -msgid "Today" -msgstr "Heute" - -#: ../../addon/dav/layout.fnk.php:132 -msgid "Day" -msgstr "Tag" - -#: ../../addon/dav/layout.fnk.php:139 -msgid "Week" -msgstr "Woche" - -#: ../../addon/dav/layout.fnk.php:146 -msgid "Month" -msgstr "Monat" - -#: ../../addon/dav/layout.fnk.php:151 -msgid "Reload" -msgstr "Neu Laden" - -#: ../../addon/dav/layout.fnk.php:162 -msgid "Date" -msgstr "Datum" - -#: ../../addon/dav/layout.fnk.php:224 -msgid "Not found" -msgstr "Nicht gefunden" - -#: ../../addon/dav/layout.fnk.php:292 ../../addon/dav/layout.fnk.php:365 +#: ../../addon/dav/common/wdcal_edit.inc.php:140 +#: ../../addon/dav/friendica/layout.fnk.php:143 +#: ../../addon/dav/friendica/layout.fnk.php:422 msgid "Go back to the calendar" msgstr "Zurück zum Kalender" -#: ../../addon/dav/layout.fnk.php:300 -msgid "Starts" -msgstr "Beginnt" +#: ../../addon/dav/common/wdcal_edit.inc.php:144 +msgid "Event data" +msgstr "Veranstaltungsdetails" -#: ../../addon/dav/layout.fnk.php:305 -msgid "Ends" -msgstr "Endet" - -#: ../../addon/dav/layout.fnk.php:312 -msgid "Description" -msgstr "Beschreibung" - -#: ../../addon/dav/layout.fnk.php:315 -msgid "Notification" -msgstr "Benachrichtigung" - -#: ../../addon/dav/layout.fnk.php:324 -msgid "Minutes" -msgstr "Minuten" - -#: ../../addon/dav/layout.fnk.php:327 -msgid "Hours" -msgstr "Stunden" - -#: ../../addon/dav/layout.fnk.php:330 -msgid "Days" -msgstr "Tage" - -#: ../../addon/dav/layout.fnk.php:331 -msgid "before" -msgstr "vorher" - -#: ../../addon/dav/layout.fnk.php:367 -msgid "Calendar Settings" -msgstr "Kalender Einstellungen" - -#: ../../addon/dav/layout.fnk.php:373 -msgid "Date format" -msgstr "Datumsformat" - -#: ../../addon/dav/layout.fnk.php:382 -msgid "Time zone" -msgstr "Zeitzone" - -#: ../../addon/dav/layout.fnk.php:387 -msgid "Limitations" -msgstr "Einschränkungen" - -#: ../../addon/dav/layout.fnk.php:391 -msgid "Warning" -msgstr "Warnung" - -#: ../../addon/dav/layout.fnk.php:395 -msgid "Synchronization (iPhone, Thunderbird Lightning, Android, ...)" -msgstr "Synchronisation (iPhone, Thunderbird Lightning, Android, ...)" - -#: ../../addon/dav/layout.fnk.php:402 -msgid "Synchronizing this calendar with the iPhone" -msgstr "Diesen Kalender mit dem iPhone synchronisieren" - -#: ../../addon/dav/layout.fnk.php:413 -msgid "Synchronizing your Friendica-Contacts with the iPhone" -msgstr "Friendica-Kontakte mit dem iPhone synchronisieren" - -#: ../../addon/dav/dav_carddav_backend_friendica_community.inc.php:37 -msgid "Friendica-Contacts" -msgstr "Friendica-Kontakte" - -#: ../../addon/dav/dav_carddav_backend_friendica_community.inc.php:38 -msgid "Your Friendica-Contacts" -msgstr "Deine Friendica-Kontakte" - -#: ../../addon/dav/main.php:244 +#: ../../addon/dav/common/wdcal_edit.inc.php:146 +#: ../../addon/dav/friendica/main.php:239 msgid "Calendar" msgstr "Kalender" -#: ../../addon/dav/main.php:247 +#: ../../addon/dav/common/wdcal_edit.inc.php:163 +msgid "Special color" +msgstr "Spezielle Farbe" + +#: ../../addon/dav/common/wdcal_edit.inc.php:169 +msgid "Subject" +msgstr "Betreff:" + +#: ../../addon/dav/common/wdcal_edit.inc.php:173 +msgid "Starts" +msgstr "Beginnt" + +#: ../../addon/dav/common/wdcal_edit.inc.php:178 +msgid "Ends" +msgstr "Endet" + +#: ../../addon/dav/common/wdcal_edit.inc.php:185 +msgid "Description" +msgstr "Beschreibung" + +#: ../../addon/dav/common/wdcal_edit.inc.php:188 +msgid "Recurrence" +msgstr "Wiederholungen:" + +#: ../../addon/dav/common/wdcal_edit.inc.php:190 +msgid "Frequency" +msgstr "Frequenz" + +#: ../../addon/dav/common/wdcal_edit.inc.php:194 +#: ../../include/contact_selectors.php:59 +msgid "Daily" +msgstr "Täglich" + +#: ../../addon/dav/common/wdcal_edit.inc.php:197 +#: ../../include/contact_selectors.php:60 +msgid "Weekly" +msgstr "Wöchentlich" + +#: ../../addon/dav/common/wdcal_edit.inc.php:200 +#: ../../include/contact_selectors.php:61 +msgid "Monthly" +msgstr "Monatlich" + +#: ../../addon/dav/common/wdcal_edit.inc.php:203 +msgid "Yearly" +msgstr "Jährlich" + +#: ../../addon/dav/common/wdcal_edit.inc.php:214 +#: ../../include/datetime.php:288 +msgid "days" +msgstr "Tage" + +#: ../../addon/dav/common/wdcal_edit.inc.php:215 +#: ../../include/datetime.php:287 +msgid "weeks" +msgstr "Wochen" + +#: ../../addon/dav/common/wdcal_edit.inc.php:216 +#: ../../include/datetime.php:286 +msgid "months" +msgstr "Monate" + +#: ../../addon/dav/common/wdcal_edit.inc.php:217 +#: ../../include/datetime.php:285 +msgid "years" +msgstr "Jahre" + +#: ../../addon/dav/common/wdcal_edit.inc.php:218 +msgid "Interval" +msgstr "Intervall" + +#: ../../addon/dav/common/wdcal_edit.inc.php:218 +msgid "All %select% %time%" +msgstr "Jeden %select% %time%" + +#: ../../addon/dav/common/wdcal_edit.inc.php:222 +#: ../../addon/dav/common/wdcal_edit.inc.php:260 +#: ../../addon/dav/common/wdcal_edit.inc.php:481 +msgid "Days" +msgstr "Tage" + +#: ../../addon/dav/common/wdcal_edit.inc.php:231 +#: ../../addon/dav/common/wdcal_edit.inc.php:254 +#: ../../addon/dav/common/wdcal_edit.inc.php:270 +#: ../../addon/dav/common/wdcal_edit.inc.php:293 +#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:917 +msgid "Sunday" +msgstr "Sonntag" + +#: ../../addon/dav/common/wdcal_edit.inc.php:235 +#: ../../addon/dav/common/wdcal_edit.inc.php:274 +#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:917 +msgid "Monday" +msgstr "Montag" + +#: ../../addon/dav/common/wdcal_edit.inc.php:238 +#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:917 +msgid "Tuesday" +msgstr "Dienstag" + +#: ../../addon/dav/common/wdcal_edit.inc.php:241 +#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:917 +msgid "Wednesday" +msgstr "Mittwoch" + +#: ../../addon/dav/common/wdcal_edit.inc.php:244 +#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:917 +msgid "Thursday" +msgstr "Donnerstag" + +#: ../../addon/dav/common/wdcal_edit.inc.php:247 +#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:917 +msgid "Friday" +msgstr "Freitag" + +#: ../../addon/dav/common/wdcal_edit.inc.php:250 +#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:917 +msgid "Saturday" +msgstr "Samstag" + +#: ../../addon/dav/common/wdcal_edit.inc.php:297 +msgid "First day of week:" +msgstr "Erster Tag der Woche" + +#: ../../addon/dav/common/wdcal_edit.inc.php:350 +#: ../../addon/dav/common/wdcal_edit.inc.php:373 +msgid "Day of month" +msgstr "Tag des Monats" + +#: ../../addon/dav/common/wdcal_edit.inc.php:354 +msgid "#num#th of each month" +msgstr "#num#ten jedes Monats" + +#: ../../addon/dav/common/wdcal_edit.inc.php:357 +msgid "#num#th-last of each month" +msgstr "letzten #num#ten jedes Monats" + +#: ../../addon/dav/common/wdcal_edit.inc.php:360 +msgid "#num#th #wkday# of each month" +msgstr "jeden #num#ten #wkday# eines Monats" + +#: ../../addon/dav/common/wdcal_edit.inc.php:363 +msgid "#num#th-last #wkday# of each month" +msgstr "jeden #num#ten letzten #wkday# eines Monats" + +#: ../../addon/dav/common/wdcal_edit.inc.php:372 +#: ../../addon/dav/friendica/layout.fnk.php:255 +msgid "Month" +msgstr "Monat" + +#: ../../addon/dav/common/wdcal_edit.inc.php:377 +msgid "#num#th of the given month" +msgstr "#num#ten des Monats" + +#: ../../addon/dav/common/wdcal_edit.inc.php:380 +msgid "#num#th-last of the given month" +msgstr "letzten #num#ten des Monats" + +#: ../../addon/dav/common/wdcal_edit.inc.php:383 +msgid "#num#th #wkday# of the given month" +msgstr "jeden #num#ten eines Monats" + +#: ../../addon/dav/common/wdcal_edit.inc.php:386 +msgid "#num#th-last #wkday# of the given month" +msgstr "jeden #num#ten letzten eines Monats" + +#: ../../addon/dav/common/wdcal_edit.inc.php:413 +msgid "Repeat until" +msgstr "Wiederholungen" + +#: ../../addon/dav/common/wdcal_edit.inc.php:417 +msgid "Infinite" +msgstr "unendlich" + +#: ../../addon/dav/common/wdcal_edit.inc.php:420 +msgid "Until the following date" +msgstr "bis zum folgenden Datum" + +#: ../../addon/dav/common/wdcal_edit.inc.php:423 +msgid "Number of times" +msgstr "Bestimmte Anzahl von Wiederholungen" + +#: ../../addon/dav/common/wdcal_edit.inc.php:429 +msgid "Exceptions" +msgstr "Ausnahmen" + +#: ../../addon/dav/common/wdcal_edit.inc.php:432 +msgid "none" +msgstr "keine" + +#: ../../addon/dav/common/wdcal_edit.inc.php:449 +msgid "Notification" +msgstr "Benachrichtigung" + +#: ../../addon/dav/common/wdcal_edit.inc.php:466 +msgid "Notify by" +msgstr "Benarchrichtigungsmethode" + +#: ../../addon/dav/common/wdcal_edit.inc.php:469 +msgid "E-Mail" +msgstr "E-Mail" + +#: ../../addon/dav/common/wdcal_edit.inc.php:470 +msgid "On Friendica / Display" +msgstr "Bei Friendica / Anzeige" + +#: ../../addon/dav/common/wdcal_edit.inc.php:474 +msgid "Time" +msgstr "Zeit" + +#: ../../addon/dav/common/wdcal_edit.inc.php:478 +msgid "Hours" +msgstr "Stunden" + +#: ../../addon/dav/common/wdcal_edit.inc.php:479 +msgid "Minutes" +msgstr "Minuten" + +#: ../../addon/dav/common/wdcal_edit.inc.php:480 +msgid "Seconds" +msgstr "Sekunden" + +#: ../../addon/dav/common/wdcal_edit.inc.php:482 +msgid "Weeks" +msgstr "Wochen" + +#: ../../addon/dav/common/wdcal_edit.inc.php:485 +msgid "before the" +msgstr "vor dem" + +#: ../../addon/dav/common/wdcal_edit.inc.php:486 +msgid "start of the event" +msgstr "Beginn des Termins" + +#: ../../addon/dav/common/wdcal_edit.inc.php:487 +msgid "end of the event" +msgstr "Ende des Termins" + +#: ../../addon/dav/common/wdcal_edit.inc.php:492 +msgid "Add a notification" +msgstr "Benachrichtigung hinzufügen" + +#: ../../addon/dav/common/wdcal_edit.inc.php:687 +msgid "The event #name# will start at #date" +msgstr "Der Termin #name# wird am #date anfangen" + +#: ../../addon/dav/common/wdcal_edit.inc.php:696 +msgid "#name# is about to begin." +msgstr "#name# beginnt demnächst." + +#: ../../addon/dav/common/wdcal_edit.inc.php:769 +msgid "Saved" +msgstr "Gespeichert" + +#: ../../addon/dav/common/wdcal_configuration.php:148 +msgid "U.S. Time Format (mm/dd/YYYY)" +msgstr "U.S. Datumsformat (mm/dd/YYYY)" + +#: ../../addon/dav/common/wdcal_configuration.php:243 +msgid "German Time Format (dd.mm.YYYY)" +msgstr "Deutsches Datumsformat (dd.mm.YYYY)" + +#: ../../addon/dav/common/dav_caldav_backend_private.inc.php:39 +msgid "Private Events" +msgstr "Privater Termin" + +#: ../../addon/dav/common/dav_carddav_backend_private.inc.php:46 +msgid "Private Addressbooks" +msgstr "Private Adressbücher" + +#: ../../addon/dav/friendica/dav_caldav_backend_virtual_friendica.inc.php:36 +msgid "Friendica-Native events" +msgstr "Friendica Veranstaltungen" + +#: ../../addon/dav/friendica/dav_carddav_backend_virtual_friendica.inc.php:36 +#: ../../addon/dav/friendica/dav_carddav_backend_virtual_friendica.inc.php:59 +msgid "Friendica-Contacts" +msgstr "Friendica-Kontakte" + +#: ../../addon/dav/friendica/dav_carddav_backend_virtual_friendica.inc.php:60 +msgid "Your Friendica-Contacts" +msgstr "Deine Friendica-Kontakte" + +#: ../../addon/dav/friendica/layout.fnk.php:99 +#: ../../addon/dav/friendica/layout.fnk.php:136 +msgid "" +"Something went wrong when trying to import the file. Sorry. Maybe some " +"events were imported anyway." +msgstr "Entschuldigung. Bei dem Versuch die Datei zu importieren ist etwas schief gelaufen. Vielleicht wurden aber einige der Termine dennoch importiert." + +#: ../../addon/dav/friendica/layout.fnk.php:131 +msgid "Something went wrong when trying to import the file. Sorry." +msgstr "Entschuldigung. Beim Importieren der Datei ist etwas schief gelaufen." + +#: ../../addon/dav/friendica/layout.fnk.php:134 +msgid "The ICS-File has been imported." +msgstr "Die ICS-Datei wurde importoert." + +#: ../../addon/dav/friendica/layout.fnk.php:138 +msgid "No file was uploaded." +msgstr "Es wurde keine Datei geladen." + +#: ../../addon/dav/friendica/layout.fnk.php:147 +msgid "Import a ICS-file" +msgstr "Importiere eine ICS-Datei" + +#: ../../addon/dav/friendica/layout.fnk.php:150 +msgid "ICS-File" +msgstr "ICS-Datei" + +#: ../../addon/dav/friendica/layout.fnk.php:151 +msgid "Overwrite all #num# existing events" +msgstr "Überschreibe alle #num# existierenden Einträge" + +#: ../../addon/dav/friendica/layout.fnk.php:228 +msgid "New event" +msgstr "Neue Veranstaltung" + +#: ../../addon/dav/friendica/layout.fnk.php:232 +msgid "Today" +msgstr "Heute" + +#: ../../addon/dav/friendica/layout.fnk.php:241 +msgid "Day" +msgstr "Tag" + +#: ../../addon/dav/friendica/layout.fnk.php:248 +msgid "Week" +msgstr "Woche" + +#: ../../addon/dav/friendica/layout.fnk.php:260 +msgid "Reload" +msgstr "Neu Laden" + +#: ../../addon/dav/friendica/layout.fnk.php:271 +msgid "Date" +msgstr "Datum" + +#: ../../addon/dav/friendica/layout.fnk.php:313 +msgid "Error" +msgstr "Fehler" + +#: ../../addon/dav/friendica/layout.fnk.php:380 +msgid "The calendar has been updated." +msgstr "Der Kalender wurde aktualisiert." + +#: ../../addon/dav/friendica/layout.fnk.php:393 +msgid "The new calendar has been created." +msgstr "Der neue Kalender wurde erstellt." + +#: ../../addon/dav/friendica/layout.fnk.php:417 +msgid "The calendar has been deleted." +msgstr "Der Kalender wurde gelöscht." + +#: ../../addon/dav/friendica/layout.fnk.php:424 +msgid "Calendar Settings" +msgstr "Kalendereinstellungen" + +#: ../../addon/dav/friendica/layout.fnk.php:430 +msgid "Date format" +msgstr "Datumsformat" + +#: ../../addon/dav/friendica/layout.fnk.php:439 +msgid "Time zone" +msgstr "Zeitzone" + +#: ../../addon/dav/friendica/layout.fnk.php:445 +msgid "Calendars" +msgstr "Kalender" + +#: ../../addon/dav/friendica/layout.fnk.php:487 +msgid "Create a new calendar" +msgstr "Neuen Kalender anlegen" + +#: ../../addon/dav/friendica/layout.fnk.php:496 +msgid "Limitations" +msgstr "Einschränkungen" + +#: ../../addon/dav/friendica/layout.fnk.php:500 +#: ../../addon/libravatar/libravatar.php:82 +msgid "Warning" +msgstr "Warnung" + +#: ../../addon/dav/friendica/layout.fnk.php:504 +msgid "Synchronization (iPhone, Thunderbird Lightning, Android, ...)" +msgstr "Synchronisation (iPhone, Thunderbird Lightning, Android, ...)" + +#: ../../addon/dav/friendica/layout.fnk.php:511 +msgid "Synchronizing this calendar with the iPhone" +msgstr "Diesen Kalender mit dem iPhone synchronisieren" + +#: ../../addon/dav/friendica/layout.fnk.php:522 +msgid "Synchronizing your Friendica-Contacts with the iPhone" +msgstr "Friendica-Kontakte mit dem iPhone synchronisieren" + +#: ../../addon/dav/friendica/main.php:202 +msgid "" +"The current version of this plugin has not been set up correctly. Please " +"contact the system administrator of your installation of friendica to fix " +"this." +msgstr "Die aktuelle Version dieses Plugins wurde nicht korrekt eingestellt. Bitte kontaktiere den System-Administrator deiner Friendica Installation um den Fehler zu beheben." + +#: ../../addon/dav/friendica/main.php:242 msgid "Extended calendar with CalDAV-support" msgstr "Erweiterter Kalender mit CalDAV Unterstützung." -#: ../../addon/dav/main.php:263 -msgid "The database tables have been installed." -msgstr "Die Datenbank-Tabellen wurden installiert." +#: ../../addon/dav/friendica/main.php:279 +#: ../../addon/dav/friendica/main.php:280 ../../include/delivery.php:463 +#: ../../include/enotify.php:28 ../../include/notifier.php:710 +msgid "noreply" +msgstr "noreply" -#: ../../addon/dav/main.php:264 +#: ../../addon/dav/friendica/main.php:282 +msgid "Notification: " +msgstr "Benachrichtigungen: " + +#: ../../addon/dav/friendica/main.php:309 +msgid "The database tables have been installed." +msgstr "Die Datenbanktabellen wurden installiert." + +#: ../../addon/dav/friendica/main.php:310 msgid "An error occurred during the installation." msgstr "Während der Installation trat ein Fehler auf." -#: ../../addon/dav/main.php:280 +#: ../../addon/dav/friendica/main.php:316 +msgid "The database tables have been updated." +msgstr "Die Tabellen in der Datenbank wurden aktualisiert." + +#: ../../addon/dav/friendica/main.php:317 +msgid "An error occurred during the update." +msgstr "Während der Aktualisierung trat ein Fehler auf." + +#: ../../addon/dav/friendica/main.php:333 msgid "No system-wide settings yet." msgstr "Momentan keine systemweiten Einstellungen." -#: ../../addon/dav/main.php:283 +#: ../../addon/dav/friendica/main.php:336 msgid "Database status" -msgstr "Datenbank Status" +msgstr "Datenbankstatus" -#: ../../addon/dav/main.php:286 +#: ../../addon/dav/friendica/main.php:339 msgid "Installed" msgstr "Installiert" -#: ../../addon/dav/main.php:289 +#: ../../addon/dav/friendica/main.php:343 msgid "Upgrade needed" msgstr "Upgrade erforderlich" -#: ../../addon/dav/main.php:289 +#: ../../addon/dav/friendica/main.php:343 +msgid "" +"Please back up all calendar data (the tables beginning with dav_*) before " +"proceeding. While all calendar events should be converted to the new " +"database structure, it's always safe to have a backup. Below, you can have a" +" look at the database-queries that will be made when pressing the " +"'update'-button." +msgstr "Bitte sichere alle Kalenderdaten (die Tabellen mit dav_* beginnend) bevor du mit dem Update fortfährst. Eigentliche sollten alle Kalendereinträge in die neue Datenbankstruktur übernommen werden, aber sicher ist sicher. Weiter unten kannst du die Datenbank-Anfragen ansehen, die im Verlauf des Updates gemacht werden." + +#: ../../addon/dav/friendica/main.php:343 msgid "Upgrade" msgstr "Upgrade" -#: ../../addon/dav/main.php:292 +#: ../../addon/dav/friendica/main.php:346 msgid "Not installed" msgstr "Nicht installiert" -#: ../../addon/dav/main.php:292 +#: ../../addon/dav/friendica/main.php:346 msgid "Install" msgstr "Installieren" -#: ../../addon/dav/main.php:297 +#: ../../addon/dav/friendica/main.php:350 +msgid "Unknown" +msgstr "Unbekannt" + +#: ../../addon/dav/friendica/main.php:350 +msgid "" +"Something really went wrong. I cannot recover from this state automatically," +" sorry. Please go to the database backend, back up the data, and delete all " +"tables beginning with 'dav_' manually. Afterwards, this installation routine" +" should be able to reinitialize the tables automatically." +msgstr "Irgendetwas ging schief. Ich kann leider von diesem Zustand der Datenbank leider nicht automatisch fortfahren. Bitte mache ein Backup der Daten aus der Datenbank und lösche anschließend alle Tabellen deren Name mit 'dav_' anfangen. Anschließend sollte diese Installations-Routine in der Lage sein die nötigen Tabellen automatisch neu anzulegen." + +#: ../../addon/dav/friendica/main.php:355 msgid "Troubleshooting" msgstr "Problembehebung" -#: ../../addon/dav/main.php:298 +#: ../../addon/dav/friendica/main.php:356 msgid "Manual creation of the database tables:" -msgstr "Manuelles anlegen der Datenbank Tabellen:" +msgstr "Manuelles Anlegen der Datenbanktabellen:" -#: ../../addon/dav/main.php:299 +#: ../../addon/dav/friendica/main.php:357 msgid "Show SQL-statements" msgstr "SQL-Anweisungen anzeigen" -#: ../../addon/dav/calendar.friendica.fnk.php:151 +#: ../../addon/dav/friendica/calendar.friendica.fnk.php:206 msgid "Private Calendar" msgstr "Privater Kalender" -#: ../../addon/dav/calendar.friendica.fnk.php:158 +#: ../../addon/dav/friendica/calendar.friendica.fnk.php:207 msgid "Friendica Events: Mine" msgstr "Meine Friendica-Veranstaltungen" -#: ../../addon/dav/calendar.friendica.fnk.php:161 +#: ../../addon/dav/friendica/calendar.friendica.fnk.php:208 msgid "Friendica Events: Contacts" msgstr "Friendica Veranstaltungen meiner Kontakte" +#: ../../addon/dav/friendica/calendar.friendica.fnk.php:248 +msgid "Private Addresses" +msgstr "Private Adressen" + +#: ../../addon/dav/friendica/calendar.friendica.fnk.php:249 +msgid "Friendica Contacts" +msgstr "Friendica Kontakte" + #: ../../addon/uhremotestorage/uhremotestorage.php:84 #, php-format msgid "" @@ -4888,7 +5747,7 @@ msgid "" " storage (like ownCloud). See RemoteStorage" " WebFinger" -msgstr "Ermöglicht dir, deine friendica id (%s) mit externen unhosted-fähigen Speichern (z.B. ownCloud) zu verbinden. Siehe RemoteStorage WebFinger" +msgstr "Ermöglicht dir, deine Friendica ID (%s) mit externen unhosted-fähigen Speichern (z.B. ownCloud) zu verbinden. Siehe RemoteStorage WebFinger" #: ../../addon/uhremotestorage/uhremotestorage.php:85 msgid "Template URL (with {category})" @@ -4896,7 +5755,7 @@ msgstr "Vorlagen URL (mit {Kategorie})" #: ../../addon/uhremotestorage/uhremotestorage.php:86 msgid "OAuth end-point" -msgstr "OAuth end-point" +msgstr "OAuth Endpunkt" #: ../../addon/uhremotestorage/uhremotestorage.php:87 msgid "Api" @@ -5028,7 +5887,7 @@ msgstr "Drupal Seite verwendet bereinigte URLs" msgid "Post to Drupal by default" msgstr "Veröffentliche öffentliche Beiträge standardmäßig bei Drupal" -#: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:199 +#: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:201 #: ../../addon/blogger/blogger.php:172 ../../addon/posterous/posterous.php:189 msgid "Post from Friendica" msgstr "Beitrag via Friendica" @@ -5115,6 +5974,30 @@ msgstr "OEmbed für Youtube Videos verwenden" msgid "URL to embed:" msgstr "URL zum Einbetten:" +#: ../../addon/forumlist/forumlist.php:57 +msgid "show/hide" +msgstr "anzeigen/verbergen" + +#: ../../addon/forumlist/forumlist.php:72 +msgid "No forum subscriptions" +msgstr "Keine Foren-Mitgliedschaften." + +#: ../../addon/forumlist/forumlist.php:124 +msgid "Forumlist settings updated." +msgstr "Einstellungen zur Foren-Liste aktualisiert." + +#: ../../addon/forumlist/forumlist.php:153 +msgid "Forumlist Settings" +msgstr "Foren-Liste Einstellungen" + +#: ../../addon/forumlist/forumlist.php:158 +msgid "Randomise Forumlist/Forum list" +msgstr "Zufällige Zusammenstellung der Foren-Liste" + +#: ../../addon/forumlist/forumlist.php:161 +msgid "Show forumlists/forums on profile forumlist" +msgstr "Liste der Foren deren Abonnement du bist in deinem Profil anzeigen:" + #: ../../addon/impressum/impressum.php:36 msgid "Impressum" msgstr "Impressum" @@ -5273,6 +6156,82 @@ msgstr "Standard Zoom" msgid "The default zoom level. (1:world, 18:highest)" msgstr "Standard Zoomlevel (1: Welt; 18: höchstes)" +#: ../../addon/group_text/group_text.php:46 +#: ../../addon/editplain/editplain.php:46 +msgid "Editplain settings updated." +msgstr "Editplain Einstellungen aktualisiert" + +#: ../../addon/group_text/group_text.php:76 +msgid "Group Text" +msgstr "Gruppen als Text" + +#: ../../addon/group_text/group_text.php:78 +msgid "Use a text only (non-image) group selector in the \"group edit\" menu" +msgstr "Beim Bearbeiten von Gruppen Text statt Bilder anzeigen" + +#: ../../addon/libravatar/libravatar.php:14 +msgid "Could NOT install Libravatar successfully.
    It requires PHP >= 5.3" +msgstr "Kann Libravatar NICHT erfolgreich installieren.
    PHP >=5.3 wird benötigt" + +#: ../../addon/libravatar/libravatar.php:73 +#: ../../addon/gravatar/gravatar.php:71 +msgid "generic profile image" +msgstr "allgemeines Profilbild" + +#: ../../addon/libravatar/libravatar.php:74 +#: ../../addon/gravatar/gravatar.php:72 +msgid "random geometric pattern" +msgstr "zufällig erzeugtes geometrisches Muster" + +#: ../../addon/libravatar/libravatar.php:75 +#: ../../addon/gravatar/gravatar.php:73 +msgid "monster face" +msgstr "Monstergesicht" + +#: ../../addon/libravatar/libravatar.php:76 +#: ../../addon/gravatar/gravatar.php:74 +msgid "computer generated face" +msgstr "Computergesicht" + +#: ../../addon/libravatar/libravatar.php:77 +#: ../../addon/gravatar/gravatar.php:75 +msgid "retro arcade style face" +msgstr "Retro Arcade Design Gesicht" + +#: ../../addon/libravatar/libravatar.php:83 +#, php-format +msgid "Your PHP version %s is lower than the required PHP >= 5.3." +msgstr "Deine PHP Version %s ist niedriger als die benötigte Version PHP >= 5.3." + +#: ../../addon/libravatar/libravatar.php:84 +msgid "This addon is not functional on your server." +msgstr "Dieses Addon funktioniert auf deinem Server nicht." + +#: ../../addon/libravatar/libravatar.php:93 +#: ../../addon/gravatar/gravatar.php:89 +msgid "Information" +msgstr "Information" + +#: ../../addon/libravatar/libravatar.php:93 +msgid "" +"Gravatar addon is installed. Please disable the Gravatar addon.
    The " +"Libravatar addon will fall back to Gravatar if nothing was found at " +"Libravatar." +msgstr "Das Gravatar Addon ist installiert. Bitte schalte das Gravatar Addon aus.
    Das Libravatar Addon nutzt Gravater, sollte nichts auf Libravatar gefunden werden." + +#: ../../addon/libravatar/libravatar.php:100 +#: ../../addon/gravatar/gravatar.php:96 +msgid "Default avatar image" +msgstr "Standard Profilbild " + +#: ../../addon/libravatar/libravatar.php:100 +msgid "Select default avatar image if none was found. See README" +msgstr "Das Standard Avatar Bild wurde nicht gefunden. Siehe README" + +#: ../../addon/libravatar/libravatar.php:112 +msgid "Libravatar settings updated." +msgstr "Libravatar Einstellungen sind aktualisiert." + #: ../../addon/libertree/libertree.php:36 msgid "Post to libertree" msgstr "bei libertree veröffentlichen" @@ -5297,6 +6256,18 @@ msgstr "Libertree URL" msgid "Post to Libertree by default" msgstr "Standardmäßig bei libertree veröffentlichen" +#: ../../addon/altpager/altpager.php:46 +msgid "Altpager settings updated." +msgstr "Altpager Einstellungen sind aktualisiert." + +#: ../../addon/altpager/altpager.php:79 +msgid "Alternate Pagination Setting" +msgstr "Alternative Seitenumbruch Einstellung" + +#: ../../addon/altpager/altpager.php:81 +msgid "Use links to \"newer\" and \"older\" pages in place of page numbers?" +msgstr "Nutze Links zu \"neuer\" und \"älter\" Seiten, statt Seiten Nummern?" + #: ../../addon/mathjax/mathjax.php:37 msgid "" "The MathJax addon renders mathematical formulae written using the LaTeX " @@ -5318,10 +6289,6 @@ msgid "" "be either the MathJax CDN or another installation of MathJax." msgstr "Die URL der MathJax Javascript-Datei, die verwendet werden soll. Diese kann entweder aus der MathJax CDN oder einer anderen Quelle stammen." -#: ../../addon/editplain/editplain.php:46 -msgid "Editplain settings updated." -msgstr "Editplain Einstellungen aktualisiert" - #: ../../addon/editplain/editplain.php:76 msgid "Editplain Settings" msgstr "Editplain Einstellungen" @@ -5330,43 +6297,26 @@ msgstr "Editplain Einstellungen" msgid "Disable richtext status editor" msgstr "RichText Editor deaktivieren" -#: ../../addon/gravatar/gravatar.php:71 -msgid "generic profile image" -msgstr "allgemeines Profilbild" +#: ../../addon/gravatar/gravatar.php:89 +msgid "" +"Libravatar addon is installed, too. Please disable Libravatar addon or this " +"Gravatar addon.
    The Libravatar addon will fall back to Gravatar if " +"nothing was found at Libravatar." +msgstr "Das Libravatar Addon ist ebenfalls installiert. Bitte deaktiviere das Libravatar Addon oder dieses Gravatar Addon.
    Das Libravatar Addon nutzt Gravater, sollte nichts auf Libravatar gefunden werden." -#: ../../addon/gravatar/gravatar.php:72 -msgid "random geometric pattern" -msgstr "zufällig erzeugtes geometrisches Muster" - -#: ../../addon/gravatar/gravatar.php:73 -msgid "monster face" -msgstr "Monstergesicht" - -#: ../../addon/gravatar/gravatar.php:74 -msgid "computer generated face" -msgstr "Computergesicht" - -#: ../../addon/gravatar/gravatar.php:75 -msgid "retro arcade style face" -msgstr "Retro Arcade Design Gesicht" - -#: ../../addon/gravatar/gravatar.php:87 -msgid "Default avatar image" -msgstr "Standard Profilbild " - -#: ../../addon/gravatar/gravatar.php:87 +#: ../../addon/gravatar/gravatar.php:96 msgid "Select default avatar image if none was found at Gravatar. See README" msgstr "Wähle das Standardgesicht, wenn kein Bild auf Gravatar gefunden wurde. Schaue auch sonst im README nach." -#: ../../addon/gravatar/gravatar.php:88 +#: ../../addon/gravatar/gravatar.php:97 msgid "Rating of images" msgstr "Bildbewertung" -#: ../../addon/gravatar/gravatar.php:88 +#: ../../addon/gravatar/gravatar.php:97 msgid "Select the appropriate avatar rating for your site. See README" -msgstr "Wähle eine angemessene Bildbewertung für Deinen Server. Schaue auch sonst im README nach." +msgstr "Wähle eine angemessene Bildbewertung für deinen Server. Schaue auch sonst im README nach." -#: ../../addon/gravatar/gravatar.php:102 +#: ../../addon/gravatar/gravatar.php:111 msgid "Gravatar settings updated." msgstr "Gravatar Einstellungen aktualisiert." @@ -5449,7 +6399,7 @@ msgid "" "There are preconfigured OAuth key pairs for some StatusNet servers " "available. If you are useing one of them, please use these credentials. If " "not feel free to connect to any other StatusNet instance (see below)." -msgstr "Für einige StatusNet Server sind voreingestellt OAuth Schlüsselpaare verfügbar. Solltest du einen dieser Server benutzen, dann verwende bitte diese Schlüssel. Falls nicht, stellen stattdessen eine Verbindung zu irgend einem anderen StatusNet Server her (siehe unten)." +msgstr "Für einige StatusNet Server sind voreingestellte OAuth Schlüsselpaare verfügbar. Solltest du einen dieser Server benutzen, dann verwende bitte diese Schlüssel. Falls nicht, stelle stattdessen eine Verbindung zu irgend einem anderen StatusNet Server her (siehe unten)." #: ../../addon/statusnet/statusnet.php:280 msgid "Provide your own OAuth Credentials" @@ -5539,7 +6489,7 @@ msgstr "Sende verlinkte #-Tags und @-Namen nach StatusNet" msgid "Clear OAuth configuration" msgstr "OAuth-Konfiguration löschen" -#: ../../addon/statusnet/statusnet.php:553 +#: ../../addon/statusnet/statusnet.php:568 msgid "API URL" msgstr "API-URL" @@ -5579,10 +6529,6 @@ msgstr "Numfriends Einstellungen aktualisiert" msgid "Numfriends Settings" msgstr "Numfriends Einstellungen" -#: ../../addon/numfriends/numfriends.php:79 -msgid "How many contacts to display on profile sidebar" -msgstr "Wie viele Kontakte sollen in der Seitenleiste angezeigt werden" - #: ../../addon/gnot/gnot.php:48 msgid "Gnot settings updated." msgstr "Gnot Einstellungen aktualisiert." @@ -5604,7 +6550,7 @@ msgstr "Dieses Plugin/Addon aktivieren?" #: ../../addon/gnot/gnot.php:97 #, php-format msgid "[Friendica:Notify] Comment to conversation #%d" -msgstr "[Friendica Meldung] Kommentar zum Beitrag #%d" +msgstr "[Friendica-Meldung] Kommentar zum Beitrag #%d" #: ../../addon/wppost/wppost.php:42 msgid "Post to Wordpress" @@ -5636,11 +6582,11 @@ msgstr "Standardmäßig auf WordPress veröffentlichen" #: ../../addon/wppost/wppost.php:103 msgid "Provide a backlink to the Friendica post" -msgstr "Einen zurück zum Friendica-Beitrag hinzufügen" +msgstr "Einen Link zurück zum Friendica-Beitrag hinzufügen" -#: ../../addon/wppost/wppost.php:205 +#: ../../addon/wppost/wppost.php:207 msgid "Read the original post and comment stream on Friendica" -msgstr "Den Original-Beitrag samt Kommentaren bei Friendica lesen" +msgstr "Den Originalbeitrag samt Kommentaren bei Friendica lesen" #: ../../addon/showmore/showmore.php:38 msgid "\"Show more\" Settings" @@ -5670,7 +6616,7 @@ msgid "" "If you do not want that your visits are logged this way you can" " set a cookie to prevent Piwik from tracking further visits of the site " "(opt-out)." -msgstr "Wenn Du nicht willst, dass Deine Besuche auf diese Weise gespeichert werden, kannst Du ein Cookie setzen. Dann wird Piwik Dich auf dieser Website nicht mehr verfolgen (opt-out)." +msgstr "Wenn du nicht willst, dass deine Besuche auf diese Weise gespeichert werden, kannst du ein Cookie setzen. Dann wird Piwik dich auf dieser Website nicht mehr verfolgen (opt-out)." #: ../../addon/piwik/piwik.php:90 msgid "Piwik Base URL" @@ -5756,11 +6702,11 @@ msgstr "Veröffentliche öffentliche Beiträge standardmäßig bei Twitter" msgid "Send linked #-tags and @-names to Twitter" msgstr "Sende verlinkte #-Tags und @-Namen nach Twitter" -#: ../../addon/twitter/twitter.php:383 +#: ../../addon/twitter/twitter.php:396 msgid "Consumer key" msgstr "Consumer Key" -#: ../../addon/twitter/twitter.php:384 +#: ../../addon/twitter/twitter.php:397 msgid "Consumer secret" msgstr "Consumer Secret" @@ -6060,10 +7006,6 @@ msgstr "Mitte" msgid "Set colour scheme" msgstr "Farbschema wählen" -#: ../../include/profile_advanced.php:17 ../../boot.php:1111 -msgid "Gender:" -msgstr "Geschlecht:" - #: ../../include/profile_advanced.php:22 msgid "j F, Y" msgstr "j F, Y" @@ -6072,8 +7014,7 @@ msgstr "j F, Y" msgid "j F" msgstr "j F" -#: ../../include/profile_advanced.php:30 ../../include/datetime.php:450 -#: ../../include/items.php:1446 +#: ../../include/profile_advanced.php:30 msgid "Birthday:" msgstr "Geburtstag:" @@ -6081,19 +7022,11 @@ msgstr "Geburtstag:" msgid "Age:" msgstr "Alter:" -#: ../../include/profile_advanced.php:37 ../../boot.php:1114 -msgid "Status:" -msgstr "Status:" - #: ../../include/profile_advanced.php:43 #, php-format msgid "for %1$d %2$s" msgstr "für %1$d %2$s" -#: ../../include/profile_advanced.php:48 ../../boot.php:1116 -msgid "Homepage:" -msgstr "Homepage:" - #: ../../include/profile_advanced.php:52 msgid "Tags:" msgstr "Tags" @@ -6102,43 +7035,39 @@ msgstr "Tags" msgid "Religion:" msgstr "Religion:" -#: ../../include/profile_advanced.php:58 -msgid "About:" -msgstr "Über:" - #: ../../include/profile_advanced.php:60 msgid "Hobbies/Interests:" msgstr "Hobbies/Interessen:" -#: ../../include/profile_advanced.php:62 +#: ../../include/profile_advanced.php:67 msgid "Contact information and Social Networks:" msgstr "Kontaktinformationen und Soziale Netzwerke:" -#: ../../include/profile_advanced.php:64 +#: ../../include/profile_advanced.php:69 msgid "Musical interests:" msgstr "Musikalische Interessen:" -#: ../../include/profile_advanced.php:66 +#: ../../include/profile_advanced.php:71 msgid "Books, literature:" msgstr "Literatur/Bücher:" -#: ../../include/profile_advanced.php:68 +#: ../../include/profile_advanced.php:73 msgid "Television:" msgstr "Fernsehen:" -#: ../../include/profile_advanced.php:70 +#: ../../include/profile_advanced.php:75 msgid "Film/dance/culture/entertainment:" msgstr "Filme/Tänze/Kultur/Unterhaltung:" -#: ../../include/profile_advanced.php:72 +#: ../../include/profile_advanced.php:77 msgid "Love/Romance:" msgstr "Liebesleben:" -#: ../../include/profile_advanced.php:74 +#: ../../include/profile_advanced.php:79 msgid "Work/employment:" msgstr "Arbeit/Beschäftigung:" -#: ../../include/profile_advanced.php:76 +#: ../../include/profile_advanced.php:81 msgid "School/education:" msgstr "Schule/Ausbildung:" @@ -6178,18 +7107,6 @@ msgstr "Stündlich" msgid "Twice daily" msgstr "Zweimal täglich" -#: ../../include/contact_selectors.php:59 -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:77 msgid "OStatus" msgstr "OStatus" @@ -6358,7 +7275,7 @@ msgstr "Untreu" msgid "Sex Addict" msgstr "Sexbesessen" -#: ../../include/profile_selectors.php:42 ../../include/user.php:272 +#: ../../include/profile_selectors.php:42 ../../include/user.php:278 msgid "Friends" msgstr "Freunde" @@ -6446,22 +7363,21 @@ msgstr "Ist mir nicht wichtig" msgid "Ask me" msgstr "Frag mich" -#: ../../include/event.php:17 ../../include/bb2diaspora.php:249 +#: ../../include/event.php:20 ../../include/bb2diaspora.php:439 msgid "Starts:" msgstr "Beginnt:" -#: ../../include/event.php:27 ../../include/bb2diaspora.php:257 +#: ../../include/event.php:30 ../../include/bb2diaspora.php:447 msgid "Finishes:" msgstr "Endet:" -#: ../../include/delivery.php:456 ../../include/notifier.php:678 +#: ../../include/delivery.php:456 ../../include/notifier.php:703 msgid "(no subject)" msgstr "(kein Betreff)" -#: ../../include/delivery.php:463 ../../include/enotify.php:26 -#: ../../include/notifier.php:685 -msgid "noreply" -msgstr "noreply" +#: ../../include/Scrape.php:575 +msgid " on Last.fm" +msgstr " bei Last.fm" #: ../../include/text.php:243 msgid "prev" @@ -6479,158 +7395,266 @@ msgstr "letzte" msgid "next" msgstr "nächste" -#: ../../include/text.php:568 +#: ../../include/text.php:295 +msgid "newer" +msgstr "neuer" + +#: ../../include/text.php:299 +msgid "older" +msgstr "älter" + +#: ../../include/text.php:597 msgid "No contacts" msgstr "Keine Kontakte" -#: ../../include/text.php:577 +#: ../../include/text.php:606 #, php-format msgid "%d Contact" msgid_plural "%d Contacts" msgstr[0] "%d Kontakt" msgstr[1] "%d Kontakte" -#: ../../include/text.php:835 -msgid "Monday" -msgstr "Montag" +#: ../../include/text.php:719 +msgid "poke" +msgstr "anstupsen" -#: ../../include/text.php:835 -msgid "Tuesday" -msgstr "Dienstag" +#: ../../include/text.php:719 ../../include/conversation.php:201 +msgid "poked" +msgstr "stupste" -#: ../../include/text.php:835 -msgid "Wednesday" -msgstr "Mittwoch" +#: ../../include/text.php:720 +msgid "ping" +msgstr "anpingen" -#: ../../include/text.php:835 -msgid "Thursday" -msgstr "Donnerstag" +#: ../../include/text.php:720 +msgid "pinged" +msgstr "pingte" -#: ../../include/text.php:835 -msgid "Friday" -msgstr "Freitag" +#: ../../include/text.php:721 +msgid "prod" +msgstr "knuffen" -#: ../../include/text.php:835 -msgid "Saturday" -msgstr "Samstag" +#: ../../include/text.php:721 +msgid "prodded" +msgstr "knuffte" -#: ../../include/text.php:835 -msgid "Sunday" -msgstr "Sonntag" +#: ../../include/text.php:722 +msgid "slap" +msgstr "ohrfeigen" -#: ../../include/text.php:839 +#: ../../include/text.php:722 +msgid "slapped" +msgstr "ohrfeigte" + +#: ../../include/text.php:723 +msgid "finger" +msgstr "befummeln" + +#: ../../include/text.php:723 +msgid "fingered" +msgstr "befummelte" + +#: ../../include/text.php:724 +msgid "rebuff" +msgstr "eine Abfuhr erteilen" + +#: ../../include/text.php:724 +msgid "rebuffed" +msgstr "abfuhrerteilte" + +#: ../../include/text.php:736 +msgid "happy" +msgstr "glücklich" + +#: ../../include/text.php:737 +msgid "sad" +msgstr "traurig" + +#: ../../include/text.php:738 +msgid "mellow" +msgstr "sanft" + +#: ../../include/text.php:739 +msgid "tired" +msgstr "müde" + +#: ../../include/text.php:740 +msgid "perky" +msgstr "frech" + +#: ../../include/text.php:741 +msgid "angry" +msgstr "sauer" + +#: ../../include/text.php:742 +msgid "stupified" +msgstr "verblüfft" + +#: ../../include/text.php:743 +msgid "puzzled" +msgstr "verwirrt" + +#: ../../include/text.php:744 +msgid "interested" +msgstr "interessiert" + +#: ../../include/text.php:745 +msgid "bitter" +msgstr "verbittert" + +#: ../../include/text.php:746 +msgid "cheerful" +msgstr "fröhlich" + +#: ../../include/text.php:747 +msgid "alive" +msgstr "lebendig" + +#: ../../include/text.php:748 +msgid "annoyed" +msgstr "verärgert" + +#: ../../include/text.php:749 +msgid "anxious" +msgstr "unruhig" + +#: ../../include/text.php:750 +msgid "cranky" +msgstr "schrullig" + +#: ../../include/text.php:751 +msgid "disturbed" +msgstr "verstört" + +#: ../../include/text.php:752 +msgid "frustrated" +msgstr "frustriert" + +#: ../../include/text.php:753 +msgid "motivated" +msgstr "motiviert" + +#: ../../include/text.php:754 +msgid "relaxed" +msgstr "entspannt" + +#: ../../include/text.php:755 +msgid "surprised" +msgstr "überrascht" + +#: ../../include/text.php:921 msgid "January" msgstr "Januar" -#: ../../include/text.php:839 +#: ../../include/text.php:921 msgid "February" msgstr "Februar" -#: ../../include/text.php:839 +#: ../../include/text.php:921 msgid "March" msgstr "März" -#: ../../include/text.php:839 +#: ../../include/text.php:921 msgid "April" msgstr "April" -#: ../../include/text.php:839 +#: ../../include/text.php:921 msgid "May" msgstr "Mai" -#: ../../include/text.php:839 +#: ../../include/text.php:921 msgid "June" msgstr "Juni" -#: ../../include/text.php:839 +#: ../../include/text.php:921 msgid "July" msgstr "Juli" -#: ../../include/text.php:839 +#: ../../include/text.php:921 msgid "August" msgstr "August" -#: ../../include/text.php:839 +#: ../../include/text.php:921 msgid "September" msgstr "September" -#: ../../include/text.php:839 +#: ../../include/text.php:921 msgid "October" msgstr "Oktober" -#: ../../include/text.php:839 +#: ../../include/text.php:921 msgid "November" msgstr "November" -#: ../../include/text.php:839 +#: ../../include/text.php:921 msgid "December" msgstr "Dezember" -#: ../../include/text.php:925 +#: ../../include/text.php:1007 msgid "bytes" msgstr "Byte" -#: ../../include/text.php:945 ../../include/text.php:960 +#: ../../include/text.php:1027 ../../include/text.php:1042 msgid "remove" msgstr "löschen" -#: ../../include/text.php:945 ../../include/text.php:960 +#: ../../include/text.php:1027 ../../include/text.php:1042 msgid "[remove]" msgstr "[löschen]" -#: ../../include/text.php:948 +#: ../../include/text.php:1030 msgid "Categories:" msgstr "Kategorien:" -#: ../../include/text.php:963 +#: ../../include/text.php:1045 msgid "Filed under:" msgstr "Abgelegt unter:" -#: ../../include/text.php:979 ../../include/text.php:991 +#: ../../include/text.php:1061 ../../include/text.php:1073 msgid "Click to open/close" msgstr "Zum öffnen/schließen klicken" -#: ../../include/text.php:1096 ../../include/user.php:230 +#: ../../include/text.php:1179 ../../include/user.php:236 msgid "default" -msgstr "standard" +msgstr "Standard" -#: ../../include/text.php:1108 +#: ../../include/text.php:1191 msgid "Select an alternate language" msgstr "Alternative Sprache auswählen" -#: ../../include/text.php:1318 +#: ../../include/text.php:1401 msgid "activity" msgstr "Aktivität" -#: ../../include/text.php:1320 +#: ../../include/text.php:1403 msgid "comment" msgstr "Kommentar" -#: ../../include/text.php:1321 +#: ../../include/text.php:1404 msgid "post" msgstr "Beitrag" -#: ../../include/text.php:1476 +#: ../../include/text.php:1559 msgid "Item filed" msgstr "Beitrag abgelegt" -#: ../../include/diaspora.php:593 +#: ../../include/diaspora.php:691 msgid "Sharing notification from Diaspora network" msgstr "Freigabe-Benachrichtigung von Diaspora" -#: ../../include/diaspora.php:2074 +#: ../../include/diaspora.php:2202 msgid "Attachments:" msgstr "Anhänge:" -#: ../../include/network.php:827 +#: ../../include/network.php:849 msgid "view full size" msgstr "Volle Größe anzeigen" -#: ../../include/oembed.php:134 +#: ../../include/oembed.php:137 msgid "Embedded content" msgstr "Eingebetteter Inhalt" -#: ../../include/oembed.php:143 +#: ../../include/oembed.php:146 msgid "Embedding disabled" msgstr "Einbettungen deaktiviert" @@ -6669,7 +7693,7 @@ msgstr "Neue Gruppe erstellen" msgid "Contacts not in any group" msgstr "Kontakte in keiner Gruppe" -#: ../../include/nav.php:46 ../../boot.php:821 +#: ../../include/nav.php:46 ../../boot.php:920 msgid "Logout" msgstr "Abmelden" @@ -6677,7 +7701,7 @@ msgstr "Abmelden" msgid "End this session" msgstr "Diese Sitzung beenden" -#: ../../include/nav.php:49 ../../boot.php:1508 +#: ../../include/nav.php:49 ../../boot.php:1635 msgid "Status" msgstr "Status" @@ -6739,7 +7763,7 @@ msgstr "Markiere alle Systembenachrichtigungen als gelesen" #: ../../include/nav.php:128 msgid "Private mail" -msgstr "Private Email" +msgstr "Private E-Mail" #: ../../include/nav.php:129 msgid "Inbox" @@ -6757,11 +7781,11 @@ msgstr "Verwalten" msgid "Manage other pages" msgstr "Andere Seiten verwalten" -#: ../../include/nav.php:138 ../../boot.php:1069 +#: ../../include/nav.php:138 ../../boot.php:1168 msgid "Profiles" msgstr "Profile" -#: ../../include/nav.php:138 ../../boot.php:1069 +#: ../../include/nav.php:138 ../../boot.php:1168 msgid "Manage/edit profiles" msgstr "Profile verwalten/editieren" @@ -6773,7 +7797,7 @@ msgstr "Freunde und Kontakte verwalten/editieren" msgid "Site setup and configuration" msgstr "Einstellungen der Seite und Konfiguration" -#: ../../include/nav.php:169 +#: ../../include/nav.php:170 msgid "Nothing new here" msgstr "Keine Neuigkeiten." @@ -6854,91 +7878,89 @@ msgstr "Die Fehlermeldung lautete:" msgid "Miscellaneous" msgstr "Verschiedenes" -#: ../../include/datetime.php:131 ../../include/datetime.php:263 +#: ../../include/datetime.php:153 ../../include/datetime.php:285 msgid "year" msgstr "Jahr" -#: ../../include/datetime.php:136 ../../include/datetime.php:264 +#: ../../include/datetime.php:158 ../../include/datetime.php:286 msgid "month" msgstr "Monat" -#: ../../include/datetime.php:141 ../../include/datetime.php:266 +#: ../../include/datetime.php:163 ../../include/datetime.php:288 msgid "day" msgstr "Tag" -#: ../../include/datetime.php:254 +#: ../../include/datetime.php:276 msgid "never" msgstr "nie" -#: ../../include/datetime.php:260 +#: ../../include/datetime.php:282 msgid "less than a second ago" msgstr "vor weniger als einer Sekunde" -#: ../../include/datetime.php:263 -msgid "years" -msgstr "Jahre" - -#: ../../include/datetime.php:264 -msgid "months" -msgstr "Monate" - -#: ../../include/datetime.php:265 +#: ../../include/datetime.php:287 msgid "week" msgstr "Woche" -#: ../../include/datetime.php:265 -msgid "weeks" -msgstr "Wochen" - -#: ../../include/datetime.php:266 -msgid "days" -msgstr "Tage" - -#: ../../include/datetime.php:267 +#: ../../include/datetime.php:289 msgid "hour" msgstr "Stunde" -#: ../../include/datetime.php:267 +#: ../../include/datetime.php:289 msgid "hours" msgstr "Stunden" -#: ../../include/datetime.php:268 +#: ../../include/datetime.php:290 msgid "minute" msgstr "Minute" -#: ../../include/datetime.php:268 +#: ../../include/datetime.php:290 msgid "minutes" msgstr "Minuten" -#: ../../include/datetime.php:269 +#: ../../include/datetime.php:291 msgid "second" msgstr "Sekunde" -#: ../../include/datetime.php:269 +#: ../../include/datetime.php:291 msgid "seconds" msgstr "Sekunden" -#: ../../include/datetime.php:278 +#: ../../include/datetime.php:300 #, php-format msgid "%1$d %2$s ago" msgstr "%1$d %2$s her" +#: ../../include/datetime.php:472 ../../include/items.php:1621 +#, php-format +msgid "%s's birthday" +msgstr "%ss Geburtstag" + +#: ../../include/datetime.php:473 ../../include/items.php:1622 +#, php-format +msgid "Happy Birthday %s" +msgstr "Herzlichen Glückwunsch %s" + #: ../../include/onepoll.php:399 msgid "From: " msgstr "Von: " -#: ../../include/bbcode.php:210 ../../include/bbcode.php:230 +#: ../../include/bbcode.php:102 ../../include/bbcode.php:323 +msgid "Image/photo" +msgstr "Bild/Foto" + +#: ../../include/bbcode.php:288 ../../include/bbcode.php:308 msgid "$1 wrote:" msgstr "$1 hat geschrieben:" -#: ../../include/bbcode.php:245 ../../include/bbcode.php:314 -msgid "Image/photo" -msgstr "Bild/Foto" +#: ../../include/bbcode.php:327 ../../include/bbcode.php:328 +msgid "Encrypted content" +msgstr "Verschlüsselter Inhalt" #: ../../include/dba.php:41 #, php-format msgid "Cannot locate DNS info for database server '%s'" -msgstr "Kann die DNS Informationen für den Datenbanken Server '%s' nicht ermitteln." +msgstr "Kann die DNS Informationen für den Datenbankserver '%s' nicht ermitteln." #: ../../include/message.php:15 ../../include/message.php:171 msgid "[no subject]" @@ -6948,172 +7970,188 @@ msgstr "[kein Betreff]" msgid "Visible to everybody" msgstr "Für jeden sichtbar" -#: ../../include/enotify.php:14 +#: ../../include/enotify.php:16 msgid "Friendica Notification" msgstr "Friendica-Benachrichtigung" -#: ../../include/enotify.php:17 +#: ../../include/enotify.php:19 msgid "Thank You," msgstr "Danke," -#: ../../include/enotify.php:19 +#: ../../include/enotify.php:21 #, php-format msgid "%s Administrator" msgstr "der Administrator von %s" -#: ../../include/enotify.php:38 +#: ../../include/enotify.php:40 #, php-format msgid "%s " msgstr "%s " -#: ../../include/enotify.php:42 -#, php-format -msgid "[Friendica:Notify] New mail received at %s" -msgstr "[Friendica Meldung] Neue Nachricht erhalten von %s" - #: ../../include/enotify.php:44 #, php-format -msgid "%1$s sent you a new private message at %2$s." -msgstr "%1$s hat Dir eine neues private Nachricht geschickt auf %2$s." +msgid "[Friendica:Notify] New mail received at %s" +msgstr "[Friendica-Meldung] Neue Nachricht erhalten von %s" -#: ../../include/enotify.php:45 +#: ../../include/enotify.php:46 +#, php-format +msgid "%1$s sent you a new private message at %2$s." +msgstr "%1$s hat dir eine neue private Nachricht auf %2$s geschickt." + +#: ../../include/enotify.php:47 #, php-format msgid "%1$s sent you %2$s." -msgstr "%1$s schickte Dir %2$s." +msgstr "%1$s schickte dir %2$s." -#: ../../include/enotify.php:45 +#: ../../include/enotify.php:47 msgid "a private message" msgstr "eine private Nachricht" -#: ../../include/enotify.php:46 +#: ../../include/enotify.php:48 #, php-format msgid "Please visit %s to view and/or reply to your private messages." msgstr "Bitte besuche %s, um deine privaten Nachrichten anzusehen und/oder zu beantworten." -#: ../../include/enotify.php:73 +#: ../../include/enotify.php:89 #, php-format msgid "%1$s commented on [url=%2$s]a %3$s[/url]" msgstr "%1$s kommentierte [url=%2$s]a %3$s[/url]" -#: ../../include/enotify.php:80 +#: ../../include/enotify.php:96 #, php-format msgid "%1$s commented on [url=%2$s]%3$s's %4$s[/url]" -msgstr "%1$s kommentierte [url=%2$s]%3$s's %4$s[/url]" +msgstr "%1$s kommentierte [url=%2$s]%3$ss %4$s[/url]" -#: ../../include/enotify.php:88 +#: ../../include/enotify.php:104 #, php-format msgid "%1$s commented on [url=%2$s]your %3$s[/url]" -msgstr "%1$s kommentierte [url=%2$s]Deinen Beitrag %3$s[/url]" +msgstr "%1$s kommentierte [url=%2$s]deinen %3$s[/url]" -#: ../../include/enotify.php:98 +#: ../../include/enotify.php:114 #, php-format msgid "[Friendica:Notify] Comment to conversation #%1$d by %2$s" -msgstr "[Friendica Meldung] Kommentar zum Beitrag #%1$d von %2$s" +msgstr "[Friendica-Meldung] Kommentar zum Beitrag #%1$d von %2$s" -#: ../../include/enotify.php:99 +#: ../../include/enotify.php:115 #, php-format msgid "%s commented on an item/conversation you have been following." msgstr "%s hat einen Beitrag kommentiert, dem du folgst." -#: ../../include/enotify.php:102 ../../include/enotify.php:117 -#: ../../include/enotify.php:130 ../../include/enotify.php:143 +#: ../../include/enotify.php:118 ../../include/enotify.php:133 +#: ../../include/enotify.php:146 ../../include/enotify.php:164 +#: ../../include/enotify.php:177 #, php-format msgid "Please visit %s to view and/or reply to the conversation." msgstr "Bitte besuche %s, um die Konversation anzusehen und/oder zu kommentieren." -#: ../../include/enotify.php:109 -#, php-format -msgid "[Friendica:Notify] %s posted to your profile wall" -msgstr "[Friendica Meldung] %s hat auf Deine Pinnwand geschrieben" - -#: ../../include/enotify.php:111 -#, php-format -msgid "%1$s posted to your profile wall at %2$s" -msgstr "%1$s schrieb auf Deine Pinnwand auf %2$s" - -#: ../../include/enotify.php:113 -#, php-format -msgid "%1$s posted to [url=%2s]your wall[/url]" -msgstr "%1$s schrieb auf [url=%2s]Deine Pinnwand[/url]" - -#: ../../include/enotify.php:124 -#, php-format -msgid "[Friendica:Notify] %s tagged you" -msgstr "[Friendica Meldung] %s hat Dich erwähnt" - #: ../../include/enotify.php:125 #, php-format -msgid "%1$s tagged you at %2$s" -msgstr "%1$s erwähnte Dich auf %2$s" +msgid "[Friendica:Notify] %s posted to your profile wall" +msgstr "[Friendica-Meldung] %s hat auf deine Pinnwand geschrieben" -#: ../../include/enotify.php:126 +#: ../../include/enotify.php:127 #, php-format -msgid "%1$s [url=%2s]tagged you[/url]." -msgstr "%1$s [url=%2s]erwähnte Dich[/url]." +msgid "%1$s posted to your profile wall at %2$s" +msgstr "%1$s schrieb auf %2$s auf deine Pinnwand" -#: ../../include/enotify.php:137 +#: ../../include/enotify.php:129 +#, php-format +msgid "%1$s posted to [url=%2$s]your wall[/url]" +msgstr "%1$s hat etwas auf [url=%2$s]deiner Pinnwand[/url] gepostet" + +#: ../../include/enotify.php:140 +#, php-format +msgid "[Friendica:Notify] %s tagged you" +msgstr "[Friendica-Meldung] %s hat dich erwähnt" + +#: ../../include/enotify.php:141 +#, php-format +msgid "%1$s tagged you at %2$s" +msgstr "%1$s erwähnte dich auf %2$s" + +#: ../../include/enotify.php:142 +#, php-format +msgid "%1$s [url=%2$s]tagged you[/url]." +msgstr "%1$s [url=%2$s]erwähnte dich[/url]." + +#: ../../include/enotify.php:154 +#, php-format +msgid "[Friendica:Notify] %1$s poked you" +msgstr "[Friendica-Meldung] %1$s hat dich angestupst" + +#: ../../include/enotify.php:155 +#, php-format +msgid "%1$s poked you at %2$s" +msgstr "%1$s hat dich auf %2$s angestupst" + +#: ../../include/enotify.php:156 +#, php-format +msgid "%1$s [url=%2$s]poked you[/url]." +msgstr "%1$s [url=%2$s]hat dich angestupst[/url]." + +#: ../../include/enotify.php:171 #, php-format msgid "[Friendica:Notify] %s tagged your post" -msgstr "[Friendica Meldung] %s markierte Deinen Beitrag" +msgstr "[Friendica-Meldung] %s hat deinen Beitrag getaggt" -#: ../../include/enotify.php:138 +#: ../../include/enotify.php:172 #, php-format msgid "%1$s tagged your post at %2$s" -msgstr "%1$s erwähnte Deinen Beitrag auf %2$s" +msgstr "%1$s erwähnte deinen Beitrag auf %2$s" -#: ../../include/enotify.php:139 +#: ../../include/enotify.php:173 #, php-format msgid "%1$s tagged [url=%2$s]your post[/url]" msgstr "%1$s erwähnte [url=%2$s]Deinen Beitrag[/url]" -#: ../../include/enotify.php:150 +#: ../../include/enotify.php:184 msgid "[Friendica:Notify] Introduction received" -msgstr "[Friendica Meldung] Kontaktanfrage erhalten" +msgstr "[Friendica-Meldung] Kontaktanfrage erhalten" -#: ../../include/enotify.php:151 +#: ../../include/enotify.php:185 #, php-format msgid "You've received an introduction from '%1$s' at %2$s" -msgstr "Du hast eine Kontaktanfrage erhalten von '%1$s' auf %2$s" +msgstr "Du hast eine Kontaktanfrage von '%1$s' auf %2$s erhalten" -#: ../../include/enotify.php:152 +#: ../../include/enotify.php:186 #, php-format msgid "You've received [url=%1$s]an introduction[/url] from %2$s." -msgstr "Du hast eine [url=%1$s]Kontaktanfrage[/url] erhalten von %2$s." +msgstr "Du hast eine [url=%1$s]Kontaktanfrage[/url] von %2$s erhalten." -#: ../../include/enotify.php:155 ../../include/enotify.php:173 +#: ../../include/enotify.php:189 ../../include/enotify.php:207 #, php-format msgid "You may visit their profile at %s" msgstr "Hier kannst du das Profil betrachten: %s" -#: ../../include/enotify.php:157 +#: ../../include/enotify.php:191 #, php-format msgid "Please visit %s to approve or reject the introduction." msgstr "Bitte besuche %s, um die Kontaktanfrage anzunehmen oder abzulehnen." -#: ../../include/enotify.php:164 +#: ../../include/enotify.php:198 msgid "[Friendica:Notify] Friend suggestion received" -msgstr "[Friendica Meldung] Kontaktvorschlag erhalten" +msgstr "[Friendica-Meldung] Kontaktvorschlag erhalten" -#: ../../include/enotify.php:165 +#: ../../include/enotify.php:199 #, php-format msgid "You've received a friend suggestion from '%1$s' at %2$s" -msgstr "Du hast einen Freunde-Vorschlag erhalten von '%1$s' auf %2$s" +msgstr "Du hast einen Freunde-Vorschlag von '%1$s' auf %2$s erhalten" -#: ../../include/enotify.php:166 +#: ../../include/enotify.php:200 #, php-format msgid "" "You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s." -msgstr "Du hast einen [url=%1$s]Freunde-Vorschlag[/url] erhalten %2$s von %3$s." +msgstr "Du hast einen [url=%1$s]Freunde-Vorschlag[/url] %2$s von %3$s erhalten." -#: ../../include/enotify.php:171 +#: ../../include/enotify.php:205 msgid "Name:" msgstr "Name:" -#: ../../include/enotify.php:172 +#: ../../include/enotify.php:206 msgid "Photo:" msgstr "Foto:" -#: ../../include/enotify.php:175 +#: ../../include/enotify.php:209 #, php-format msgid "Please visit %s to approve or reject the suggestion." msgstr "Bitte besuche %s, um den Vorschlag zu akzeptieren oder abzulehnen." @@ -7127,73 +8165,64 @@ 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:60 ../../include/follow.php:75 +#: ../../include/follow.php:60 ../../include/follow.php:80 msgid "No compatible communication protocols or feeds were discovered." msgstr "Es wurden keine kompatiblen Kommunikationsprotokolle oder Feeds gefunden." -#: ../../include/follow.php:73 +#: ../../include/follow.php:78 msgid "The profile address specified does not provide adequate information." msgstr "Die angegebene Profiladresse liefert unzureichende Informationen." -#: ../../include/follow.php:77 +#: ../../include/follow.php:82 msgid "An author or name was not found." msgstr "Es wurde kein Autor oder Name gefunden." -#: ../../include/follow.php:79 +#: ../../include/follow.php:84 msgid "No browser URL could be matched to this address." msgstr "Zu dieser Adresse konnte keine passende Browser URL gefunden werden." -#: ../../include/follow.php:81 +#: ../../include/follow.php:86 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:82 +#: ../../include/follow.php:87 msgid "Use mailto: in front of address to force email check." -msgstr "Verwende mailto: vor der Email Adresse um eine Überprüfung der Email Adresse zu erzwingen." +msgstr "Verwende mailto: vor der Email Adresse, um eine Überprüfung der E-Mail-Adresse zu erzwingen." -#: ../../include/follow.php:88 +#: ../../include/follow.php:93 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:93 +#: ../../include/follow.php:103 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:169 +#: ../../include/follow.php:205 msgid "Unable to retrieve contact information." msgstr "Konnte die Kontaktinformationen nicht empfangen." -#: ../../include/follow.php:223 +#: ../../include/follow.php:259 msgid "following" msgstr "folgen" -#: ../../include/items.php:2790 +#: ../../include/items.php:3217 msgid "A new person is sharing with you at " msgstr "Eine neue Person teilt mit dir auf " -#: ../../include/items.php:2790 +#: ../../include/items.php:3217 msgid "You have a new follower at " msgstr "Du hast einen neuen Kontakt auf " -#: ../../include/items.php:3452 +#: ../../include/items.php:3886 msgid "Archives" msgstr "Archiv" -#: ../../include/bb2diaspora.php:102 ../../include/bb2diaspora.php:112 -#: ../../include/bb2diaspora.php:113 -msgid "image/photo" -msgstr "Bild/Foto" - -#: ../../include/bb2diaspora.php:102 -msgid "link" -msgstr "Verweis" - #: ../../include/user.php:38 msgid "An invitation is required." msgstr "Du benötigst eine Einladung." @@ -7240,7 +8269,7 @@ msgid "" "must also begin with a letter." msgstr "Dein Spitzname darf nur aus Buchstaben und Zahlen (\"a-z\",\"0-9\", \"_\" und \"-\") bestehen, außerdem muss er mit einem Buchstaben beginnen." -#: ../../include/user.php:127 ../../include/user.php:219 +#: ../../include/user.php:127 ../../include/user.php:225 msgid "Nickname is already registered. Please choose another." msgstr "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen." @@ -7254,11 +8283,11 @@ msgstr "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen." msgid "SERIOUS ERROR: Generation of security keys failed." msgstr "FATALER FEHLER: Sicherheitsschlüssel konnten nicht erzeugt werden." -#: ../../include/user.php:205 +#: ../../include/user.php:211 msgid "An error occurred during registration. Please try again." -msgstr "Wärend der Anmeldung ist ein Fehler aufgetreten. Bitte versuche es noch einmal." +msgstr "Während der Anmeldung ist ein Fehler aufgetreten. Bitte versuche es noch einmal." -#: ../../include/user.php:240 +#: ../../include/user.php:246 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." @@ -7284,345 +8313,256 @@ msgstr "Das Sicherheitsmerkmal war nicht korrekt. Das passiert meistens wenn das msgid "stopped following" msgstr "wird nicht mehr gefolgt" -#: ../../include/Contact.php:218 ../../include/conversation.php:842 +#: ../../include/Contact.php:220 ../../include/conversation.php:1002 +msgid "Poke" +msgstr "Anstupsen" + +#: ../../include/Contact.php:221 ../../include/conversation.php:996 msgid "View Status" msgstr "Pinnwand anschauen" -#: ../../include/Contact.php:219 ../../include/conversation.php:843 +#: ../../include/Contact.php:222 ../../include/conversation.php:997 msgid "View Profile" msgstr "Profil anschauen" -#: ../../include/Contact.php:220 ../../include/conversation.php:844 +#: ../../include/Contact.php:223 ../../include/conversation.php:998 msgid "View Photos" msgstr "Bilder anschauen" -#: ../../include/Contact.php:221 ../../include/Contact.php:234 -#: ../../include/conversation.php:845 +#: ../../include/Contact.php:224 ../../include/Contact.php:237 +#: ../../include/conversation.php:999 msgid "Network Posts" msgstr "Netzwerkbeiträge" -#: ../../include/Contact.php:222 ../../include/Contact.php:234 -#: ../../include/conversation.php:846 +#: ../../include/Contact.php:225 ../../include/Contact.php:237 +#: ../../include/conversation.php:1000 msgid "Edit Contact" msgstr "Kontakt bearbeiten" -#: ../../include/Contact.php:223 ../../include/Contact.php:234 -#: ../../include/conversation.php:847 +#: ../../include/Contact.php:226 ../../include/Contact.php:237 +#: ../../include/conversation.php:1001 msgid "Send PM" msgstr "Private Nachricht senden" -#: ../../include/conversation.php:163 +#: ../../include/conversation.php:197 +#, php-format +msgid "%1$s poked %2$s" +msgstr "%1$s hat %2$s angestupst" + +#: ../../include/conversation.php:281 msgid "post/item" msgstr "Nachricht/Beitrag" -#: ../../include/conversation.php:164 +#: ../../include/conversation.php:282 #, 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:327 ../../include/conversation.php:608 -msgid "Select" -msgstr "Auswählen" - -#: ../../include/conversation.php:344 ../../include/conversation.php:701 -#: ../../include/conversation.php:702 -#, php-format -msgid "View %s's profile @ %s" -msgstr "Das Profil von %s auf %s betrachten." - -#: ../../include/conversation.php:354 ../../include/conversation.php:713 -#, php-format -msgid "%s from %s" -msgstr "%s von %s" - -#: ../../include/conversation.php:369 -msgid "View in context" -msgstr "Im Zusammenhang betrachten" - -#: ../../include/conversation.php:475 -#, php-format -msgid "%d comment" -msgid_plural "%d comments" -msgstr[0] "%d Kommentar" -msgstr[1] "%d Kommentare" - -#: ../../include/conversation.php:554 -msgid "like" -msgstr "mag ich" - -#: ../../include/conversation.php:555 -msgid "dislike" -msgstr "mag ich nicht" - -#: ../../include/conversation.php:557 -msgid "Share this" -msgstr "Weitersagen" - -#: ../../include/conversation.php:557 -msgid "share" -msgstr "Teilen" - -#: ../../include/conversation.php:581 -msgid "Bold" -msgstr "Fett" - -#: ../../include/conversation.php:582 -msgid "Italic" -msgstr "Kursiv" - -#: ../../include/conversation.php:583 -msgid "Underline" -msgstr "Unterstrichen" - -#: ../../include/conversation.php:584 -msgid "Quote" -msgstr "Zitat" - -#: ../../include/conversation.php:585 -msgid "Code" -msgstr "Code" - -#: ../../include/conversation.php:586 -msgid "Image" -msgstr "Bild" - -#: ../../include/conversation.php:587 -msgid "Link" -msgstr "Verweis" - -#: ../../include/conversation.php:588 -msgid "Video" -msgstr "Video" - -#: ../../include/conversation.php:621 -msgid "add star" -msgstr "markieren" - -#: ../../include/conversation.php:622 -msgid "remove star" -msgstr "Markierung entfernen" - -#: ../../include/conversation.php:623 -msgid "toggle star status" -msgstr "Markierung umschalten" - -#: ../../include/conversation.php:626 -msgid "starred" -msgstr "markiert" - -#: ../../include/conversation.php:627 -msgid "add tag" -msgstr "Tag hinzufügen" - -#: ../../include/conversation.php:631 -msgid "save to folder" -msgstr "In Ordner speichern" - -#: ../../include/conversation.php:703 -msgid "to" -msgstr "zu" - -#: ../../include/conversation.php:704 -msgid "Wall-to-Wall" -msgstr "Wall-to-Wall" - -#: ../../include/conversation.php:705 -msgid "via Wall-To-Wall:" -msgstr "via Wall-To-Wall:" - -#: ../../include/conversation.php:750 +#: ../../include/conversation.php:902 msgid "Delete Selected Items" msgstr "Lösche die markierten Beiträge" -#: ../../include/conversation.php:901 +#: ../../include/conversation.php:1060 #, php-format msgid "%s likes this." msgstr "%s mag das." -#: ../../include/conversation.php:901 +#: ../../include/conversation.php:1060 #, php-format msgid "%s doesn't like this." msgstr "%s mag das nicht." -#: ../../include/conversation.php:905 +#: ../../include/conversation.php:1064 #, php-format msgid "%2$d people like this." msgstr "%2$d Leute mögen das." -#: ../../include/conversation.php:907 +#: ../../include/conversation.php:1066 #, php-format msgid "%2$d people don't like this." msgstr "%2$d Leute mögen das nicht." -#: ../../include/conversation.php:913 +#: ../../include/conversation.php:1072 msgid "and" msgstr "und" -#: ../../include/conversation.php:916 +#: ../../include/conversation.php:1075 #, php-format msgid ", and %d other people" msgstr " und %d andere" -#: ../../include/conversation.php:917 +#: ../../include/conversation.php:1076 #, php-format msgid "%s like this." msgstr "%s mögen das." -#: ../../include/conversation.php:917 +#: ../../include/conversation.php:1076 #, php-format msgid "%s don't like this." msgstr "%s mögen das nicht." -#: ../../include/conversation.php:942 +#: ../../include/conversation.php:1100 ../../include/conversation.php:1117 msgid "Visible to everybody" msgstr "Für jedermann sichtbar" -#: ../../include/conversation.php:944 +#: ../../include/conversation.php:1102 ../../include/conversation.php:1119 msgid "Please enter a video link/URL:" msgstr "Bitte Link/URL zum Video einfügen:" -#: ../../include/conversation.php:945 +#: ../../include/conversation.php:1103 ../../include/conversation.php:1120 msgid "Please enter an audio link/URL:" msgstr "Bitte Link/URL zum Audio einfügen:" -#: ../../include/conversation.php:946 +#: ../../include/conversation.php:1104 ../../include/conversation.php:1121 msgid "Tag term:" msgstr "Tag:" -#: ../../include/conversation.php:948 +#: ../../include/conversation.php:1106 ../../include/conversation.php:1123 msgid "Where are you right now?" msgstr "Wo hältst du dich jetzt gerade auf?" -#: ../../include/conversation.php:991 +#: ../../include/conversation.php:1166 msgid "upload photo" msgstr "Bild hochladen" -#: ../../include/conversation.php:993 +#: ../../include/conversation.php:1168 msgid "attach file" msgstr "Datei anhängen" -#: ../../include/conversation.php:995 +#: ../../include/conversation.php:1170 msgid "web link" msgstr "Weblink" -#: ../../include/conversation.php:996 +#: ../../include/conversation.php:1171 msgid "Insert video link" msgstr "Video-Adresse einfügen" -#: ../../include/conversation.php:997 +#: ../../include/conversation.php:1172 msgid "video link" msgstr "Video-Link" -#: ../../include/conversation.php:998 +#: ../../include/conversation.php:1173 msgid "Insert audio link" msgstr "Audio-Adresse einfügen" -#: ../../include/conversation.php:999 +#: ../../include/conversation.php:1174 msgid "audio link" msgstr "Audio-Link" -#: ../../include/conversation.php:1001 +#: ../../include/conversation.php:1176 msgid "set location" msgstr "Ort setzen" -#: ../../include/conversation.php:1003 +#: ../../include/conversation.php:1178 msgid "clear location" msgstr "Ort löschen" -#: ../../include/conversation.php:1010 +#: ../../include/conversation.php:1185 msgid "permissions" msgstr "Zugriffsrechte" -#: ../../boot.php:522 +#: ../../include/plugin.php:390 ../../include/plugin.php:392 +msgid "Click here to upgrade." +msgstr "Zum Upgraden hier klicken." + +#: ../../include/plugin.php:398 +msgid "This action exceeds the limits set by your subscription plan." +msgstr "Diese Aktion überschreitet die Obergrenze deines Abonnements." + +#: ../../include/plugin.php:403 +msgid "This action is not available under your subscription plan." +msgstr "Diese Aktion ist in deinem Abonnement nicht verfügbar." + +#: ../../boot.php:582 msgid "Delete this item?" msgstr "Diesen Beitrag löschen?" -#: ../../boot.php:525 +#: ../../boot.php:585 msgid "show fewer" msgstr "weniger anzeigen" -#: ../../boot.php:698 +#: ../../boot.php:792 #, php-format msgid "Update %s failed. See error logs." msgstr "Update %s fehlgeschlagen. Bitte Fehlerprotokoll überprüfen." -#: ../../boot.php:700 +#: ../../boot.php:794 #, php-format msgid "Update Error at %s" msgstr "Updatefehler bei %s" -#: ../../boot.php:800 +#: ../../boot.php:895 msgid "Create a New Account" msgstr "Neues Konto erstellen" -#: ../../boot.php:824 +#: ../../boot.php:923 msgid "Nickname or Email address: " -msgstr "Spitzname oder Email-Adresse: " +msgstr "Spitzname oder E-Mail-Adresse: " -#: ../../boot.php:825 +#: ../../boot.php:924 msgid "Password: " msgstr "Passwort: " -#: ../../boot.php:828 +#: ../../boot.php:927 msgid "Or login using OpenID: " msgstr "Oder melde dich mit deiner OpenID an: " -#: ../../boot.php:834 +#: ../../boot.php:933 msgid "Forgot your password?" msgstr "Passwort vergessen?" -#: ../../boot.php:1001 +#: ../../boot.php:1100 msgid "Edit profile" msgstr "Profil bearbeiten" -#: ../../boot.php:1061 +#: ../../boot.php:1160 msgid "Message" msgstr "Nachricht" -#: ../../boot.php:1177 ../../boot.php:1253 +#: ../../boot.php:1282 ../../boot.php:1368 msgid "g A l F d" msgstr "l, d. F G \\U\\h\\r" -#: ../../boot.php:1178 ../../boot.php:1254 +#: ../../boot.php:1283 ../../boot.php:1369 msgid "F d" msgstr "d. F" -#: ../../boot.php:1223 ../../boot.php:1294 +#: ../../boot.php:1328 ../../boot.php:1409 msgid "[today]" msgstr "[heute]" -#: ../../boot.php:1235 +#: ../../boot.php:1340 msgid "Birthday Reminders" msgstr "Geburtstagserinnerungen" -#: ../../boot.php:1236 +#: ../../boot.php:1341 msgid "Birthdays this week:" msgstr "Geburtstage diese Woche:" -#: ../../boot.php:1287 +#: ../../boot.php:1402 msgid "[No description]" msgstr "[keine Beschreibung]" -#: ../../boot.php:1305 +#: ../../boot.php:1420 msgid "Event Reminders" msgstr "Veranstaltungserinnerungen" -#: ../../boot.php:1306 +#: ../../boot.php:1421 msgid "Events this week:" msgstr "Veranstaltungen diese Woche" -#: ../../boot.php:1511 +#: ../../boot.php:1638 msgid "Status Messages and Posts" msgstr "Statusnachrichten und Beiträge" -#: ../../boot.php:1517 +#: ../../boot.php:1645 msgid "Profile Details" msgstr "Profildetails" -#: ../../boot.php:1532 +#: ../../boot.php:1662 msgid "Events and Calendar" msgstr "Ereignisse und Kalender" -#: ../../boot.php:1538 +#: ../../boot.php:1669 msgid "Only You Can See This" -msgstr "Nur Du Kannst Das Sehen" +msgstr "Nur du kannst das sehen" diff --git a/view/de/strings.php b/view/de/strings.php index 206f4da957..c9e84ba23e 100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -11,7 +11,7 @@ $a->strings["Contact update failed."] = "Konnte den Kontakt nicht aktualisieren. $a->strings["Permission denied."] = "Zugriff verweigert."; $a->strings["Contact not found."] = "Kontakt nicht gefunden."; $a->strings["Repair Contact Settings"] = "Kontakteinstellungen reparieren"; -$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["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["Return to contact editor"] = "Zurück zum Kontakteditor"; $a->strings["Name"] = "Name"; @@ -33,7 +33,7 @@ $a->strings["File upload failed."] = "Hochladen der Datei fehlgeschlagen."; $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["Event description and start time are required."] = "Ereignisbeschreibung und Startzeit sind erforderlich."; +$a->strings["Event title and start time are required."] = "Der Veranstaltungstitel und die Anfangszeit müssen angegeben werden."; $a->strings["l, F j"] = "l, F j"; $a->strings["Edit event"] = "Veranstaltung bearbeiten"; $a->strings["link to source"] = "Link zum Originalbeitrag"; @@ -43,13 +43,15 @@ $a->strings["Previous"] = "Vorherige"; $a->strings["Next"] = "Nächste"; $a->strings["hour:minute"] = "Stunde:Minute"; $a->strings["Event details"] = "Veranstaltungsdetails"; -$a->strings["Format is %s %s. Starting date and Description are required."] = "Format ist %s %s. Anfangsdatum und Beschreibung sind notwendig."; +$a->strings["Format is %s %s. Starting date and Title are required."] = "Das Format ist %s %s. Beginnzeitpunkt 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["Location:"] = "Ort:"; +$a->strings["Title:"] = "Titel:"; $a->strings["Share this event"] = "Veranstaltung teilen"; $a->strings["Cancel"] = "Abbrechen"; $a->strings["Tag removed"] = "Tag entfernt"; @@ -82,6 +84,8 @@ $a->strings["Image upload failed."] = "Hochladen des Bildes gescheitert."; $a->strings["Public access denied."] = "Öffentlicher Zugriff verweigert."; $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["You have used %1$.2f Mbytes of photo storage."] = "Du verwendest %1$.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: "; @@ -98,7 +102,8 @@ $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["Rotate CW"] = "Im Uhrzeigersinn rotieren"; +$a->strings["Rotate CW (right)"] = "Drehen US (rechts)"; +$a->strings["Rotate CCW (left)"] = "Drehen EUS (links)"; $a->strings["New album name"] = "Name des neuen Albums"; $a->strings["Caption"] = "Bildunterschrift"; $a->strings["Add a Tag"] = "Tag hinzufügen"; @@ -167,7 +172,7 @@ $a->strings["Failed to update contact record."] = "Aktualisierung der Kontaktdat $a->strings["Your introduction has been sent."] = "Deine Kontaktanfrage wurde gesendet."; $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["Hide this contact"] = "Verberge diese Kontakt"; +$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["Confirm"] = "Bestätigen"; @@ -189,7 +194,7 @@ $a->strings["Submit Request"] = "Anfrage abschicken"; $a->strings["Friendica Social 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."] = "Konnte Tabelle nicht erstellen."; -$a->strings["Your Friendica site database has been installed."] = "Die Datenbank deiner Friendica Seite wurde installiert."; +$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["System check"] = "Systemtest"; @@ -209,7 +214,7 @@ $a->strings["Site settings"] = "Server-Einstellungen"; $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 'Activating scheduled tasks'"] = "Wenn du keine Kommandozeilen Version von PHP auf deinem Server installiert hast, kannst du keine Hintergrundprozesse via cron starten. Siehe 'Activating scheduled tasks'"; $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 diesen Feld auch frei lassen und mit der Installation fortfahren."; +$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["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."; @@ -224,13 +229,13 @@ $a->strings["mysqli PHP module"] = "PHP: mysqli-Modul"; $a->strings["mb_string PHP module"] = "PHP: mb_string-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: 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["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["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"; @@ -247,6 +252,11 @@ $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["Poke/Prod"] = "Anstupsen etc."; +$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["Profile Match"] = "Profilübereinstimmungen"; $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:"; @@ -254,6 +264,39 @@ $a->strings["Connect"] = "Verbinden"; $a->strings["No matches"] = "Keine Übereinstimmungen"; $a->strings["Remote privacy information not available."] = "Entfernte Privatsphäreneinstellungen nicht verfügbar."; $a->strings["Visible to:"] = "Sichtbar für:"; +$a->strings["No such group"] = "Es gibt keine solche Gruppe"; +$a->strings["Group is empty"] = "Gruppe ist leer"; +$a->strings["Group: "] = "Gruppe: "; +$a->strings["Select"] = "Auswählen"; +$a->strings["View %s's profile @ %s"] = "Das Profil von %s auf %s betrachten."; +$a->strings["%s from %s"] = "%s von %s"; +$a->strings["View in context"] = "Im Zusammenhang betrachten"; +$a->strings["%d comment"] = array( + 0 => "%d Kommentar", + 1 => "%d Kommentare", +); +$a->strings["show more"] = "mehr anzeigen"; +$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"] = "Verweis"; +$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["save to folder"] = "In Ordner speichern"; +$a->strings["to"] = "zu"; +$a->strings["Wall-to-Wall"] = "Wall-to-Wall"; +$a->strings["via Wall-To-Wall:"] = "via Wall-To-Wall:"; $a->strings["Welcome to %s"] = "Willkommen zu %s"; $a->strings["Invalid request identifier."] = "Invalid request identifier."; $a->strings["Discard"] = "Verwerfen"; @@ -315,7 +358,7 @@ $a->strings["Never"] = "Niemals"; $a->strings["(Update was successful)"] = "(Aktualisierung war erfolgreich)"; $a->strings["(Update was not successful)"] = "(Aktualisierung war nicht erfolgreich)"; $a->strings["Suggest friends"] = "Kontakte vorschlagen"; -$a->strings["Network type: %s"] = "Netzwerk Typ: %s"; +$a->strings["Network type: %s"] = "Netzwerktyp: %s"; $a->strings["%d contact in common"] = array( 0 => "%d gemeinsamer Kontakt", 1 => "%d gemeinsame Kontakte", @@ -326,7 +369,7 @@ $a->strings["Block"] = "Sperren"; $a->strings["Toggle Blocked status"] = "Geblockt-Status ein-/ausschalten"; $a->strings["Unignore"] = "Ignorieren aufheben"; $a->strings["Toggle Ignored status"] = "Ignoriert-Status ein-/ausschalten"; -$a->strings["Unarchive"] = "Unarchivieren"; +$a->strings["Unarchive"] = "Aus Archiv zurückholen"; $a->strings["Archive"] = "Archivieren"; $a->strings["Toggle Archive status"] = "Archiviert-Status ein-/ausschalten"; $a->strings["Repair"] = "Reparieren"; @@ -336,7 +379,7 @@ $a->strings["Contact Editor"] = "Kontakt Editor"; $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 bearbiten"; +$a->strings["Edit contact notes"] = "Notizen zum Kontakt bearbeiten"; $a->strings["Visit %s's profile [%s]"] = "Besuche %ss Profil [%s]"; $a->strings["Block/Unblock contact"] = "Kontakt blockieren/freischalten"; $a->strings["Ignore contact"] = "Ignoriere den Kontakt"; @@ -384,8 +427,8 @@ $a->strings["Save or copy your new password - and then"] = "Speichere oder kopie $a->strings["click here to login"] = "hier klicken, um dich anzumelden"; $a->strings["Your password may be changed from the Settings page after successful login."] = "Du kannst das Passwort in den Einstellungen ändern, sobald du dich erfolgreich angemeldet hast."; $a->strings["Forgot your Password?"] = "Hast du dein Passwort vergessen?"; -$a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Gib deine Email-Adresse an und fordere ein neues Passwort an. Es werden dir dann weitere Informationen per Mail zugesendet."; -$a->strings["Nickname or Email: "] = "Spitzname oder Email:"; +$a->strings["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["Account settings"] = "Kontoeinstellungen"; $a->strings["Display settings"] = "Anzeige-Einstellungen"; @@ -398,7 +441,7 @@ $a->strings["Settings"] = "Einstellungen"; $a->strings["Missing some important data!"] = "Wichtige Daten fehlen!"; $a->strings["Update"] = "Aktualisierungen"; $a->strings["Failed to connect with email account using the settings provided."] = "Verbindung zum E-Mail-Konto mit den angegebenen Einstellungen nicht möglich."; -$a->strings["Email settings updated."] = "EMail Einstellungen bearbeitet."; +$a->strings["Email settings updated."] = "E-Mail Einstellungen bearbeitet."; $a->strings["Passwords do not match. Password unchanged."] = "Die Passwörter stimmen nicht überein. Das Passwort bleibt unverändert."; $a->strings["Empty passwords are not allowed. Password unchanged."] = "Leere Passwörter sind nicht erlaubt. Passwort bleibt unverändert."; $a->strings["Password changed."] = "Passwort ändern."; @@ -426,11 +469,11 @@ $a->strings["Built-in support for %s connectivity is %s"] = "Eingebaute Unterst $a->strings["enabled"] = "eingeschaltet"; $a->strings["disabled"] = "ausgeschaltet"; $a->strings["StatusNet"] = "StatusNet"; +$a->strings["Email access is disabled on this site."] = "Zugriff auf E-Mails für diese Seite deaktiviert."; $a->strings["Connector Settings"] = "Verbindungs-Einstellungen"; $a->strings["Email/Mailbox Setup"] = "E-Mail/Postfach-Einstellungen"; $a->strings["If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox."] = "Wenn du mit E-Mail-Kontakten über diesen Service kommunizieren möchtest (optional), gib bitte die Einstellungen für dein Postfach an."; -$a->strings["Last successful email check:"] = "Letzter erfolgreicher Email Check"; -$a->strings["Email access is disabled on this site."] = "Zugriff auf E-Mails für diese Seite deaktiviert."; +$a->strings["Last successful email check:"] = "Letzter erfolgreicher E-Mail Check"; $a->strings["IMAP server name:"] = "IMAP-Server-Name:"; $a->strings["IMAP port:"] = "IMAP-Port:"; $a->strings["Security:"] = "Sicherheit:"; @@ -512,6 +555,7 @@ $a->strings["Someone writes a followup comment"] = "– jemand auch einen Kommen $a->strings["You receive a private message"] = "– du eine private Nachricht erhältst"; $a->strings["You receive a friend suggestion"] = "– du eine Empfehlung erhältst"; $a->strings["You are tagged in a post"] = "– du in einem Beitrag erwähnt wirst"; +$a->strings["You are poked/prodded/etc. in a post"] = "– du von jemandem angestupst oder sonstwie behandelt wirst"; $a->strings["Advanced Account/Page Type Settings"] = "Erweiterte Konto-/Seitentyp-Einstellungen"; $a->strings["Change the behaviour of this account for special situations"] = "Verhalten dieses Kontos in bestimmten Situationen:"; $a->strings["Manage Identities and/or Pages"] = "Verwalte Identitäten und/oder Seiten"; @@ -525,7 +569,7 @@ $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["Posts that mention or involve you"] = "Beiträge, in denen es um Dich geht"; +$a->strings["Posts that mention or involve you"] = "Beiträge, in denen es um dich geht"; $a->strings["New"] = "Neue"; $a->strings["Activity Stream - by date"] = "Aktivitäten-Stream - nach Datum"; $a->strings["Starred"] = "Markierte"; @@ -537,9 +581,6 @@ $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: "] = "Gruppe: "; $a->strings["Contact: "] = "Kontakt: "; $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."; @@ -560,10 +601,10 @@ $a->strings["Subject:"] = "Betreff:"; $a->strings["Your message:"] = "Deine Nachricht:"; $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["On your Quick Start page - find a brief introduction to your profile and network tabs, connect to Facebook, 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, wie du alte Freunde von Facebook wieder findest und neue Kontakte knüpfst."; -$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 Indentifikations-Adresse. Diese sieht aus wie eine E-Mail-Adresse und wird benötigt, um Freundschaften mit anderen im Friendica Netzwerk zu schliessen."; -$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 Freunde und potentiellen Freunde wissen genau, wie sie dich finden können."; +$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["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["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 Freundschaften mit anderen im Friendica Netzwerk zu schliessen."; +$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 Freunde und potentiellen Freunde wissen genau, wie sie dich finden können."; $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 Freunde zu finden, wenn du ein Bild von dir selbst verwendest, als wenn du dies nicht tust."; $a->strings["Authorise the Facebook Connector if you currently have a Facebook account and we will (optionally) import all your Facebook friends and conversations."] = "Richte die Verbindung zu Facebook ein, wenn du im Augenblick ein Facebook-Konto hast, und (optional) deine Facebook-Freunde und -Unterhaltungen importieren willst."; $a->strings["If this is your own personal server, installing the Facebook addon may ease your transition to the free social web."] = "Wenn dies dein privater Server ist, könnte die Installation des Facebook Connectors deinen Umzug ins freie soziale Netz angenehmer gestalten."; @@ -615,7 +656,7 @@ $a->strings["Your Email Address: "] = "Deine E-Mail-Adresse: "; $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["Register"] = "Registrieren"; -$a->strings["People Search"] = "Personen Suche"; +$a->strings["People Search"] = "Personensuche"; $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"; @@ -634,6 +675,9 @@ $a->strings["This message was sent to you by %s, a member of the Friendica socia $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["%1\$s is currently %2\$s"] = "%1\$s ist momentan %2\$s"; +$a->strings["Mood"] = "Stimmung"; +$a->strings["Set your current mood and tell your friends"] = "Wähle deine aktuelle Stimmung und erzähle sie deinen Freunden"; $a->strings["Image uploaded but image cropping failed."] = "Bilder hochgeladen, aber das Zuschneiden ist fehlgeschlagen."; $a->strings["Image size reduction [%s] failed."] = "Verkleinern der Bildgröße von [%s] ist gescheitert."; $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."; @@ -659,7 +703,7 @@ $a->strings["Conversation removed."] = "Unterhaltung gelöscht."; $a->strings["No messages."] = "Keine Nachrichten."; $a->strings["Unknown sender - %s"] = "'Unbekannter Absender - %s"; $a->strings["You and %s"] = "Du und %s"; -$a->strings["%s and You"] = "%s und Du"; +$a->strings["%s and You"] = "%s und du"; $a->strings["Delete conversation"] = "Unterhaltung löschen"; $a->strings["D, d M Y - g:i A"] = "D, d. M Y - g:i A"; $a->strings["%d message"] = array( @@ -686,6 +730,8 @@ $a->strings["Normal Account"] = "Normales Konto"; $a->strings["Soapbox Account"] = "Marktschreier-Konto"; $a->strings["Community/Celebrity Account"] = "Forum/Promi-Konto"; $a->strings["Automatic Friend Account"] = "Automatisches Freundekonto"; +$a->strings["Blog Account"] = "Blog Account"; +$a->strings["Private Forum"] = "Privates Forum"; $a->strings["Message queues"] = "Nachrichten-Warteschlangen"; $a->strings["Administration"] = "Administration"; $a->strings["Summary"] = "Zusammenfassung"; @@ -694,6 +740,7 @@ $a->strings["Pending registrations"] = "Anstehende Anmeldungen"; $a->strings["Version"] = "Version"; $a->strings["Active plugins"] = "Aktive Plugins"; $a->strings["Site settings updated."] = "Seiteneinstellungen aktualisiert."; +$a->strings["Don't apply a special theme for mobile devices."] = "Kein spezielles Theme für mobile Geräte verwenden."; $a->strings["Closed"] = "Geschlossen"; $a->strings["Requires approval"] = "Bedarf der Zustimmung"; $a->strings["Open"] = "Offen"; @@ -708,6 +755,8 @@ $a->strings["Banner/Logo"] = "Banner/Logo"; $a->strings["System language"] = "Systemsprache"; $a->strings["System theme"] = "Systemweites Thema"; $a->strings["Default system theme - may be over-ridden by user profiles - change theme settings"] = "Vorgabe für das System-Theme - kann von Benutzerprofilen überschrieben werden - Theme-Einstellungen ändern"; +$a->strings["Mobile system theme"] = "Systemweites mobiles Thema"; +$a->strings["Theme for mobile devices"] = "Thema für mobile Geräte"; $a->strings["SSL link policy"] = "Regeln für SSL Links"; $a->strings["Determines whether generated links should be forced to use SSL"] = "Bestimmt, ob generierte Links SSL verwenden müssen"; $a->strings["Maximum image size"] = "Maximale Größe von Bildern"; @@ -719,7 +768,7 @@ $a->strings["Accounts abandoned after x days"] = "Nutzerkonten gelten nach x Tag $a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Verschwende keine System-Ressourcen auf das Pollen externer Seiten, wenn Konten nicht mehr benutzt werden. 0 eingeben für kein Limit."; $a->strings["Allowed friend domains"] = "Erlaubte Domains für Kontakte"; $a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Liste der Domains, die für Freundschaften erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben."; -$a->strings["Allowed email domains"] = "Erlaubte Domains für Emails"; +$a->strings["Allowed email domains"] = "Erlaubte Domains für E-Mails"; $a->strings["Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains"] = "Liste der Domains, die für E-Mail-Adressen bei der Registrierung erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben."; $a->strings["Block public"] = "Öffentlichen Zugriff blockieren"; $a->strings["Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."] = "Klicken, um öffentlichen Zugriff auf sonst öffentliche Profile zu blockieren, wenn man nicht eingeloggt ist."; @@ -727,6 +776,8 @@ $a->strings["Force publish"] = "Erzwinge Veröffentlichung"; $a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Klicken, um Anzeige aller Profile dieses Servers im Verzeichnis zu erzwingen."; $a->strings["Global directory update URL"] = "URL für Updates beim weltweiten Verzeichnis"; $a->strings["URL to update the global directory. If this is not set, the global directory is completely unavailable to the application."] = "URL für Update des globalen Verzeichnisses. Wenn nichts eingetragen ist, bleibt das globale Verzeichnis unerreichbar."; +$a->strings["Allow threaded items"] = "Erlaube Threads in Diskussionen"; +$a->strings["Allow infinite level threading for items on this site."] = "Erlaube ein unendliches Level für Threads auf dieser Seite."; $a->strings["Block multiple registrations"] = "Unterbinde Mehrfachregistrierung"; $a->strings["Disallow users to register additional accounts for use as pages."] = "Benutzern nicht erlauben, weitere Konten als zusätzliche Profile anzulegen."; $a->strings["OpenID support"] = "OpenID Unterstützung"; @@ -779,7 +830,7 @@ $a->strings["User '%s' blocked"] = "Nutzer '%s' gesperrt"; $a->strings["select all"] = "Alle auswählen"; $a->strings["User registrations waiting for confirm"] = "Neuanmeldungen, die auf deine Bestätigung warten"; $a->strings["Request date"] = "Anfragedatum"; -$a->strings["Email"] = "Email"; +$a->strings["Email"] = "E-Mail"; $a->strings["No registrations."] = "Keine Neuanmeldungen."; $a->strings["Deny"] = "Verwehren"; $a->strings["Register date"] = "Anmeldedatum"; @@ -830,6 +881,7 @@ $a->strings["Login failed."] = "Anmeldung fehlgeschlagen."; $a->strings["Contact added"] = "Kontakt hinzugefügt"; $a->strings["Common Friends"] = "Gemeinsame Freunde"; $a->strings["No contacts in common."] = "Keine gemeinsamen Kontakte."; +$a->strings["link"] = "Link"; $a->strings["Item has been removed."] = "Eintrag wurde entfernt."; $a->strings["Applications"] = "Anwendungen"; $a->strings["No installed applications."] = "Keine Applikationen installiert."; @@ -838,6 +890,8 @@ $a->strings["Profile not found."] = "Profil nicht gefunden."; $a->strings["Profile Name is required."] = "Profilname ist erforderlich."; $a->strings["Marital Status"] = "Familienstand"; $a->strings["Romantic Partner"] = "Romanze"; +$a->strings["Likes"] = "Likes"; +$a->strings["Dislikes"] = "Dislikes"; $a->strings["Work/Employment"] = "Arbeit / Beschäftigung"; $a->strings["Religion"] = "Religion"; $a->strings["Political Views"] = "Politische Ansichten"; @@ -884,6 +938,8 @@ $a->strings["Political Views:"] = "Politische Ansichten:"; $a->strings["Religious Views:"] = "Religiöse Ansichten:"; $a->strings["Public Keywords:"] = "Öffentliche Schlüsselwörter:"; $a->strings["Private Keywords:"] = "Private Schlüsselwörter:"; +$a->strings["Likes:"] = "Likes:"; +$a->strings["Dislikes:"] = "Dislikes:"; $a->strings["Example: fishing photography software"] = "Beispiel: Fischen Fotografie Software"; $a->strings["(Used for suggesting potential friends, can be seen by others)"] = "(Wird verwendet, um potentielle Freunde zu finden, könnte von Fremden eingesehen werden)"; $a->strings["(Used for searching profiles, never shown to others)"] = "(Wird für die Suche nach Profilen verwendet und niemals veröffentlicht)"; @@ -916,6 +972,17 @@ $a->strings["Existing Page Delegates"] = "Vorhandene Bevollmächtigte für die S $a->strings["Potential Delegates"] = "Potentielle Bevollmächtigte"; $a->strings["Add"] = "Hinzufügen"; $a->strings["No entries."] = "Keine Einträge"; +$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: "] = "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): "] = "Texteingabe (Diaspora Format): "; +$a->strings["diaspora2bb: "] = "diaspora2bb: "; $a->strings["Friend Suggestions"] = "Kontaktvorschläge"; $a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Keine Vorschläge. Falls der Server frisch aufgesetzt wurde, versuche es bitte in 24 Stunden noch einmal."; $a->strings["Ignore/Hide"] = "Ignorieren/Verbergen"; @@ -923,9 +990,13 @@ $a->strings["Global Directory"] = "Weltweites Verzeichnis"; $a->strings["Find on this site"] = "Auf diesem Server suchen"; $a->strings["Site Directory"] = "Verzeichnis"; $a->strings["Gender: "] = "Geschlecht:"; +$a->strings["Gender:"] = "Geschlecht:"; +$a->strings["Status:"] = "Status:"; +$a->strings["Homepage:"] = "Homepage:"; +$a->strings["About:"] = "Über:"; $a->strings["No entries (some entries may be hidden)."] = "Keine Einträge (einige Einträge könnten versteckt sein)."; $a->strings["%s : Not a valid email address."] = "%s: Keine gültige Email Adresse."; -$a->strings["Please join us on Friendica"] = "Bitte trete uns auf Friendica bei"; +$a->strings["Please join us on Friendica"] = "Bitte trete bei uns auf Friendica bei"; $a->strings["%s : Message delivery failed."] = "%s: Zustellung der Nachricht fehlgeschlagen."; $a->strings["%d message sent."] = array( 0 => "%d Nachricht gesendet.", @@ -935,7 +1006,7 @@ $a->strings["You have no more invitations available"] = "Du hast keine weiteren $a->strings["Visit %s for a list of public sites that you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks."] = "Besuche %s für eine Liste der öffentlichen Server, denen du beitreten kannst. Friendica Mitglieder unterschiedlicher Server können sich sowohl alle miteinander verbinden, als auch mit Mitgliedern anderer Sozialer Netzwerke."; $a->strings["To accept this invitation, please visit and register at %s or any other public Friendica website."] = "Um diese Kontaktanfrage zu akzeptieren, besuche und registriere dich bitte bei %s oder einer anderen öffentlichen Friendica Website."; $a->strings["Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks. See %s for a list of alternate Friendica sites you can join."] = "Friendica Server verbinden sich alle untereinander, um ein großes datenschutzorientiertes Soziales Netzwerk zu bilden, das von seinen Mitgliedern betrieben und kontrolliert wird. Sie können sich auch mit vielen üblichen Sozialen Netzwerken verbinden. Besuche %s für eine Liste alternativer Friendica Server, denen du beitreten kannst."; -$a->strings["Our apologies. This system is not currently configured to connect with other public sites or invite members."] = "Es tut uns Leid. Dieses System ist zurzeit nicht dafür konfiguriert, sich mit anderen öffentlichen Seiten zu verbinden oder Mitglieder einzuladen."; +$a->strings["Our apologies. This system is not currently configured to connect with other public sites or invite members."] = "Es tut uns leid. Dieses System ist zurzeit nicht dafür konfiguriert, sich mit anderen öffentlichen Seiten zu verbinden oder Mitglieder einzuladen."; $a->strings["Send invitations"] = "Einladungen senden"; $a->strings["Enter email addresses, one per line:"] = "E-Mail-Adressen eingeben, eine pro Zeile:"; $a->strings["You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web."] = "Du bist herzlich dazu eingeladen, dich mir und anderen guten Freunden auf Friendica anzuschließen - und ein besseres Soziales Netz aufzubauen."; @@ -948,11 +1019,11 @@ $a->strings["Unexpected response from remote site: "] = "Unerwartete Antwort der $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ück gezogen."; +$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["%1\$s is now friends with %2\$s"] = "%1\$s ist nun mit %2\$s befreundet"; $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 im Arsch."; +$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."; @@ -961,23 +1032,27 @@ $a->strings["Unable to set your contact credentials on our system."] = "Deine Ko $a->strings["Unable to update your contact profile details on our system"] = "Die Updates für dein Profil konnten nicht gespeichert werden"; $a->strings["Connection accepted at %s"] = "Auf %s wurde die Verbindung akzeptiert"; $a->strings["%1\$s has joined %2\$s"] = "%1\$s ist %2\$s beigetreten"; +$a->strings["Google+ Import Settings"] = "Google+ Import Einstellungen"; +$a->strings["Enable Google+ Import"] = "Aktiviere Google+ Import"; +$a->strings["Google Account ID"] = "Google Account ID"; +$a->strings["Google+ Import Settings saved."] = "Google+ Import Einstellungen gespeichert."; $a->strings["Facebook disabled"] = "Facebook deaktiviert"; $a->strings["Updating contacts"] = "Aktualisiere Kontakte"; $a->strings["Facebook API key is missing."] = "Facebook-API-Schlüssel nicht gefunden"; $a->strings["Facebook Connect"] = "Mit Facebook verbinden"; $a->strings["Install Facebook connector for this account."] = "Facebook-Connector für dieses Konto installieren."; $a->strings["Remove Facebook connector"] = "Facebook-Connector entfernen"; -$a->strings["Re-authenticate [This is necessary whenever your Facebook password is changed.]"] = "Neu authentifizieren [Das ist immer dann nötig, wenn Du Dein Facebook-Passwort geändert hast.]"; +$a->strings["Re-authenticate [This is necessary whenever your Facebook password is changed.]"] = "Neu authentifizieren [Das ist immer dann nötig, wenn du dein Facebook-Passwort geändert hast.]"; $a->strings["Post to Facebook by default"] = "Veröffentliche standardmäßig bei Facebook"; $a->strings["Facebook friend linking has been disabled on this site. The following settings will have no effect."] = "Das Verlinken von Facebookkontakten wurde auf dieser Seite deaktiviert. Die folgenden Einstellungen haben keinen Effekt."; $a->strings["Facebook friend linking has been disabled on this site. If you disable it, you will be unable to re-enable it."] = "Das Verlinken von Facebookkontakten wurde auf dieser Seite deaktiviert. Wenn du es ausgeschaltet hast, kannst du es nicht wieder aktivieren."; $a->strings["Link all your Facebook friends and conversations on this website"] = "All meine Facebook-Kontakte und -Konversationen hier auf diese Website importieren"; $a->strings["Facebook conversations consist of your profile wall and your friend stream."] = "Facebook-Konversationen bestehen aus deinen Beiträgen auf deinerPinnwand, sowie den Beiträgen deiner Freunde Stream."; $a->strings["On this website, your Facebook friend stream is only visible to you."] = "Hier auf dieser Webseite kannst nur du die Beiträge Deiner Facebook-Freunde (Stream) sehen."; -$a->strings["The following settings determine the privacy of your Facebook profile wall on this website."] = "Mit den folgenden Einstellungen kannst Du die Privatsphäre der Kopie Deiner Facebook-Pinnwand hier auf dieser Seite einstellen."; +$a->strings["The following settings determine the privacy of your Facebook profile wall on this website."] = "Mit den folgenden Einstellungen kannst du die Privatsphäre der Kopie Deiner Facebook-Pinnwand hier auf dieser Seite einstellen."; $a->strings["On this website your Facebook profile wall conversations will only be visible to you"] = "Meine Facebook-Pinnwand hier auf dieser Webseite nur für mich sichtbar machen"; $a->strings["Do not import your Facebook profile wall conversations"] = "Facebook-Pinnwand nicht importieren"; -$a->strings["If you choose to link conversations and leave both of these boxes unchecked, your Facebook profile wall will be merged with your profile wall on this website and your privacy settings on this website will be used to determine who may see the conversations."] = "Wenn Du Facebook-Konversationen importierst und diese beiden Häkchen nicht setzt, wird Deine Facebook-Pinnwand mit der Pinnwand hier auf dieser Webseite vereinigt. Die Privatsphäre-Einstellungen für Deine Pinnwand auf dieser Webseite geben dann an, wer die Konversationen sehen kann."; +$a->strings["If you choose to link conversations and leave both of these boxes unchecked, your Facebook profile wall will be merged with your profile wall on this website and your privacy settings on this website will be used to determine who may see the conversations."] = "Wenn du Facebook-Konversationen importierst und diese beiden Häkchen nicht setzt, wird deine Facebook-Pinnwand mit der Pinnwand hier auf dieser Webseite vereinigt. Die Privatsphäre-Einstellungen für deine Pinnwand auf dieser Webseite geben dann an, wer die Konversationen sehen kann."; $a->strings["Comma separated applications to ignore"] = "Kommaseparierte Anwendungen, die ignoriert werden sollen"; $a->strings["Problems with Facebook Real-Time Updates"] = "Probleme mit Facebook Echtzeit-Updates"; $a->strings["Facebook"] = "Facebook"; @@ -986,7 +1061,7 @@ $a->strings["Facebook API Key"] = "Facebook API Schlüssel"; $a->strings["Error: it appears that you have specified the App-ID and -Secret in your .htconfig.php file. As long as they are specified there, they cannot be set using this form.

    "] = "Fehler: du scheinst die App-ID und das App-Geheimnis in deiner .htconfig.php Datei angegeben zu haben. Solange sie dort festgelegt werden kannst du dieses Formular hier nicht verwenden.

    "; $a->strings["Error: the given API Key seems to be incorrect (the application access token could not be retrieved)."] = "Fehler: der angegebene API Schlüssel scheint nicht korrekt zu sein (Zugriffstoken konnte nicht empfangen werden)."; $a->strings["The given API Key seems to work correctly."] = "Der angegebene API Schlüssel scheint korrekt zu funktionieren."; -$a->strings["The correctness of the API Key could not be detected. Somthing strange's going on."] = "Die Echtheit des API Schlüssels konnte nicht überprüft werden. Etwas Merkwürdiges ist hier im Gange."; +$a->strings["The correctness of the API Key could not be detected. Something strange's going on."] = "Die Richtigkeit des API Schlüssels konnte nicht gefunden werden. Irgendwas stimmt nicht."; $a->strings["App-ID / API-Key"] = "App-ID / API-Key"; $a->strings["Application secret"] = "Anwendungs-Geheimnis"; $a->strings["Polling Interval in minutes (minimum %1\$s minutes)"] = "Abfrageintervall in Minuten (min %1\$s Minuten)"; @@ -1007,6 +1082,9 @@ $a->strings["Hi %1\$s,\n\nThe connection between your accounts on %2\$s and Face $a->strings["StatusNet AutoFollow settings updated."] = "StatusNet AutoFollow Einstellungen aktualisiert."; $a->strings["StatusNet AutoFollow Settings"] = "StatusNet AutoFollow Einstellungen"; $a->strings["Automatically follow any StatusNet followers/mentioners"] = "Automatisch allen StatusNet Followern/Erwähnungen folgen"; +$a->strings["Bg settings updated."] = "Bg Einstellungen sind aktualisiert."; +$a->strings["Bg Settings"] = "Bg Einstellungen"; +$a->strings["How many contacts to display on profile sidebar"] = "Wie viele Kontakte sollen in der Seitenleiste angezeigt werden"; $a->strings["Lifetime of the cache (in hours)"] = "Lebenszeit des Caches (in Stunden)"; $a->strings["Cache Statistics"] = "Cache Statistik"; $a->strings["Number of items"] = "Anzahl der Einträge"; @@ -1014,7 +1092,7 @@ $a->strings["Size of the cache"] = "Größe des Caches"; $a->strings["Delete the whole cache"] = "Cache leeren"; $a->strings["%d person likes this"] = array( 0 => "%d Person mag das", - 1 => "%d Leuten mögen das", + 1 => "%d Leute mögen das", ); $a->strings["%d person doesn't like this"] = array( 0 => " %d Person mag das nicht", @@ -1025,6 +1103,43 @@ $a->strings["Generate new key"] = "Neuen Schlüssel erstellen"; $a->strings["Widgets key"] = "Widgets Schlüssel"; $a->strings["Widgets available"] = "Verfügbare Widgets"; $a->strings["Connect on Friendica!"] = "In Friendica verbinden!"; +$a->strings["bitchslap"] = "abwatschen"; +$a->strings["bitchslapped"] = "watschte"; +$a->strings["shag"] = "poppen"; +$a->strings["shagged"] = "poppte"; +$a->strings["do something obscenely biological to"] = "mit ihm/ihr etwas obszönes Körperliches machen"; +$a->strings["did something obscenely biological to"] = "machte etwas obszönes Körperliches mit"; +$a->strings["point out the new poke feature to"] = "die neue Anstups-Funktion zeigen"; +$a->strings["pointed out the new poke feature to"] = "zeigte die neue Anstups-Funktion"; +$a->strings["declare undying love for"] = "unterbliche Liebe verkünden"; +$a->strings["declared undying love for"] = "verkündete unsterbliche Liebe für"; +$a->strings["set fire to"] = ""; +$a->strings["patent"] = "patentieren"; +$a->strings["patented"] = "patentierte"; +$a->strings["stroke beard"] = "sich den Bart kratzen"; +$a->strings["stroked their beard at"] = "kratzte sich den Bart in Richtung"; +$a->strings["bemoan the declining standards of modern secondary and tertiary education to"] = "sich über die sinkenden Standards der Schul- und Hochschulbildung beklagen"; +$a->strings["bemoans the declining standards of modern secondary and tertiary education to"] = "beklagte sich über die sinkenden Standards der Schul- und Hochschulbildung bei"; +$a->strings["hug"] = "umarmen"; +$a->strings["hugged"] = "umarmte"; +$a->strings["kiss"] = "küssen"; +$a->strings["kissed"] = "küsste"; +$a->strings["raise eyebrows at"] = "Augenbrauen hochziehen"; +$a->strings["raised their eyebrows at"] = "zog die Augenbrauen hoch in Richtung"; +$a->strings["insult"] = "beleidigen"; +$a->strings["insulted"] = "beleidigte"; +$a->strings["praise"] = "preisen"; +$a->strings["praised"] = "pries"; +$a->strings["be dubious of"] = "ungewiss sein"; +$a->strings["was dubious of"] = "war ungewiss über"; +$a->strings["eat"] = "essen"; +$a->strings["ate"] = "aß"; +$a->strings["giggle and fawn at"] = "kichern und einschleimen"; +$a->strings["giggled and fawned at"] = "kicherte und schleimte sich ein bei"; +$a->strings["doubt"] = "bezweifeln"; +$a->strings["doubted"] = "bezweifelte"; +$a->strings["glare"] = "zornig anstarren"; +$a->strings["glared at"] = "starrte zornig auf"; $a->strings["YourLS Settings"] = "YourLS Einstellungen"; $a->strings["URL: http://"] = "URL: http://"; $a->strings["Username:"] = "Nutzername:"; @@ -1045,7 +1160,12 @@ $a->strings["Use /expression/ to provide regular expressions"] = "Verwende /expr $a->strings["NSFW Settings saved."] = "NSFW-Einstellungen gespeichert"; $a->strings["%s - Click to open/close"] = "%s – Zum Öffnen/Schließen klicken"; $a->strings["Forums"] = "Foren"; -$a->strings["show more"] = "mehr anzeigen"; +$a->strings["Forums:"] = "Foren:"; +$a->strings["Page settings updated."] = "Seiteneinstellungen aktualisiert."; +$a->strings["Page Settings"] = "Seiteneinstellungen"; +$a->strings["How many forums to display on sidebar without paging"] = "Wie viele Foren sollen in der Seitenleiste ohne Umblättern angezeigt werden"; +$a->strings["Randomise Page/Forum list"] = "Zufällige Seiten/Foren Liste"; +$a->strings["Show pages/forums on profile page"] = "Foren/Seiten auf der Profilseite anzeigen"; $a->strings["Planets Settings"] = "Planeten Einstellungen"; $a->strings["Enable Planets Plugin"] = "Aktiviere Planeten Plugin"; $a->strings["Login"] = "Anmeldung"; @@ -1055,57 +1175,132 @@ $a->strings["Most active users"] = "Aktivste Nutzer"; $a->strings["Latest photos"] = "Neueste Fotos"; $a->strings["Latest likes"] = "Neueste Favoriten"; $a->strings["event"] = "Veranstaltung"; +$a->strings["No access"] = "Kein Zugriff"; +$a->strings["Could not open component for editing"] = "Kalender-Editierfunktion konnte nicht geöffnet werden"; +$a->strings["Go back to the calendar"] = "Zurück zum Kalender"; +$a->strings["Event data"] = "Veranstaltungsdetails"; +$a->strings["Calendar"] = "Kalender"; +$a->strings["Special color"] = "Spezielle Farbe"; +$a->strings["Subject"] = "Betreff:"; +$a->strings["Starts"] = "Beginnt"; +$a->strings["Ends"] = "Endet"; +$a->strings["Description"] = "Beschreibung"; +$a->strings["Recurrence"] = "Wiederholungen:"; +$a->strings["Frequency"] = "Frequenz"; +$a->strings["Daily"] = "Täglich"; +$a->strings["Weekly"] = "Wöchentlich"; +$a->strings["Monthly"] = "Monatlich"; +$a->strings["Yearly"] = "Jährlich"; +$a->strings["days"] = "Tage"; +$a->strings["weeks"] = "Wochen"; +$a->strings["months"] = "Monate"; +$a->strings["years"] = "Jahre"; +$a->strings["Interval"] = "Intervall"; +$a->strings["All %select% %time%"] = "Jeden %select% %time%"; +$a->strings["Days"] = "Tage"; +$a->strings["Sunday"] = "Sonntag"; +$a->strings["Monday"] = "Montag"; +$a->strings["Tuesday"] = "Dienstag"; +$a->strings["Wednesday"] = "Mittwoch"; +$a->strings["Thursday"] = "Donnerstag"; +$a->strings["Friday"] = "Freitag"; +$a->strings["Saturday"] = "Samstag"; +$a->strings["First day of week:"] = "Erster Tag der Woche"; +$a->strings["Day of month"] = "Tag des Monats"; +$a->strings["#num#th of each month"] = "#num#ten jedes Monats"; +$a->strings["#num#th-last of each month"] = "letzten #num#ten jedes Monats"; +$a->strings["#num#th #wkday# of each month"] = "jeden #num#ten #wkday# eines Monats"; +$a->strings["#num#th-last #wkday# of each month"] = "jeden #num#ten letzten #wkday# eines Monats"; +$a->strings["Month"] = "Monat"; +$a->strings["#num#th of the given month"] = "#num#ten des Monats"; +$a->strings["#num#th-last of the given month"] = "letzten #num#ten des Monats"; +$a->strings["#num#th #wkday# of the given month"] = "jeden #num#ten eines Monats"; +$a->strings["#num#th-last #wkday# of the given month"] = "jeden #num#ten letzten eines Monats"; +$a->strings["Repeat until"] = "Wiederholungen"; +$a->strings["Infinite"] = "unendlich"; +$a->strings["Until the following date"] = "bis zum folgenden Datum"; +$a->strings["Number of times"] = "Bestimmte Anzahl von Wiederholungen"; +$a->strings["Exceptions"] = "Ausnahmen"; +$a->strings["none"] = "keine"; +$a->strings["Notification"] = "Benachrichtigung"; +$a->strings["Notify by"] = "Benarchrichtigungsmethode"; +$a->strings["E-Mail"] = "E-Mail"; +$a->strings["On Friendica / Display"] = "Bei Friendica / Anzeige"; +$a->strings["Time"] = "Zeit"; +$a->strings["Hours"] = "Stunden"; +$a->strings["Minutes"] = "Minuten"; +$a->strings["Seconds"] = "Sekunden"; +$a->strings["Weeks"] = "Wochen"; +$a->strings["before the"] = "vor dem"; +$a->strings["start of the event"] = "Beginn des Termins"; +$a->strings["end of the event"] = "Ende des Termins"; +$a->strings["Add a notification"] = "Benachrichtigung hinzufügen"; +$a->strings["The event #name# will start at #date"] = "Der Termin #name# wird am #date anfangen"; +$a->strings["#name# is about to begin."] = "#name# beginnt demnächst."; +$a->strings["Saved"] = "Gespeichert"; $a->strings["U.S. Time Format (mm/dd/YYYY)"] = "U.S. Datumsformat (mm/dd/YYYY)"; $a->strings["German Time Format (dd.mm.YYYY)"] = "Deutsches Datumsformat (dd.mm.YYYY)"; -$a->strings["Error"] = "Fehler"; -$a->strings["No access"] = "Kein Zugriff"; +$a->strings["Private Events"] = "Privater Termin"; +$a->strings["Private Addressbooks"] = "Private Adressbücher"; +$a->strings["Friendica-Native events"] = "Friendica Veranstaltungen"; +$a->strings["Friendica-Contacts"] = "Friendica-Kontakte"; +$a->strings["Your Friendica-Contacts"] = "Deine Friendica-Kontakte"; +$a->strings["Something went wrong when trying to import the file. Sorry. Maybe some events were imported anyway."] = "Entschuldigung. Bei dem Versuch die Datei zu importieren ist etwas schief gelaufen. Vielleicht wurden aber einige der Termine dennoch importiert."; +$a->strings["Something went wrong when trying to import the file. Sorry."] = "Entschuldigung. Beim Importieren der Datei ist etwas schief gelaufen."; +$a->strings["The ICS-File has been imported."] = "Die ICS-Datei wurde importoert."; +$a->strings["No file was uploaded."] = "Es wurde keine Datei geladen."; +$a->strings["Import a ICS-file"] = "Importiere eine ICS-Datei"; +$a->strings["ICS-File"] = "ICS-Datei"; +$a->strings["Overwrite all #num# existing events"] = "Überschreibe alle #num# existierenden Einträge"; $a->strings["New event"] = "Neue Veranstaltung"; $a->strings["Today"] = "Heute"; $a->strings["Day"] = "Tag"; $a->strings["Week"] = "Woche"; -$a->strings["Month"] = "Monat"; $a->strings["Reload"] = "Neu Laden"; $a->strings["Date"] = "Datum"; -$a->strings["Not found"] = "Nicht gefunden"; -$a->strings["Go back to the calendar"] = "Zurück zum Kalender"; -$a->strings["Starts"] = "Beginnt"; -$a->strings["Ends"] = "Endet"; -$a->strings["Description"] = "Beschreibung"; -$a->strings["Notification"] = "Benachrichtigung"; -$a->strings["Minutes"] = "Minuten"; -$a->strings["Hours"] = "Stunden"; -$a->strings["Days"] = "Tage"; -$a->strings["before"] = "vorher"; -$a->strings["Calendar Settings"] = "Kalender Einstellungen"; +$a->strings["Error"] = "Fehler"; +$a->strings["The calendar has been updated."] = "Der Kalender wurde aktualisiert."; +$a->strings["The new calendar has been created."] = "Der neue Kalender wurde erstellt."; +$a->strings["The calendar has been deleted."] = "Der Kalender wurde gelöscht."; +$a->strings["Calendar Settings"] = "Kalendereinstellungen"; $a->strings["Date format"] = "Datumsformat"; $a->strings["Time zone"] = "Zeitzone"; +$a->strings["Calendars"] = "Kalender"; +$a->strings["Create a new calendar"] = "Neuen Kalender anlegen"; $a->strings["Limitations"] = "Einschränkungen"; $a->strings["Warning"] = "Warnung"; $a->strings["Synchronization (iPhone, Thunderbird Lightning, Android, ...)"] = "Synchronisation (iPhone, Thunderbird Lightning, Android, ...)"; $a->strings["Synchronizing this calendar with the iPhone"] = "Diesen Kalender mit dem iPhone synchronisieren"; $a->strings["Synchronizing your Friendica-Contacts with the iPhone"] = "Friendica-Kontakte mit dem iPhone synchronisieren"; -$a->strings["Friendica-Contacts"] = "Friendica-Kontakte"; -$a->strings["Your Friendica-Contacts"] = "Deine Friendica-Kontakte"; -$a->strings["Calendar"] = "Kalender"; +$a->strings["The current version of this plugin has not been set up correctly. Please contact the system administrator of your installation of friendica to fix this."] = "Die aktuelle Version dieses Plugins wurde nicht korrekt eingestellt. Bitte kontaktiere den System-Administrator deiner Friendica Installation um den Fehler zu beheben."; $a->strings["Extended calendar with CalDAV-support"] = "Erweiterter Kalender mit CalDAV Unterstützung."; -$a->strings["The database tables have been installed."] = "Die Datenbank-Tabellen wurden installiert."; +$a->strings["noreply"] = "noreply"; +$a->strings["Notification: "] = "Benachrichtigungen: "; +$a->strings["The database tables have been installed."] = "Die Datenbanktabellen wurden installiert."; $a->strings["An error occurred during the installation."] = "Während der Installation trat ein Fehler auf."; +$a->strings["The database tables have been updated."] = "Die Tabellen in der Datenbank wurden aktualisiert."; +$a->strings["An error occurred during the update."] = "Während der Aktualisierung trat ein Fehler auf."; $a->strings["No system-wide settings yet."] = "Momentan keine systemweiten Einstellungen."; -$a->strings["Database status"] = "Datenbank Status"; +$a->strings["Database status"] = "Datenbankstatus"; $a->strings["Installed"] = "Installiert"; $a->strings["Upgrade needed"] = "Upgrade erforderlich"; +$a->strings["Please back up all calendar data (the tables beginning with dav_*) before proceeding. While all calendar events should be converted to the new database structure, it's always safe to have a backup. Below, you can have a look at the database-queries that will be made when pressing the 'update'-button."] = "Bitte sichere alle Kalenderdaten (die Tabellen mit dav_* beginnend) bevor du mit dem Update fortfährst. Eigentliche sollten alle Kalendereinträge in die neue Datenbankstruktur übernommen werden, aber sicher ist sicher. Weiter unten kannst du die Datenbank-Anfragen ansehen, die im Verlauf des Updates gemacht werden."; $a->strings["Upgrade"] = "Upgrade"; $a->strings["Not installed"] = "Nicht installiert"; $a->strings["Install"] = "Installieren"; +$a->strings["Unknown"] = "Unbekannt"; +$a->strings["Something really went wrong. I cannot recover from this state automatically, sorry. Please go to the database backend, back up the data, and delete all tables beginning with 'dav_' manually. Afterwards, this installation routine should be able to reinitialize the tables automatically."] = "Irgendetwas ging schief. Ich kann leider von diesem Zustand der Datenbank leider nicht automatisch fortfahren. Bitte mache ein Backup der Daten aus der Datenbank und lösche anschließend alle Tabellen deren Name mit 'dav_' anfangen. Anschließend sollte diese Installations-Routine in der Lage sein die nötigen Tabellen automatisch neu anzulegen."; $a->strings["Troubleshooting"] = "Problembehebung"; -$a->strings["Manual creation of the database tables:"] = "Manuelles anlegen der Datenbank Tabellen:"; +$a->strings["Manual creation of the database tables:"] = "Manuelles Anlegen der Datenbanktabellen:"; $a->strings["Show SQL-statements"] = "SQL-Anweisungen anzeigen"; $a->strings["Private Calendar"] = "Privater Kalender"; $a->strings["Friendica Events: Mine"] = "Meine Friendica-Veranstaltungen"; $a->strings["Friendica Events: Contacts"] = "Friendica Veranstaltungen meiner Kontakte"; -$a->strings["Allow to use your friendica id (%s) to connecto to external unhosted-enabled storage (like ownCloud). See RemoteStorage WebFinger"] = "Ermöglicht dir, deine friendica id (%s) mit externen unhosted-fähigen Speichern (z.B. ownCloud) zu verbinden. Siehe RemoteStorage WebFinger"; +$a->strings["Private Addresses"] = "Private Adressen"; +$a->strings["Friendica Contacts"] = "Friendica Kontakte"; +$a->strings["Allow to use your friendica id (%s) to connecto to external unhosted-enabled storage (like ownCloud). See RemoteStorage WebFinger"] = "Ermöglicht dir, deine Friendica ID (%s) mit externen unhosted-fähigen Speichern (z.B. ownCloud) zu verbinden. Siehe RemoteStorage WebFinger"; $a->strings["Template URL (with {category})"] = "Vorlagen URL (mit {Kategorie})"; -$a->strings["OAuth end-point"] = "OAuth end-point"; +$a->strings["OAuth end-point"] = "OAuth Endpunkt"; $a->strings["Api"] = "Api"; $a->strings["Member since:"] = "Mitglied seit:"; $a->strings["Three Dimensional Tic-Tac-Toe"] = "Dreidimensionales Tic-Tac-Toe"; @@ -1157,6 +1352,12 @@ $a->strings["Upload was cancelled, or server error encountered"] = "Upload abgeb $a->strings["OEmbed settings updated"] = "OEmbed Einstellungen aktualisiert."; $a->strings["Use OEmbed for YouTube videos"] = "OEmbed für Youtube Videos verwenden"; $a->strings["URL to embed:"] = "URL zum Einbetten:"; +$a->strings["show/hide"] = "anzeigen/verbergen"; +$a->strings["No forum subscriptions"] = "Keine Foren-Mitgliedschaften."; +$a->strings["Forumlist settings updated."] = "Einstellungen zur Foren-Liste aktualisiert."; +$a->strings["Forumlist Settings"] = "Foren-Liste Einstellungen"; +$a->strings["Randomise Forumlist/Forum list"] = "Zufällige Zusammenstellung der Foren-Liste"; +$a->strings["Show forumlists/forums on profile forumlist"] = "Liste der Foren deren Abonnement du bist in deinem Profil anzeigen:"; $a->strings["Impressum"] = "Impressum"; $a->strings["Site Owner"] = "Betreiber der Seite"; $a->strings["Email Address"] = "Email Adresse"; @@ -1193,28 +1394,41 @@ $a->strings["Tile Server URL"] = "Tile Server URL"; $a->strings["A list of public tile servers"] = "Eine Liste öffentlicher Tile Server"; $a->strings["Default zoom"] = "Standard Zoom"; $a->strings["The default zoom level. (1:world, 18:highest)"] = "Standard Zoomlevel (1: Welt; 18: höchstes)"; +$a->strings["Editplain settings updated."] = "Editplain Einstellungen aktualisiert"; +$a->strings["Group Text"] = "Gruppen als Text"; +$a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = "Beim Bearbeiten von Gruppen Text statt Bilder anzeigen"; +$a->strings["Could NOT install Libravatar successfully.
    It requires PHP >= 5.3"] = "Kann Libravatar NICHT erfolgreich installieren.
    PHP >=5.3 wird benötigt"; +$a->strings["generic profile image"] = "allgemeines Profilbild"; +$a->strings["random geometric pattern"] = "zufällig erzeugtes geometrisches Muster"; +$a->strings["monster face"] = "Monstergesicht"; +$a->strings["computer generated face"] = "Computergesicht"; +$a->strings["retro arcade style face"] = "Retro Arcade Design Gesicht"; +$a->strings["Your PHP version %s is lower than the required PHP >= 5.3."] = "Deine PHP Version %s ist niedriger als die benötigte Version PHP >= 5.3."; +$a->strings["This addon is not functional on your server."] = "Dieses Addon funktioniert auf deinem Server nicht."; +$a->strings["Information"] = "Information"; +$a->strings["Gravatar addon is installed. Please disable the Gravatar addon.
    The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "Das Gravatar Addon ist installiert. Bitte schalte das Gravatar Addon aus.
    Das Libravatar Addon nutzt Gravater, sollte nichts auf Libravatar gefunden werden."; +$a->strings["Default avatar image"] = "Standard Profilbild "; +$a->strings["Select default avatar image if none was found. See README"] = "Das Standard Avatar Bild wurde nicht gefunden. Siehe README"; +$a->strings["Libravatar settings updated."] = "Libravatar Einstellungen sind aktualisiert."; $a->strings["Post to libertree"] = "bei libertree veröffentlichen"; $a->strings["libertree Post Settings"] = "libertree Post Einstellungen"; $a->strings["Enable Libertree Post Plugin"] = "Libertree Post Plugin aktivieren"; $a->strings["Libertree API token"] = "Libertree API Token"; $a->strings["Libertree site URL"] = "Libertree URL"; $a->strings["Post to Libertree by default"] = "Standardmäßig bei libertree veröffentlichen"; +$a->strings["Altpager settings updated."] = "Altpager Einstellungen sind aktualisiert."; +$a->strings["Alternate Pagination Setting"] = "Alternative Seitenumbruch Einstellung"; +$a->strings["Use links to \"newer\" and \"older\" pages in place of page numbers?"] = "Nutze Links zu \"neuer\" und \"älter\" Seiten, statt Seiten Nummern?"; $a->strings["The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail."] = "Mit dem MathJax Addon können mathematische Formeln, die mit LaTeX geschrieben wurden, dargestellt werden. Die Formel wird mit den üblichen $$ oder einem eqnarray Block gekennzeichnet. Formeln werden in allen Beiträgen auf deiner Pinnwand, dem Netzwerkstream sowie privaten Nachrichten gerendert."; $a->strings["Use the MathJax renderer"] = "MathJax verwenden"; $a->strings["MathJax Base URL"] = "MathJax Basis-URL"; $a->strings["The URL for the javascript file that should be included to use MathJax. Can be either the MathJax CDN or another installation of MathJax."] = "Die URL der MathJax Javascript-Datei, die verwendet werden soll. Diese kann entweder aus der MathJax CDN oder einer anderen Quelle stammen."; -$a->strings["Editplain settings updated."] = "Editplain Einstellungen aktualisiert"; $a->strings["Editplain Settings"] = "Editplain Einstellungen"; $a->strings["Disable richtext status editor"] = "RichText Editor deaktivieren"; -$a->strings["generic profile image"] = "allgemeines Profilbild"; -$a->strings["random geometric pattern"] = "zufällig erzeugtes geometrisches Muster"; -$a->strings["monster face"] = "Monstergesicht"; -$a->strings["computer generated face"] = "Computergesicht"; -$a->strings["retro arcade style face"] = "Retro Arcade Design Gesicht"; -$a->strings["Default avatar image"] = "Standard Profilbild "; +$a->strings["Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.
    The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "Das Libravatar Addon ist ebenfalls installiert. Bitte deaktiviere das Libravatar Addon oder dieses Gravatar Addon.
    Das Libravatar Addon nutzt Gravater, sollte nichts auf Libravatar gefunden werden."; $a->strings["Select default avatar image if none was found at Gravatar. See README"] = "Wähle das Standardgesicht, wenn kein Bild auf Gravatar gefunden wurde. Schaue auch sonst im README nach."; $a->strings["Rating of images"] = "Bildbewertung"; -$a->strings["Select the appropriate avatar rating for your site. See README"] = "Wähle eine angemessene Bildbewertung für Deinen Server. Schaue auch sonst im README nach."; +$a->strings["Select the appropriate avatar rating for your site. See README"] = "Wähle eine angemessene Bildbewertung für deinen Server. Schaue auch sonst im README nach."; $a->strings["Gravatar settings updated."] = "Gravatar Einstellungen aktualisiert."; $a->strings["Your Friendica test account is about to expire."] = "Dein Friendica-Testkonto wird bald verfallen."; $a->strings["Hi %1\$s,\n\nYour test account on %2\$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at http://dir.friendica.com/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com."] = "Hallo %1\$s,\n\ndein Testkonto auf %2\$s wird in weniger als fünf Tagen verfallen. Wir hoffen, dass dir dieser Testlauf gefallen hat, so dass du die Gelegenheit nutzt und dir einen normalen Friendica-Server für deine integrierte Social-Network-Kommunikation suchst. Eine Liste öffentlicher Server findest du auf http://dir.friendica.com/siteinfo . Um mehr Information darüber zu bekommen, wie man einen eigenen Friendica-Server aufsetzt, kannst du auch einen Blick auf die Friendica-Projektseite werfen: http://friendica.com"; @@ -1233,7 +1447,7 @@ $a->strings["We could not contact the StatusNet API with the Path you entered."] $a->strings["StatusNet settings updated."] = "StatusNet Einstellungen aktualisiert."; $a->strings["StatusNet Posting Settings"] = "StatusNet-Beitragseinstellungen"; $a->strings["Globally Available StatusNet OAuthKeys"] = "Verfügbare OAuth Schlüssel für StatusNet"; -$a->strings["There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below)."] = "Für einige StatusNet Server sind voreingestellt OAuth Schlüsselpaare verfügbar. Solltest du einen dieser Server benutzen, dann verwende bitte diese Schlüssel. Falls nicht, stellen stattdessen eine Verbindung zu irgend einem anderen StatusNet Server her (siehe unten)."; +$a->strings["There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below)."] = "Für einige StatusNet Server sind voreingestellte OAuth Schlüsselpaare verfügbar. Solltest du einen dieser Server benutzen, dann verwende bitte diese Schlüssel. Falls nicht, stelle stattdessen eine Verbindung zu irgend einem anderen StatusNet Server her (siehe unten)."; $a->strings["Provide your own OAuth Credentials"] = "Eigene OAuth Schlüssel eintragen"; $a->strings["No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.
    Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation."] = "Kein Consumer-Schlüsselpaar für StatusNet gefunden. Registriere deinen Friendica-Account als Desktop-Client, kopiere das Consumer-Schlüsselpaar hierher und gib die API-URL ein.
    Bevor du dein eigenes Consumer-Schlüsselpaar registrierst, frage den Administrator dieses Friendica-Servers, ob schon ein Schlüsselpaar für diesen Friendica-Server auf diesem StatusNet-Server existiert."; $a->strings["OAuth Consumer Key"] = "OAuth Consumer Key"; @@ -1262,12 +1476,11 @@ $a->strings["Tumblr password"] = "Tumblr Passwort"; $a->strings["Post to Tumblr by default"] = "Standardmäßig bei Tumblr veröffentlichen"; $a->strings["Numfriends settings updated."] = "Numfriends Einstellungen aktualisiert"; $a->strings["Numfriends Settings"] = "Numfriends Einstellungen"; -$a->strings["How many contacts to display on profile sidebar"] = "Wie viele Kontakte sollen in der Seitenleiste angezeigt werden"; $a->strings["Gnot settings updated."] = "Gnot Einstellungen aktualisiert."; $a->strings["Gnot Settings"] = "Gnot Einstellungen"; $a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Erlaubt das Veröffentlichen von E-Mail Kommentar Benachrichtigungen bei Gmail mit anonymisiertem Betreff"; $a->strings["Enable this plugin/addon?"] = "Dieses Plugin/Addon aktivieren?"; -$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica Meldung] Kommentar zum Beitrag #%d"; +$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica-Meldung] Kommentar zum Beitrag #%d"; $a->strings["Post to Wordpress"] = "Bei WordPress veröffentlichen"; $a->strings["WordPress Post Settings"] = "WordPress-Beitragseinstellungen"; $a->strings["Enable WordPress Post Plugin"] = "WordPress-Plugin aktivieren."; @@ -1275,14 +1488,14 @@ $a->strings["WordPress username"] = "WordPress-Benutzername"; $a->strings["WordPress password"] = "WordPress-Passwort"; $a->strings["WordPress API URL"] = "WordPress-API-URL"; $a->strings["Post to WordPress by default"] = "Standardmäßig auf WordPress veröffentlichen"; -$a->strings["Provide a backlink to the Friendica post"] = "Einen zurück zum Friendica-Beitrag hinzufügen"; -$a->strings["Read the original post and comment stream on Friendica"] = "Den Original-Beitrag samt Kommentaren bei Friendica lesen"; +$a->strings["Provide a backlink to the Friendica post"] = "Einen Link zurück zum Friendica-Beitrag hinzufügen"; +$a->strings["Read the original post and comment stream on Friendica"] = "Den Originalbeitrag samt Kommentaren bei Friendica lesen"; $a->strings["\"Show more\" Settings"] = "\"Mehr zeigen\" Einstellungen"; $a->strings["Enable Show More"] = "Aktiviere \"Mehr zeigen\""; $a->strings["Cutting posts after how much characters"] = "Begrenze Beiträge nach einer bestimmten Anzahl an Buchstaben"; $a->strings["Show More Settings saved."] = "\"Mehr zeigen\" Einstellungen gesichert."; $a->strings["This website is tracked using the Piwik analytics tool."] = "Diese Website benutzt Piwik, eine Open Source-Software zur statistischen Auswertung der Besucherzugriffe."; -$a->strings["If you do not want that your visits are logged this way you can set a cookie to prevent Piwik from tracking further visits of the site (opt-out)."] = "Wenn Du nicht willst, dass Deine Besuche auf diese Weise gespeichert werden, kannst Du ein Cookie setzen. Dann wird Piwik Dich auf dieser Website nicht mehr verfolgen (opt-out)."; +$a->strings["If you do not want that your visits are logged this way you can set a cookie to prevent Piwik from tracking further visits of the site (opt-out)."] = "Wenn du nicht willst, dass deine Besuche auf diese Weise gespeichert werden, kannst du ein Cookie setzen. Dann wird Piwik dich auf dieser Website nicht mehr verfolgen (opt-out)."; $a->strings["Piwik Base URL"] = "Piwik Basis URL"; $a->strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "Absoluter Pfad zu deiner Piwik Installation (ohne Protokoll (http/s) und mit abschließendem Schrägstrich)"; $a->strings["Site ID"] = "Seiten ID"; @@ -1364,17 +1577,13 @@ $a->strings["Alignment"] = "Ausrichtung"; $a->strings["Left"] = "Links"; $a->strings["Center"] = "Mitte"; $a->strings["Set colour scheme"] = "Farbschema wählen"; -$a->strings["Gender:"] = "Geschlecht:"; $a->strings["j F, Y"] = "j F, Y"; $a->strings["j F"] = "j F"; $a->strings["Birthday:"] = "Geburtstag:"; $a->strings["Age:"] = "Alter:"; -$a->strings["Status:"] = "Status:"; $a->strings["for %1\$d %2\$s"] = "für %1\$d %2\$s"; -$a->strings["Homepage:"] = "Homepage:"; $a->strings["Tags:"] = "Tags"; $a->strings["Religion:"] = "Religion:"; -$a->strings["About:"] = "Über:"; $a->strings["Hobbies/Interests:"] = "Hobbies/Interessen:"; $a->strings["Contact information and Social Networks:"] = "Kontaktinformationen und Soziale Netzwerke:"; $a->strings["Musical interests:"] = "Musikalische Interessen:"; @@ -1393,9 +1602,6 @@ $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["OStatus"] = "OStatus"; $a->strings["RSS/Atom"] = "RSS/Atom"; $a->strings["Zot!"] = "Zott"; @@ -1463,23 +1669,50 @@ $a->strings["Ask me"] = "Frag mich"; $a->strings["Starts:"] = "Beginnt:"; $a->strings["Finishes:"] = "Endet:"; $a->strings["(no subject)"] = "(kein Betreff)"; -$a->strings["noreply"] = "noreply"; +$a->strings[" on Last.fm"] = " bei Last.fm"; $a->strings["prev"] = "vorige"; $a->strings["first"] = "erste"; $a->strings["last"] = "letzte"; $a->strings["next"] = "nächste"; +$a->strings["newer"] = "neuer"; +$a->strings["older"] = "älter"; $a->strings["No contacts"] = "Keine Kontakte"; $a->strings["%d Contact"] = array( 0 => "%d Kontakt", 1 => "%d Kontakte", ); -$a->strings["Monday"] = "Montag"; -$a->strings["Tuesday"] = "Dienstag"; -$a->strings["Wednesday"] = "Mittwoch"; -$a->strings["Thursday"] = "Donnerstag"; -$a->strings["Friday"] = "Freitag"; -$a->strings["Saturday"] = "Samstag"; -$a->strings["Sunday"] = "Sonntag"; +$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["January"] = "Januar"; $a->strings["February"] = "Februar"; $a->strings["March"] = "März"; @@ -1498,7 +1731,7 @@ $a->strings["[remove]"] = "[löschen]"; $a->strings["Categories:"] = "Kategorien:"; $a->strings["Filed under:"] = "Abgelegt unter:"; $a->strings["Click to open/close"] = "Zum öffnen/schließen klicken"; -$a->strings["default"] = "standard"; +$a->strings["default"] = "Standard"; $a->strings["Select an alternate language"] = "Alternative Sprache auswählen"; $a->strings["activity"] = "Aktivität"; $a->strings["comment"] = "Kommentar"; @@ -1534,7 +1767,7 @@ $a->strings["Conversations from your friends"] = "Unterhaltungen deiner Kontakte $a->strings["Friend Requests"] = "Kontaktanfragen"; $a->strings["See all notifications"] = "Alle Benachrichtigungen anzeigen"; $a->strings["Mark all system notifications seen"] = "Markiere alle Systembenachrichtigungen als gelesen"; -$a->strings["Private mail"] = "Private Email"; +$a->strings["Private mail"] = "Private E-Mail"; $a->strings["Inbox"] = "Eingang"; $a->strings["Outbox"] = "Ausgang"; $a->strings["Manage"] = "Verwalten"; @@ -1570,11 +1803,7 @@ $a->strings["month"] = "Monat"; $a->strings["day"] = "Tag"; $a->strings["never"] = "nie"; $a->strings["less than a second ago"] = "vor weniger als einer Sekunde"; -$a->strings["years"] = "Jahre"; -$a->strings["months"] = "Monate"; $a->strings["week"] = "Woche"; -$a->strings["weeks"] = "Wochen"; -$a->strings["days"] = "Tage"; $a->strings["hour"] = "Stunde"; $a->strings["hours"] = "Stunden"; $a->strings["minute"] = "Minute"; @@ -1582,44 +1811,50 @@ $a->strings["minutes"] = "Minuten"; $a->strings["second"] = "Sekunde"; $a->strings["seconds"] = "Sekunden"; $a->strings["%1\$d %2\$s ago"] = "%1\$d %2\$s her"; +$a->strings["%s's birthday"] = "%ss Geburtstag"; +$a->strings["Happy Birthday %s"] = "Herzlichen Glückwunsch %s"; $a->strings["From: "] = "Von: "; -$a->strings["$1 wrote:"] = "$1 hat geschrieben:"; $a->strings["Image/photo"] = "Bild/Foto"; -$a->strings["Cannot locate DNS info for database server '%s'"] = "Kann die DNS Informationen für den Datenbanken Server '%s' nicht ermitteln."; +$a->strings["$1 wrote:"] = "$1 hat geschrieben:"; +$a->strings["Encrypted content"] = "Verschlüsselter Inhalt"; +$a->strings["Cannot locate DNS info for database server '%s'"] = "Kann die DNS Informationen für den Datenbankserver '%s' nicht ermitteln."; $a->strings["[no subject]"] = "[kein Betreff]"; $a->strings["Visible to everybody"] = "Für jeden sichtbar"; $a->strings["Friendica Notification"] = "Friendica-Benachrichtigung"; $a->strings["Thank You,"] = "Danke,"; $a->strings["%s Administrator"] = "der Administrator von %s"; $a->strings["%s "] = "%s "; -$a->strings["[Friendica:Notify] New mail received at %s"] = "[Friendica Meldung] Neue Nachricht erhalten von %s"; -$a->strings["%1\$s sent you a new private message at %2\$s."] = "%1\$s hat Dir eine neues private Nachricht geschickt auf %2\$s."; -$a->strings["%1\$s sent you %2\$s."] = "%1\$s schickte Dir %2\$s."; +$a->strings["[Friendica:Notify] New mail received at %s"] = "[Friendica-Meldung] Neue Nachricht erhalten von %s"; +$a->strings["%1\$s sent you a new private message at %2\$s."] = "%1\$s hat dir eine neue private Nachricht auf %2\$s geschickt."; +$a->strings["%1\$s sent you %2\$s."] = "%1\$s schickte dir %2\$s."; $a->strings["a private message"] = "eine private Nachricht"; $a->strings["Please visit %s to view and/or reply to your private messages."] = "Bitte besuche %s, um deine privaten Nachrichten anzusehen und/oder zu beantworten."; $a->strings["%1\$s commented on [url=%2\$s]a %3\$s[/url]"] = "%1\$s kommentierte [url=%2\$s]a %3\$s[/url]"; -$a->strings["%1\$s commented on [url=%2\$s]%3\$s's %4\$s[/url]"] = "%1\$s kommentierte [url=%2\$s]%3\$s's %4\$s[/url]"; -$a->strings["%1\$s commented on [url=%2\$s]your %3\$s[/url]"] = "%1\$s kommentierte [url=%2\$s]Deinen Beitrag %3\$s[/url]"; -$a->strings["[Friendica:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Friendica Meldung] Kommentar zum Beitrag #%1\$d von %2\$s"; +$a->strings["%1\$s commented on [url=%2\$s]%3\$s's %4\$s[/url]"] = "%1\$s kommentierte [url=%2\$s]%3\$ss %4\$s[/url]"; +$a->strings["%1\$s commented on [url=%2\$s]your %3\$s[/url]"] = "%1\$s kommentierte [url=%2\$s]deinen %3\$s[/url]"; +$a->strings["[Friendica:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Friendica-Meldung] Kommentar zum Beitrag #%1\$d von %2\$s"; $a->strings["%s commented on an item/conversation you have been following."] = "%s hat einen Beitrag kommentiert, dem du folgst."; $a->strings["Please visit %s to view and/or reply to the conversation."] = "Bitte besuche %s, um die Konversation anzusehen und/oder zu kommentieren."; -$a->strings["[Friendica:Notify] %s posted to your profile wall"] = "[Friendica Meldung] %s hat auf Deine Pinnwand geschrieben"; -$a->strings["%1\$s posted to your profile wall at %2\$s"] = "%1\$s schrieb auf Deine Pinnwand auf %2\$s"; -$a->strings["%1\$s posted to [url=%2s]your wall[/url]"] = "%1\$s schrieb auf [url=%2s]Deine Pinnwand[/url]"; -$a->strings["[Friendica:Notify] %s tagged you"] = "[Friendica Meldung] %s hat Dich erwähnt"; -$a->strings["%1\$s tagged you at %2\$s"] = "%1\$s erwähnte Dich auf %2\$s"; -$a->strings["%1\$s [url=%2s]tagged you[/url]."] = "%1\$s [url=%2s]erwähnte Dich[/url]."; -$a->strings["[Friendica:Notify] %s tagged your post"] = "[Friendica Meldung] %s markierte Deinen Beitrag"; -$a->strings["%1\$s tagged your post at %2\$s"] = "%1\$s erwähnte Deinen Beitrag auf %2\$s"; +$a->strings["[Friendica:Notify] %s posted to your profile wall"] = "[Friendica-Meldung] %s hat auf deine Pinnwand geschrieben"; +$a->strings["%1\$s posted to your profile wall at %2\$s"] = "%1\$s schrieb auf %2\$s auf deine Pinnwand"; +$a->strings["%1\$s posted to [url=%2\$s]your wall[/url]"] = "%1\$s hat etwas auf [url=%2\$s]deiner Pinnwand[/url] gepostet"; +$a->strings["[Friendica:Notify] %s tagged you"] = "[Friendica-Meldung] %s hat dich erwähnt"; +$a->strings["%1\$s tagged you at %2\$s"] = "%1\$s erwähnte dich auf %2\$s"; +$a->strings["%1\$s [url=%2\$s]tagged you[/url]."] = "%1\$s [url=%2\$s]erwähnte dich[/url]."; +$a->strings["[Friendica:Notify] %1\$s poked you"] = "[Friendica-Meldung] %1\$s hat dich angestupst"; +$a->strings["%1\$s poked you at %2\$s"] = "%1\$s hat dich auf %2\$s angestupst"; +$a->strings["%1\$s [url=%2\$s]poked you[/url]."] = "%1\$s [url=%2\$s]hat dich angestupst[/url]."; +$a->strings["[Friendica:Notify] %s tagged your post"] = "[Friendica-Meldung] %s hat deinen Beitrag getaggt"; +$a->strings["%1\$s tagged your post at %2\$s"] = "%1\$s erwähnte deinen Beitrag auf %2\$s"; $a->strings["%1\$s tagged [url=%2\$s]your post[/url]"] = "%1\$s erwähnte [url=%2\$s]Deinen Beitrag[/url]"; -$a->strings["[Friendica:Notify] Introduction received"] = "[Friendica Meldung] Kontaktanfrage erhalten"; -$a->strings["You've received an introduction from '%1\$s' at %2\$s"] = "Du hast eine Kontaktanfrage erhalten von '%1\$s' auf %2\$s"; -$a->strings["You've received [url=%1\$s]an introduction[/url] from %2\$s."] = "Du hast eine [url=%1\$s]Kontaktanfrage[/url] erhalten von %2\$s."; +$a->strings["[Friendica:Notify] Introduction received"] = "[Friendica-Meldung] Kontaktanfrage erhalten"; +$a->strings["You've received an introduction from '%1\$s' at %2\$s"] = "Du hast eine Kontaktanfrage von '%1\$s' auf %2\$s erhalten"; +$a->strings["You've received [url=%1\$s]an introduction[/url] from %2\$s."] = "Du hast eine [url=%1\$s]Kontaktanfrage[/url] von %2\$s erhalten."; $a->strings["You may visit their profile at %s"] = "Hier kannst du das Profil betrachten: %s"; $a->strings["Please visit %s to approve or reject the introduction."] = "Bitte besuche %s, um die Kontaktanfrage anzunehmen oder abzulehnen."; -$a->strings["[Friendica:Notify] Friend suggestion received"] = "[Friendica Meldung] Kontaktvorschlag erhalten"; -$a->strings["You've received a friend suggestion from '%1\$s' at %2\$s"] = "Du hast einen Freunde-Vorschlag erhalten von '%1\$s' auf %2\$s"; -$a->strings["You've received [url=%1\$s]a friend suggestion[/url] for %2\$s from %3\$s."] = "Du hast einen [url=%1\$s]Freunde-Vorschlag[/url] erhalten %2\$s von %3\$s."; +$a->strings["[Friendica:Notify] Friend suggestion received"] = "[Friendica-Meldung] Kontaktvorschlag erhalten"; +$a->strings["You've received a friend suggestion from '%1\$s' at %2\$s"] = "Du hast einen Freunde-Vorschlag von '%1\$s' auf %2\$s erhalten"; +$a->strings["You've received [url=%1\$s]a friend suggestion[/url] for %2\$s from %3\$s."] = "Du hast einen [url=%1\$s]Freunde-Vorschlag[/url] %2\$s von %3\$s erhalten."; $a->strings["Name:"] = "Name:"; $a->strings["Photo:"] = "Foto:"; $a->strings["Please visit %s to approve or reject the suggestion."] = "Bitte besuche %s, um den Vorschlag zu akzeptieren oder abzulehnen."; @@ -1630,7 +1865,7 @@ $a->strings["The profile address specified does not provide adequate information $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 Email Adresse zu erzwingen."; +$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."; @@ -1638,8 +1873,6 @@ $a->strings["following"] = "folgen"; $a->strings["A new person is sharing with you at "] = "Eine neue Person teilt mit dir auf "; $a->strings["You have a new follower at "] = "Du hast einen neuen Kontakt auf "; $a->strings["Archives"] = "Archiv"; -$a->strings["image/photo"] = "Bild/Foto"; -$a->strings["link"] = "Verweis"; $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"; @@ -1654,50 +1887,23 @@ $a->strings["Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_ $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ärend der Anmeldung ist ein Fehler aufgetreten. Bitte versuche es noch einmal."; +$a->strings["An error occurred during registration. Please try again."] = "Während der Anmeldung ist ein Fehler aufgetreten. Bitte versuche es noch einmal."; $a->strings["An error occurred creating your default profile. Please try again."] = "Bei der Erstellung des Standardprofils ist ein Fehler aufgetreten. Bitte versuche es noch einmal."; $a->strings["Welcome "] = "Willkommen "; $a->strings["Please upload a profile photo."] = "Bitte lade ein Profilbild hoch."; $a->strings["Welcome back "] = "Willkommen zurück "; $a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Das Sicherheitsmerkmal war nicht korrekt. Das passiert meistens wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden)."; $a->strings["stopped following"] = "wird nicht mehr gefolgt"; +$a->strings["Poke"] = "Anstupsen"; $a->strings["View Status"] = "Pinnwand anschauen"; $a->strings["View Profile"] = "Profil anschauen"; $a->strings["View Photos"] = "Bilder anschauen"; $a->strings["Network Posts"] = "Netzwerkbeiträge"; $a->strings["Edit Contact"] = "Kontakt bearbeiten"; $a->strings["Send PM"] = "Private Nachricht senden"; +$a->strings["%1\$s poked %2\$s"] = "%1\$s hat %2\$s angestupst"; $a->strings["post/item"] = "Nachricht/Beitrag"; $a->strings["%1\$s marked %2\$s's %3\$s as favorite"] = "%1\$s hat %2\$s\\s %3\$s als Favorit markiert"; -$a->strings["Select"] = "Auswählen"; -$a->strings["View %s's profile @ %s"] = "Das Profil von %s auf %s betrachten."; -$a->strings["%s from %s"] = "%s von %s"; -$a->strings["View in context"] = "Im Zusammenhang betrachten"; -$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"] = "Verweis"; -$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["save to folder"] = "In Ordner speichern"; -$a->strings["to"] = "zu"; -$a->strings["Wall-to-Wall"] = "Wall-to-Wall"; -$a->strings["via Wall-To-Wall:"] = "via Wall-To-Wall:"; $a->strings["Delete Selected Items"] = "Lösche die markierten Beiträge"; $a->strings["%s likes this."] = "%s mag das."; $a->strings["%s doesn't like this."] = "%s mag das nicht."; @@ -1722,12 +1928,15 @@ $a->strings["audio link"] = "Audio-Link"; $a->strings["set location"] = "Ort setzen"; $a->strings["clear location"] = "Ort löschen"; $a->strings["permissions"] = "Zugriffsrechte"; +$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["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["Update Error at %s"] = "Updatefehler bei %s"; $a->strings["Create a New Account"] = "Neues Konto erstellen"; -$a->strings["Nickname or Email address: "] = "Spitzname oder Email-Adresse: "; +$a->strings["Nickname or Email address: "] = "Spitzname oder E-Mail-Adresse: "; $a->strings["Password: "] = "Passwort: "; $a->strings["Or login using OpenID: "] = "Oder melde dich mit deiner OpenID an: "; $a->strings["Forgot your password?"] = "Passwort vergessen?"; @@ -1744,4 +1953,4 @@ $a->strings["Events this week:"] = "Veranstaltungen diese Woche"; $a->strings["Status Messages and Posts"] = "Statusnachrichten und Beiträge"; $a->strings["Profile Details"] = "Profildetails"; $a->strings["Events and Calendar"] = "Ereignisse und Kalender"; -$a->strings["Only You Can See This"] = "Nur Du Kannst Das Sehen"; +$a->strings["Only You Can See This"] = "Nur du kannst das sehen"; diff --git a/view/events_reminder.tpl b/view/events_reminder.tpl index f641a5faf4..9746898c77 100644 --- a/view/events_reminder.tpl +++ b/view/events_reminder.tpl @@ -3,7 +3,7 @@ {{ endif }} diff --git a/view/head.tpl b/view/head.tpl index 8a75a4b8e0..42bd92f4ce 100644 --- a/view/head.tpl +++ b/view/head.tpl @@ -39,7 +39,9 @@ $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); $("#mod-cmnt-wrap-" + id).show(); openMenu("comment-edit-submit-wrapper-" + id); + return true; } + return false; } function commentClose(obj,id) { if(obj.value == '') { @@ -48,7 +50,9 @@ $("#comment-edit-text-" + id).addClass("comment-edit-text-empty"); $("#mod-cmnt-wrap-" + id).hide(); closeMenu("comment-edit-submit-wrapper-" + id); + return true; } + return false; } @@ -96,6 +100,15 @@ } } + function showHideCommentBox(id) { + if( $('#comment-edit-form-' + id).is(':visible')) { + $('#comment-edit-form-' + id).hide(); + } + else { + $('#comment-edit-form-' + id).show(); + } + } + diff --git a/view/theme/frost-mobile/experimental b/view/login_head.tpl similarity index 100% rename from view/theme/frost-mobile/experimental rename to view/login_head.tpl diff --git a/view/mood_content.tpl b/view/mood_content.tpl new file mode 100644 index 0000000000..9349c56aef --- /dev/null +++ b/view/mood_content.tpl @@ -0,0 +1,20 @@ +

    $title

    + +
    $desc
    + + +
    +
    + + + + +
    +
    + + + diff --git a/view/search_item.tpl b/view/search_item.tpl index 47f34685f3..8d8a0dbd4d 100644 --- a/view/search_item.tpl +++ b/view/search_item.tpl @@ -1,6 +1,6 @@ -
    -
    +
    +
    $item.name -
    $item.ago
    +
    $item.ago
    @@ -48,7 +48,7 @@ {{ endif }}
    -
    +
    diff --git a/view/theme/comix-plain/search_item.tpl b/view/theme/comix-plain/search_item.tpl index dba289031c..828e1065b4 100644 --- a/view/theme/comix-plain/search_item.tpl +++ b/view/theme/comix-plain/search_item.tpl @@ -1,5 +1,5 @@ -
    -
    +
    +
    -
    +
    diff --git a/view/theme/comix-plain/wall_item.tpl b/view/theme/comix-plain/wall_item.tpl index dfcd8ca960..0ef70cf8b9 100644 --- a/view/theme/comix-plain/wall_item.tpl +++ b/view/theme/comix-plain/wall_item.tpl @@ -1,11 +1,11 @@ -
    -
    +
    +
    - $item.name + $item.name menu
    @@ -74,5 +74,5 @@ $item.comment
    -
    +
    diff --git a/view/theme/comix-plain/wallwall_item.tpl b/view/theme/comix-plain/wallwall_item.tpl index abd5967b2a..4c5b120873 100644 --- a/view/theme/comix-plain/wallwall_item.tpl +++ b/view/theme/comix-plain/wallwall_item.tpl @@ -1,5 +1,5 @@ -
    -
    +
    +
    diff --git a/view/theme/comix/search_item.tpl b/view/theme/comix/search_item.tpl index dba289031c..828e1065b4 100644 --- a/view/theme/comix/search_item.tpl +++ b/view/theme/comix/search_item.tpl @@ -1,5 +1,5 @@ -
    -
    +
    +
    -
    +
    diff --git a/view/theme/comix/wall_item.tpl b/view/theme/comix/wall_item.tpl index dfcd8ca960..0ef70cf8b9 100644 --- a/view/theme/comix/wall_item.tpl +++ b/view/theme/comix/wall_item.tpl @@ -1,11 +1,11 @@ -
    -
    +
    +
    - $item.name + $item.name menu
    @@ -74,5 +74,5 @@ $item.comment
    -
    +
    diff --git a/view/theme/comix/wallwall_item.tpl b/view/theme/comix/wallwall_item.tpl index abd5967b2a..4c5b120873 100644 --- a/view/theme/comix/wallwall_item.tpl +++ b/view/theme/comix/wallwall_item.tpl @@ -1,5 +1,5 @@ -
    -
    +
    +
    diff --git a/view/theme/darkzero-NS/style.css b/view/theme/darkzero-NS/style.css index 5d1bb6310c..8d106bdc9f 100644 --- a/view/theme/darkzero-NS/style.css +++ b/view/theme/darkzero-NS/style.css @@ -49,7 +49,7 @@ background: #444; color: #99CCFF; } -.wall-item-photo-menu li a { +.wall-item-photo-menu li a, .contact-photo-menu { color: #CCCCCC; background-color: #333333; } diff --git a/view/theme/darkzero/style.css b/view/theme/darkzero/style.css index 55644e462d..dda180bbd2 100644 --- a/view/theme/darkzero/style.css +++ b/view/theme/darkzero/style.css @@ -28,7 +28,8 @@ background: #444; } .wall-item-tools { background-color: #444444; background-image: none;} -.comment-wwedit-wrapper{ background-color: #333333; } +.comment-wwedit-wrapper{ background-color: #444444; } +.toplevel_item > .wall-item-comment-wrapper > .comment-wwedit-wrapper{ background-color: #333333; } .comment-edit-preview{ color: #000000; } .wall-item-content-wrapper.comment { background-color: #444444; border: 0px;} .photo-top-album-name{ background-color: #333333; } @@ -49,7 +50,7 @@ background: #444; color: #99CCFF; } -.wall-item-photo-menu li a { +.wall-item-photo-menu li a, .contact-photo-menu { color: #CCCCCC; background-color: #333333; } diff --git a/view/theme/diabook/admin_site.tpl b/view/theme/diabook/admin_site.tpl index 346934b70c..33f68dd6a6 100644 --- a/view/theme/diabook/admin_site.tpl +++ b/view/theme/diabook/admin_site.tpl @@ -39,6 +39,7 @@ {{ inc field_checkbox.tpl with $field=$ostatus_disabled }}{{ endinc }} {{ inc field_checkbox.tpl with $field=$diaspora_enabled }}{{ endinc }} {{ inc field_checkbox.tpl with $field=$dfrn_only }}{{ endinc }} + {{ inc field_checkbox.tpl with $field=$thread_allow }}{{ endinc }} {{ inc field_input.tpl with $field=$global_directory }}{{ endinc }}
    diff --git a/view/theme/diabook/wall_thread.tpl b/view/theme/diabook/wall_thread.tpl new file mode 100644 index 0000000000..c53f8b017c --- /dev/null +++ b/view/theme/diabook/wall_thread.tpl @@ -0,0 +1,125 @@ +{{if $item.comment_firstcollapsed}} +
    + $item.num_comments $item.hide_text +
    + {{endif}} diff --git a/view/theme/diabook/wallwall_thread.tpl b/view/theme/diabook/wallwall_thread.tpl new file mode 100644 index 0000000000..c53f8b017c --- /dev/null +++ b/view/theme/diabook/wallwall_thread.tpl @@ -0,0 +1,125 @@ +{{if $item.comment_firstcollapsed}} +
    + $item.num_comments $item.hide_text +
    + {{endif}} diff --git a/view/theme/dispy/dark/icons.png b/view/theme/dispy/dark/icons.png index 67c8f3f0b4..aaf97473b4 100644 Binary files a/view/theme/dispy/dark/icons.png and b/view/theme/dispy/dark/icons.png differ diff --git a/view/theme/dispy/dark/icons.svg b/view/theme/dispy/dark/icons.svg index 7cbbd3574e..90b83bf811 100644 --- a/view/theme/dispy/dark/icons.svg +++ b/view/theme/dispy/dark/icons.svg @@ -43,6 +43,58 @@ is_visible="true" teeth="10" phi="10" /> + + + + + + + + + + + + + + + fit-margin-bottom="0" + inkscape:showpageshadow="false" + showborder="true"> image/svg+xml - + @@ -117,7 +171,7 @@ id="layer1" transform="translate(0,-852.36218)"> + + + + + + + + + + diff --git a/view/theme/dispy/dark/style.css b/view/theme/dispy/dark/style.css index 95e2bb9983..ff30337a35 100644 --- a/view/theme/dispy/dark/style.css +++ b/view/theme/dispy/dark/style.css @@ -90,7 +90,7 @@ nav .nav-link{display:inline-block;width:22px;height:22px;overflow:hidden;margin #nav-home-link{background-position:-44px -132px;}#nav-home-link:hover{background-position:-66px -132px;} #nav-intro-link{background-position:0px -88px;}#nav-intro-link:hover{background-position:-22px -88px;} #nav-login-link,#nav-logout-link{background-position:0 -88px;}#nav-login-link:hover,#nav-logout-link:hover{background-position:-22px -88px;} -#nav-manage-link{background-position:0px -22px;}#nav-manage-link:hover{background-position:-22px -22px;} +#nav-manage-link{background-position:-88px -88px;}#nav-manage-link:hover{background-position:-110px -88px;} #nav-messages-link{background-position:-44px -88px;}#nav-messages-link:hover{background-position:-66px -88px;} #nav-notify-link,#nav-notifications-linkmenu{background-position:-44px -110px;} #nav-notify-link:hover{background-position:-66px -110px;} diff --git a/view/theme/dispy/dark/style.less b/view/theme/dispy/dark/style.less index f701c12253..d7becbedb8 100644 --- a/view/theme/dispy/dark/style.less +++ b/view/theme/dispy/dark/style.less @@ -542,9 +542,9 @@ nav .nav-link { } } #nav-manage-link { - background-position: 0px -22px; + background-position: -88px -88px; &:hover { - background-position: -22px -22px; + background-position: -110px -88px; } } #nav-messages-link { diff --git a/view/theme/dispy/head.tpl b/view/theme/dispy/head.tpl index a34df96bee..3d1701b29e 100644 --- a/view/theme/dispy/head.tpl +++ b/view/theme/dispy/head.tpl @@ -2,27 +2,30 @@ - - + + + - - + - + + diff --git a/view/theme/dispy/icons/sparkle.cur b/view/theme/dispy/icons/sparkle.cur index 253259d8d5..6a0130a726 100644 Binary files a/view/theme/dispy/icons/sparkle.cur and b/view/theme/dispy/icons/sparkle.cur differ diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl index dabe8bb3d0..0be480df26 100644 --- a/view/theme/dispy/jot-header.tpl +++ b/view/theme/dispy/jot-header.tpl @@ -1,5 +1,5 @@ {{ endif }} diff --git a/view/theme/dispy/light/icons.png b/view/theme/dispy/light/icons.png index 5c2eab36e4..1494c1b8b4 100644 Binary files a/view/theme/dispy/light/icons.png and b/view/theme/dispy/light/icons.png differ diff --git a/view/theme/dispy/light/icons.svg b/view/theme/dispy/light/icons.svg index 7b82b94eaa..1531edc191 100644 --- a/view/theme/dispy/light/icons.svg +++ b/view/theme/dispy/light/icons.svg @@ -14,9 +14,9 @@ height="200" id="svg3403" version="1.1" - inkscape:version="0.48+devel r" + inkscape:version="0.48.3.1 r9886" sodipodi:docname="icons.svg" - inkscape:export-filename="/var/www3/kisikew.org/portal/pub/fd/view/theme/dispy/icons.png" + inkscape:export-filename="/var/www3/kisikew.org/portal/pub/fd/view/theme/dispy/light/icons.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90"> + + + + + + + + + + + + + + image/svg+xml - + @@ -1482,7 +1534,7 @@ id="path4166" /> + + + + + + + + diff --git a/view/theme/dispy/light/style.css b/view/theme/dispy/light/style.css index 9a991b796e..03942c6cde 100644 --- a/view/theme/dispy/light/style.css +++ b/view/theme/dispy/light/style.css @@ -90,7 +90,7 @@ nav .nav-link{display:inline-block;width:22px;height:22px;overflow:hidden;margin #nav-home-link{background-position:-44px -132px;}#nav-home-link:hover{background-position:-66px -132px;} #nav-intro-link{background-position:0px -88px;}#nav-intro-link:hover{background-position:-22px -88px;} #nav-login-link,#nav-logout-link{background-position:0 -88px;}#nav-login-link:hover,#nav-logout-link:hover{background-position:-22px -88px;} -#nav-manage-link{background-position:0px -22px;}#nav-manage-link:hover{background-position:-22px -22px;} +#nav-manage-link{background-position:-88px -88px;}#nav-manage-link:hover{background-position:-110px -88px;} #nav-messages-link{background-position:-44px -88px;}#nav-messages-link:hover{background-position:-66px -88px;} #nav-notify-link,#nav-notifications-linkmenu{background-position:-44px -110px;} #nav-notify-link:hover{background-position:-66px -110px;} diff --git a/view/theme/dispy/light/style.less b/view/theme/dispy/light/style.less index 87b405470c..3db91a8507 100644 --- a/view/theme/dispy/light/style.less +++ b/view/theme/dispy/light/style.less @@ -543,9 +543,9 @@ nav .nav-link { } } #nav-manage-link { - background-position: 0px -22px; + background-position: -88px -88px; &:hover { - background-position: -22px -22px; + background-position: -110px -88px; } } #nav-messages-link { diff --git a/view/theme/dispy/search_item.tpl b/view/theme/dispy/search_item.tpl index bfad1b7b72..35572caa04 100644 --- a/view/theme/dispy/search_item.tpl +++ b/view/theme/dispy/search_item.tpl @@ -1,5 +1,5 @@ -
    -
    +
    +
    -
    +
    diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl index 8d6f258e6e..d5cc7f16c8 100644 --- a/view/theme/dispy/wall_item.tpl +++ b/view/theme/dispy/wall_item.tpl @@ -1,6 +1,6 @@ -
    -
    +
    +
    -
    +
    diff --git a/view/theme/dispy/wall_thread.tpl b/view/theme/dispy/wall_thread.tpl new file mode 100644 index 0000000000..5f434d4cb6 --- /dev/null +++ b/view/theme/dispy/wall_thread.tpl @@ -0,0 +1,115 @@ +{{if $item.comment_firstcollapsed}} +
    + $item.num_comments $item.hide_text +
    + {{endif}} diff --git a/view/theme/dispy/wallwall_item.tpl b/view/theme/dispy/wallwall_item.tpl index f5187b710f..63c8a2e96b 100644 --- a/view/theme/dispy/wallwall_item.tpl +++ b/view/theme/dispy/wallwall_item.tpl @@ -1,6 +1,6 @@ -
    -
    +
    +
    diff --git a/view/theme/dispy/wallwall_thread.tpl b/view/theme/dispy/wallwall_thread.tpl new file mode 100644 index 0000000000..cab97cafad --- /dev/null +++ b/view/theme/dispy/wallwall_thread.tpl @@ -0,0 +1,121 @@ +{{if $item.comment_firstcollapsed}} +
    + $item.num_comments $item.hide_text +
    +     {{endif}} diff --git a/view/theme/duepuntozero/comment_item.tpl b/view/theme/duepuntozero/comment_item.tpl index ea24d95cc3..f64ae753b6 100755 --- a/view/theme/duepuntozero/comment_item.tpl +++ b/view/theme/duepuntozero/comment_item.tpl @@ -1,5 +1,10 @@
    -
    + {{ if $threaded }} + $comment + + {{ else }} + + {{ endif }} diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 1be81d738e..5207cedf0d 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -935,8 +935,19 @@ input#dfrn-url { } -.wall-item-content-wrapper.comment { +.tread-wrapper .tread-wrapper { margin-left: 50px; +} +.tread-wrapper .wall-item-comment-wrapper { + margin-left: 50px; +} + +.tread-end-wrapper { + margin-left: 50px; +} + +.wall-item-content-wrapper.comment { +# margin-left: 50px; background: #EEEEEE; } @@ -1175,9 +1186,7 @@ input#dfrn-url { } .comment-wwedit-wrapper { - margin-top: 15px; background: #f3f3f3; - margin-left: 50px; } .comment-edit-photo { diff --git a/view/theme/facepark/search_item.tpl b/view/theme/facepark/search_item.tpl index bfad1b7b72..35572caa04 100644 --- a/view/theme/facepark/search_item.tpl +++ b/view/theme/facepark/search_item.tpl @@ -1,5 +1,5 @@ -
    -
    +
    +
    -
    +
    diff --git a/view/theme/facepark/wall_item.tpl b/view/theme/facepark/wall_item.tpl index 2c88fc598e..dda4bc4a90 100644 --- a/view/theme/facepark/wall_item.tpl +++ b/view/theme/facepark/wall_item.tpl @@ -1,5 +1,5 @@ -
    -
    +
    +
    -
    +
    diff --git a/view/theme/facepark/wallwall_item.tpl b/view/theme/facepark/wallwall_item.tpl index 211906c934..ba6131857f 100644 --- a/view/theme/facepark/wallwall_item.tpl +++ b/view/theme/facepark/wallwall_item.tpl @@ -1,5 +1,5 @@ -
    -
    +
    +
    diff --git a/view/theme/frost-mobile/TODO b/view/theme/frost-mobile/TODO index cc35b63050..11c624a86f 100644 --- a/view/theme/frost-mobile/TODO +++ b/view/theme/frost-mobile/TODO @@ -6,19 +6,24 @@ Photo album display? - Edit photo page: bottom buttons are off-center in Dolphin Mini -- Pager: looks weird when only "prev" is there - - BB code buttons for status updates - Get "add contact" back on contacts page - Admin: access to more pages than summary? -- Embedded video playback is way too big +- Find a way to show embedded videos at the normal size for tablets that can handle it + +- Need to find a way to deal with freakin annoying elements that don't respect screen width limits. + Specifically, need to find a way to keep them from forcing a horizontal scroll bar to show up and + making the rest of the body text overflow the item's borders that is screen-width sensitive (it's + annoying to have a 300px truncated code block on a 1024px wide screen). At least the following cause problems: + - code blocks + - blockquote blocks + - #reallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallylongtags - Needs to be faster! - Reduce DOM elements (~2400 for 10 items, ~8400 for 40 items) - - Automatically set limit of 10 items for Network and Profile? - +- Sometimes, when "Permission denied", wrong login page is shown diff --git a/view/theme/frost-mobile/admin_site.tpl b/view/theme/frost-mobile/admin_site.tpl index bb00c2cccf..91aeda0357 100644 --- a/view/theme/frost-mobile/admin_site.tpl +++ b/view/theme/frost-mobile/admin_site.tpl @@ -9,6 +9,7 @@ {{ inc field_textarea.tpl with $field=$banner }}{{ endinc }} {{ inc field_select.tpl with $field=$language }}{{ endinc }} {{ inc field_select.tpl with $field=$theme }}{{ endinc }} + {{ inc field_select.tpl with $field=$theme_mobile }}{{ endinc }} {{ inc field_select.tpl with $field=$ssl_policy }}{{ endinc }}
    @@ -25,6 +26,8 @@

    $upload

    {{ inc field_input.tpl with $field=$maximagesize }}{{ endinc }} + {{ inc field_input.tpl with $field=$maximagelength }}{{ endinc }} + {{ inc field_input.tpl with $field=$jpegimagequality }}{{ endinc }}

    $corporate

    {{ inc field_input.tpl with $field=$allowed_sites }}{{ endinc }} @@ -36,6 +39,8 @@ {{ inc field_checkbox.tpl with $field=$diaspora_enabled }}{{ endinc }} {{ inc field_checkbox.tpl with $field=$dfrn_only }}{{ endinc }} {{ inc field_input.tpl with $field=$global_directory }}{{ endinc }} + {{ inc field_checkbox.tpl with $field=$thread_allow }}{{ endinc }} + {{ inc field_checkbox.tpl with $field=$newuser_public }}{{ endinc }}
    diff --git a/view/theme/frost-mobile/comment_item.tpl b/view/theme/frost-mobile/comment_item.tpl index b5b0e9d289..570db68426 100755 --- a/view/theme/frost-mobile/comment_item.tpl +++ b/view/theme/frost-mobile/comment_item.tpl @@ -10,9 +10,12 @@ }); --> -
    - +
    + + + diff --git a/view/theme/frost-mobile/default.php b/view/theme/frost-mobile/default.php index 99f96f4b68..b7feae3716 100644 --- a/view/theme/frost-mobile/default.php +++ b/view/theme/frost-mobile/default.php @@ -6,23 +6,23 @@ + + module === 'home' ) { ?>
    + module === 'login' || $a->module === 'register' || $a->module === 'lostpass' ) { ?> -
    - +
    diff --git a/view/theme/frost-mobile/end.tpl b/view/theme/frost-mobile/end.tpl index 49633557b6..9932181336 100644 --- a/view/theme/frost-mobile/end.tpl +++ b/view/theme/frost-mobile/end.tpl @@ -7,6 +7,7 @@ --> + diff --git a/view/theme/frost-mobile/head.tpl b/view/theme/frost-mobile/head.tpl index 8496667e13..a849f44593 100644 --- a/view/theme/frost-mobile/head.tpl +++ b/view/theme/frost-mobile/head.tpl @@ -1,7 +1,10 @@ - + + + + diff --git a/view/theme/frost-mobile/wall_item.tpl b/view/theme/frost-mobile/wall_item.tpl index 1867afe157..f75059d9c7 100644 --- a/view/theme/frost-mobile/wall_item.tpl +++ b/view/theme/frost-mobile/wall_item.tpl @@ -1,6 +1,6 @@ - -
    + +
    $item.name -
    $item.ago
    +
    $item.ago

    @@ -78,5 +78,5 @@ $item.comment - + diff --git a/view/theme/frost-mobile/wall_thread.tpl b/view/theme/frost-mobile/wall_thread.tpl new file mode 100644 index 0000000000..d6fb677c5f --- /dev/null +++ b/view/theme/frost-mobile/wall_thread.tpl @@ -0,0 +1,106 @@ +{{if $item.comment_firstcollapsed}} +
    + $item.num_comments $item.hide_text +
    + {{endif}} + diff --git a/view/theme/frost-mobile/wallwall_item.tpl b/view/theme/frost-mobile/wallwall_item.tpl index 113987246c..9affbcebae 100644 --- a/view/theme/frost-mobile/wallwall_item.tpl +++ b/view/theme/frost-mobile/wallwall_item.tpl @@ -1,6 +1,6 @@ - -
    + +
    - {{ if $item.lock }}
    $item.lock
    + {{ if $item.lock }}$item.lock {{ else }}
    {{ endif }}
    $item.location
    @@ -68,7 +68,7 @@ {{ endif }} - {{ if $item.drop.dropping }}    {{ endif }} + {{ if $item.drop.dropping }}{{ endif }} {{ if $item.drop.dropping }}{{ endif }} @@ -82,6 +82,6 @@ $item.comment - + diff --git a/view/theme/frost-mobile/wallwall_thread.tpl b/view/theme/frost-mobile/wallwall_thread.tpl new file mode 100644 index 0000000000..3af6aaa111 --- /dev/null +++ b/view/theme/frost-mobile/wallwall_thread.tpl @@ -0,0 +1,109 @@ +{{if $item.comment_firstcollapsed}} +
    + $item.num_comments $item.hide_text +
    + {{endif}} + diff --git a/view/theme/frost/TODO b/view/theme/frost/TODO index 930de8f6f7..1378e5d468 100644 --- a/view/theme/frost/TODO +++ b/view/theme/frost/TODO @@ -6,4 +6,9 @@ Check TinyMCE optimization "Profiles" page is wonky Settings, admin, photos upload don't look beautiful - +Threading: + - indentation + - top-level "show more" looks bad + - need some visual way to tie sub-comments to their parent comments + - need a way to change styles if the system allows threading or not + - just don't allow? diff --git a/view/theme/frost/admin_site.tpl b/view/theme/frost/admin_site.tpl index bb00c2cccf..91aeda0357 100644 --- a/view/theme/frost/admin_site.tpl +++ b/view/theme/frost/admin_site.tpl @@ -9,6 +9,7 @@ {{ inc field_textarea.tpl with $field=$banner }}{{ endinc }} {{ inc field_select.tpl with $field=$language }}{{ endinc }} {{ inc field_select.tpl with $field=$theme }}{{ endinc }} + {{ inc field_select.tpl with $field=$theme_mobile }}{{ endinc }} {{ inc field_select.tpl with $field=$ssl_policy }}{{ endinc }}
    @@ -25,6 +26,8 @@

    $upload

    {{ inc field_input.tpl with $field=$maximagesize }}{{ endinc }} + {{ inc field_input.tpl with $field=$maximagelength }}{{ endinc }} + {{ inc field_input.tpl with $field=$jpegimagequality }}{{ endinc }}

    $corporate

    {{ inc field_input.tpl with $field=$allowed_sites }}{{ endinc }} @@ -36,6 +39,8 @@ {{ inc field_checkbox.tpl with $field=$diaspora_enabled }}{{ endinc }} {{ inc field_checkbox.tpl with $field=$dfrn_only }}{{ endinc }} {{ inc field_input.tpl with $field=$global_directory }}{{ endinc }} + {{ inc field_checkbox.tpl with $field=$thread_allow }}{{ endinc }} + {{ inc field_checkbox.tpl with $field=$newuser_public }}{{ endinc }}
    diff --git a/view/theme/frost/comment_item.tpl b/view/theme/frost/comment_item.tpl index bdc2ef5e6d..32d4d78ef9 100755 --- a/view/theme/frost/comment_item.tpl +++ b/view/theme/frost/comment_item.tpl @@ -10,8 +10,10 @@ }); --> -
    +
    + @@ -23,7 +25,7 @@ $mytitle -
      +
        • diff --git a/view/theme/frost/conversation.tpl b/view/theme/frost/conversation.tpl deleted file mode 100644 index fccd9a8bb0..0000000000 --- a/view/theme/frost/conversation.tpl +++ /dev/null @@ -1,27 +0,0 @@ -{{ for $threads as $thread }} -
        - {{ for $thread.items as $item }} - {{if $item.comment_firstcollapsed}} -
        - $thread.num_comments $thread.hide_text -
        - {{endif}} - - {{ inc $item.template }}{{ endinc }} - - - {{ endfor }} -
        -{{ endfor }} - -
        - -{{ if $dropping }} - -
        -{{ endif }} diff --git a/view/theme/frost/default.php b/view/theme/frost/default.php index 9f764c73ef..aa032524f8 100644 --- a/view/theme/frost/default.php +++ b/view/theme/frost/default.php @@ -6,23 +6,23 @@ + + module === 'home' ) { ?>
        + module === 'login' || $a->module === 'register' || $a->module === 'lostpass' ) { ?> -
        - +
        diff --git a/view/theme/frost/end.tpl b/view/theme/frost/end.tpl index 01928ce800..84004c8e49 100644 --- a/view/theme/frost/end.tpl +++ b/view/theme/frost/end.tpl @@ -7,6 +7,7 @@ + diff --git a/view/theme/frost/js/acl.js b/view/theme/frost/js/acl.js index 2ea559636b..9675588af2 100644 --- a/view/theme/frost/js/acl.js +++ b/view/theme/frost/js/acl.js @@ -11,7 +11,7 @@ function ACL(backend_url, preset){ that.deny_cid = (preset[2] || []); that.deny_gid = (preset[3] || []); that.group_uids = []; - that.nw = 4; //items per row. should be calulated from #acl-list.width + that.nw = 3; //items per row. should be calulated from #acl-list.width that.list_content = $j("#acl-list-content"); that.item_tpl = unescape($j(".acl-list-item[rel=acl-template]").html()); diff --git a/view/theme/frost/js/acl.min.js b/view/theme/frost/js/acl.min.js index 6a3518d9da..fe69e51899 100644 --- a/view/theme/frost/js/acl.min.js +++ b/view/theme/frost/js/acl.min.js @@ -1 +1 @@ -function ACL(e,t){that=this,that.url=e,that.kp_timer=null,t==undefined&&(t=[]),that.allow_cid=t[0]||[],that.allow_gid=t[1]||[],that.deny_cid=t[2]||[],that.deny_gid=t[3]||[],that.group_uids=[],that.nw=4,that.list_content=$j("#acl-list-content"),that.item_tpl=unescape($j(".acl-list-item[rel=acl-template]").html()),that.showall=$j("#acl-showall"),t.length==0&&that.showall.addClass("selected"),that.showall.click(that.on_showall),$j(".acl-button-show").live("click",that.on_button_show),$j(".acl-button-hide").live("click",that.on_button_hide),$j("#acl-search").keypress(that.on_search),$j("#acl-wrapper").parents("form").submit(that.on_submit),that.get(0,100)}ACL.prototype.on_submit=function(){aclfileds=$j("#acl-fields").html(""),$j(that.allow_gid).each(function(e,t){aclfileds.append("")}),$j(that.allow_cid).each(function(e,t){aclfileds.append("")}),$j(that.deny_gid).each(function(e,t){aclfileds.append("")}),$j(that.deny_cid).each(function(e,t){aclfileds.append("")})},ACL.prototype.search=function(){var e=$j("#acl-search").val();that.list_content.html(""),that.get(0,100,e)},ACL.prototype.on_search=function(e){that.kp_timer&&clearTimeout(that.kp_timer),that.kp_timer=setTimeout(that.search,1e3)},ACL.prototype.on_showall=function(e){return e.preventDefault(),e.stopPropagation(),that.showall.hasClass("selected")?!1:(that.showall.addClass("selected"),that.allow_cid=[],that.allow_gid=[],that.deny_cid=[],that.deny_gid=[],that.update_view(),!1)},ACL.prototype.on_button_show=function(e){return e.preventDefault(),e.stopImmediatePropagation(),e.stopPropagation(),that.set_allow($j(this).parent().attr("id")),!1},ACL.prototype.on_button_hide=function(e){return e.preventDefault(),e.stopImmediatePropagation(),e.stopPropagation(),that.set_deny($j(this).parent().attr("id")),!1},ACL.prototype.set_allow=function(e){type=e[0],id=parseInt(e.substr(1));switch(type){case"g":that.allow_gid.indexOf(id)<0?that.allow_gid.push(id):that.allow_gid.remove(id),that.deny_gid.indexOf(id)>=0&&that.deny_gid.remove(id);break;case"c":that.allow_cid.indexOf(id)<0?that.allow_cid.push(id):that.allow_cid.remove(id),that.deny_cid.indexOf(id)>=0&&that.deny_cid.remove(id)}that.update_view()},ACL.prototype.set_deny=function(e){type=e[0],id=parseInt(e.substr(1));switch(type){case"g":that.deny_gid.indexOf(id)<0?that.deny_gid.push(id):that.deny_gid.remove(id),that.allow_gid.indexOf(id)>=0&&that.allow_gid.remove(id);break;case"c":that.deny_cid.indexOf(id)<0?that.deny_cid.push(id):that.deny_cid.remove(id),that.allow_cid.indexOf(id)>=0&&that.allow_cid.remove(id)}that.update_view()},ACL.prototype.update_view=function(){that.allow_gid.length==0&&that.allow_cid.length==0&&that.deny_gid.length==0&&that.deny_cid.length==0?(that.showall.addClass("selected"),$j("#jot-perms-icon").removeClass("lock").addClass("unlock"),$j("#jot-public").show(),$j(".profile-jot-net input").attr("disabled",!1),typeof editor!="undefined"&&editor!=0&&$j("#profile-jot-desc").html(ispublic)):(that.showall.removeClass("selected"),$j("#jot-perms-icon").removeClass("unlock").addClass("lock"),$j("#jot-public").hide(),$j(".profile-jot-net input").attr("disabled","disabled"),$j("#profile-jot-desc").html(" ")),$j("#acl-list-content .acl-list-item").each(function(){$j(this).removeClass("groupshow grouphide")}),$j("#acl-list-content .acl-list-item").each(function(){itemid=$j(this).attr("id"),type=itemid[0],id=parseInt(itemid.substr(1)),btshow=$j(this).children(".acl-button-show").removeClass("selected"),bthide=$j(this).children(".acl-button-hide").removeClass("selected");switch(type){case"g":var e="";that.allow_gid.indexOf(id)>=0&&(btshow.addClass("selected"),bthide.removeClass("selected"),e="groupshow"),that.deny_gid.indexOf(id)>=0&&(btshow.removeClass("selected"),bthide.addClass("selected"),e="grouphide"),$j(that.group_uids[id]).each(function(t,n){e=="grouphide"&&$j("#c"+n).removeClass("groupshow");if(e!=""){var r=$j("#c"+n).attr("class");if(r==undefined)return!0;var i=r.indexOf("grouphide");i==-1&&$j("#c"+n).addClass(e)}});break;case"c":that.allow_cid.indexOf(id)>=0&&(btshow.addClass("selected"),bthide.removeClass("selected")),that.deny_cid.indexOf(id)>=0&&(btshow.removeClass("selected"),bthide.addClass("selected"))}})},ACL.prototype.get=function(e,t,n){var r={start:e,count:t,search:n};$j.ajax({type:"POST",url:that.url,data:r,dataType:"json",success:that.populate})},ACL.prototype.populate=function(e){var t=Math.ceil(e.tot/that.nw)*42;that.list_content.height(t),$j(e.items).each(function(){html="
        "+that.item_tpl+"
        ",html=html.format(this.photo,this.name,this.type,this.id,"",this.network,this.link),this.uids!=undefined&&(that.group_uids[this.id]=this.uids),that.list_content.append(html)}),that.update_view()}; \ No newline at end of file +function ACL(e,t){that=this,that.url=e,that.kp_timer=null,t==undefined&&(t=[]),that.allow_cid=t[0]||[],that.allow_gid=t[1]||[],that.deny_cid=t[2]||[],that.deny_gid=t[3]||[],that.group_uids=[],that.nw=3,that.list_content=$j("#acl-list-content"),that.item_tpl=unescape($j(".acl-list-item[rel=acl-template]").html()),that.showall=$j("#acl-showall"),t.length==0&&that.showall.addClass("selected"),that.showall.click(that.on_showall),$j(".acl-button-show").live("click",that.on_button_show),$j(".acl-button-hide").live("click",that.on_button_hide),$j("#acl-search").keypress(that.on_search),$j("#acl-wrapper").parents("form").submit(that.on_submit),that.get(0,100)}ACL.prototype.on_submit=function(){aclfileds=$j("#acl-fields").html(""),$j(that.allow_gid).each(function(e,t){aclfileds.append("")}),$j(that.allow_cid).each(function(e,t){aclfileds.append("")}),$j(that.deny_gid).each(function(e,t){aclfileds.append("")}),$j(that.deny_cid).each(function(e,t){aclfileds.append("")})},ACL.prototype.search=function(){var e=$j("#acl-search").val();that.list_content.html(""),that.get(0,100,e)},ACL.prototype.on_search=function(e){that.kp_timer&&clearTimeout(that.kp_timer),that.kp_timer=setTimeout(that.search,1e3)},ACL.prototype.on_showall=function(e){return e.preventDefault(),e.stopPropagation(),that.showall.hasClass("selected")?!1:(that.showall.addClass("selected"),that.allow_cid=[],that.allow_gid=[],that.deny_cid=[],that.deny_gid=[],that.update_view(),!1)},ACL.prototype.on_button_show=function(e){return e.preventDefault(),e.stopImmediatePropagation(),e.stopPropagation(),that.set_allow($j(this).parent().attr("id")),!1},ACL.prototype.on_button_hide=function(e){return e.preventDefault(),e.stopImmediatePropagation(),e.stopPropagation(),that.set_deny($j(this).parent().attr("id")),!1},ACL.prototype.set_allow=function(e){type=e[0],id=parseInt(e.substr(1));switch(type){case"g":that.allow_gid.indexOf(id)<0?that.allow_gid.push(id):that.allow_gid.remove(id),that.deny_gid.indexOf(id)>=0&&that.deny_gid.remove(id);break;case"c":that.allow_cid.indexOf(id)<0?that.allow_cid.push(id):that.allow_cid.remove(id),that.deny_cid.indexOf(id)>=0&&that.deny_cid.remove(id)}that.update_view()},ACL.prototype.set_deny=function(e){type=e[0],id=parseInt(e.substr(1));switch(type){case"g":that.deny_gid.indexOf(id)<0?that.deny_gid.push(id):that.deny_gid.remove(id),that.allow_gid.indexOf(id)>=0&&that.allow_gid.remove(id);break;case"c":that.deny_cid.indexOf(id)<0?that.deny_cid.push(id):that.deny_cid.remove(id),that.allow_cid.indexOf(id)>=0&&that.allow_cid.remove(id)}that.update_view()},ACL.prototype.update_view=function(){that.allow_gid.length==0&&that.allow_cid.length==0&&that.deny_gid.length==0&&that.deny_cid.length==0?(that.showall.addClass("selected"),$j("#jot-perms-icon").removeClass("lock").addClass("unlock"),$j("#jot-public").show(),$j(".profile-jot-net input").attr("disabled",!1),typeof editor!="undefined"&&editor!=0&&$j("#profile-jot-desc").html(ispublic)):(that.showall.removeClass("selected"),$j("#jot-perms-icon").removeClass("unlock").addClass("lock"),$j("#jot-public").hide(),$j(".profile-jot-net input").attr("disabled","disabled"),$j("#profile-jot-desc").html(" ")),$j("#acl-list-content .acl-list-item").each(function(){$j(this).removeClass("groupshow grouphide")}),$j("#acl-list-content .acl-list-item").each(function(){itemid=$j(this).attr("id"),type=itemid[0],id=parseInt(itemid.substr(1)),btshow=$j(this).children(".acl-button-show").removeClass("selected"),bthide=$j(this).children(".acl-button-hide").removeClass("selected");switch(type){case"g":var e="";that.allow_gid.indexOf(id)>=0&&(btshow.addClass("selected"),bthide.removeClass("selected"),e="groupshow"),that.deny_gid.indexOf(id)>=0&&(btshow.removeClass("selected"),bthide.addClass("selected"),e="grouphide"),$j(that.group_uids[id]).each(function(t,n){e=="grouphide"&&$j("#c"+n).removeClass("groupshow");if(e!=""){var r=$j("#c"+n).attr("class");if(r==undefined)return!0;var i=r.indexOf("grouphide");i==-1&&$j("#c"+n).addClass(e)}});break;case"c":that.allow_cid.indexOf(id)>=0&&(btshow.addClass("selected"),bthide.removeClass("selected")),that.deny_cid.indexOf(id)>=0&&(btshow.removeClass("selected"),bthide.addClass("selected"))}})},ACL.prototype.get=function(e,t,n){var r={start:e,count:t,search:n};$j.ajax({type:"POST",url:that.url,data:r,dataType:"json",success:that.populate})},ACL.prototype.populate=function(e){var t=Math.ceil(e.tot/that.nw)*42;that.list_content.height(t),$j(e.items).each(function(){html="
        "+that.item_tpl+"
        ",html=html.format(this.photo,this.name,this.type,this.id,"",this.network,this.link),this.uids!=undefined&&(that.group_uids[this.id]=this.uids),that.list_content.append(html)}),that.update_view()}; \ No newline at end of file diff --git a/view/theme/frost/js/jquery.divgrow-1.3.1.min.js b/view/theme/frost/js/jquery.divgrow-1.3.1.min.js new file mode 100644 index 0000000000..fd08f7fa86 --- /dev/null +++ b/view/theme/frost/js/jquery.divgrow-1.3.1.min.js @@ -0,0 +1 @@ +(function ($) { var divgrowid = 0; $.fn.divgrow = function (options) { var options = $.extend({}, { initialHeight: 100, moreText: "+ Show More", lessText: "- Show Less", speed: 1000, showBrackets: true }, options); return this.each(function () { divgrowid++; obj = $(this); var fullHeight = obj.height() + 10; obj.css('height', options.initialHeight).css('overflow', 'hidden'); if (options.showBrackets) { obj.after('

        […]

        ') } else { obj.after('') } $("a.divgrow-showmore").html(options.moreText); $("." + "divgrow-obj-" + divgrowid).toggle(function () { $(this).prevAll("div:first").animate({ height: fullHeight + "px" }, options.speed, function () { if (options.showBrackets) { $(this).nextAll("p.divgrow-brackets:first").fadeOut() } $(this).nextAll("a.divgrow-showmore:first").html(options.lessText) }) }, function () { $(this).prevAll("div:first").stop(true, false).animate({ height: options.initialHeight }, options.speed, function () { if (options.showBrackets) { $(this).nextAll("p.divgrow-brackets:first").stop(true, false).fadeIn() } $(this).nextAll("a.divgrow-showmore:first").stop(true, false).html(options.moreText) }) }) }) } })(jQuery); \ No newline at end of file diff --git a/view/theme/frost/js/main.js b/view/theme/frost/js/main.js index d4741bc6ec..0aea9bc853 100644 --- a/view/theme/frost/js/main.js +++ b/view/theme/frost/js/main.js @@ -290,7 +290,7 @@ // add a new thread - $j('.tread-wrapper',data).each(function() { + $j('.toplevel_item',data).each(function() { var ident = $j(this).attr('id'); if($j('#' + ident).length == 0 && profile_page == 1) { @@ -342,6 +342,33 @@ } /* autocomplete @nicknames */ $j(".comment-edit-form textarea").contact_autocomplete(baseurl+"/acl"); + + var bimgs = $j(".wall-item-body > img").not(function() { return this.complete; }); + var bimgcount = bimgs.length; + + if (bimgcount) { + bimgs.load(function() { + bimgcount--; + if (! bimgcount) { + collapseHeight(); + + } + }); + } else { + collapseHeight(); + } + + }); + } + + function collapseHeight() { + $j(".wall-item-body").each(function() { + if($j(this).height() > 410) { + if(! $j(this).hasClass('divmore')) { + $j(this).divgrow({ initialHeight: 400, showBrackets: false, speed: 300 }); + $j(this).addClass('divmore'); + } + } }); } diff --git a/view/theme/frost/js/main.min.js b/view/theme/frost/js/main.min.js index 0713d1a5ce..ec3243df8d 100644 --- a/view/theme/frost/js/main.min.js +++ b/view/theme/frost/js/main.min.js @@ -1 +1 @@ -function openClose(e){document.getElementById(e).style.display=="block"?document.getElementById(e).style.display="none":document.getElementById(e).style.display="block"}function openMenu(e){document.getElementById(e).style.display="block"}function closeMenu(e){document.getElementById(e).style.display="none"}function NavUpdate(){if(!stopped){var e="ping"+(localUser!=0?"?f=&uid="+localUser:"");$j.get(e,function(e){$j(e).find("result").each(function(){$j("nav").trigger("nav-update",this),$j("#live-network").length&&(src="network",liveUpdate()),$j("#live-profile").length&&(src="profile",liveUpdate()),$j("#live-community").length&&(src="community",liveUpdate()),$j("#live-notes").length&&(src="notes",liveUpdate()),$j("#live-display").length&&liking&&(liking=0,window.location.href=window.location.href),$j("#live-photos").length&&liking&&(liking=0,window.location.href=window.location.href)})})}timer=setTimeout(NavUpdate,updateInterval)}function liveUpdate(){if(src==null||stopped||!profile_uid){$j(".like-rotator").hide();return}if($j(".comment-edit-text-full").length||in_progress){livetime&&clearTimeout(livetime),livetime=setTimeout(liveUpdate,1e4);return}livetime!=null&&(livetime=null),prev="live-"+src,in_progress=!0;var e=netargs.length?"/"+netargs:"",t="update_"+src+e+"&p="+profile_uid+"&page="+profile_page+"&msie="+(msie?1:0);$j.get(t,function(e){in_progress=!1,$j(".tread-wrapper",e).each(function(){var e=$j(this).attr("id");$j("#"+e).length==0&&profile_page==1?($j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))}),$j("#"+prev).after($j(this))):($j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))}),$j("#"+e).replaceWith($j(this))),prev=e}),$j(".like-rotator").hide(),commentBusy&&(commentBusy=!1,$j("body").css("cursor","auto")),$j(".comment-edit-form textarea").contact_autocomplete(baseurl+"/acl")})}function imgbright(e){$j(e).removeClass("drophide").addClass("drop")}function imgdull(e){$j(e).removeClass("drop").addClass("drophide")}function dolike(e,t){unpause(),$j("#like-rotator-"+e.toString()).show(),$j.get("like/"+e.toString()+"?verb="+t,NavUpdate),liking=1}function dostar(e){e=e.toString(),$j.get("starred/"+e,function(t){t.match(/1/)?($j("#starred-"+e).addClass("starred"),$j("#starred-"+e).removeClass("unstarred"),$j("#star-"+e).addClass("hidden"),$j("#unstar-"+e).removeClass("hidden")):($j("#starred-"+e).addClass("unstarred"),$j("#starred-"+e).removeClass("starred"),$j("#star-"+e).removeClass("hidden"),$j("#unstar-"+e).addClass("hidden"))})}function getPosition(e){var t={x:0,y:0};if(e.pageX||e.pageY)t.x=e.pageX,t.y=e.pageY;else if(e.clientX||e.clientY)t.x=e.clientX+(document.documentElement.scrollLeft||document.body.scrollLeft)-document.documentElement.clientLeft,t.y=e.clientY+(document.documentElement.scrollTop||document.body.scrollTop)-document.documentElement.clientTop;else if(e.x||e.y)t.x=e.x,t.y=e.y;return t}function lockview(e,t){e=e||window.event,cursor=getPosition(e),lockvisible?lockviewhide():(lockvisible=!0,$j.get("lockview/"+t,function(e){$j("#panel").html(e),$j("#panel").css({left:cursor.x+5,top:cursor.y+5}),$j("#panel").show()}))}function lockviewhide(){lockvisible=!1,$j("#panel").hide()}function post_comment(e){return unpause(),commentBusy=!0,$j("body").css("cursor","wait"),$j("#comment-preview-inp-"+e).val("0"),$j.post("item",$j("#comment-edit-form-"+e).serialize(),function(t){if(t.success){$j("#comment-edit-wrapper-"+e).hide(),$j("#comment-edit-text-"+e).val("");var n=document.getElementById("comment-edit-text-"+e);n&&commentClose(n,e),timer&&clearTimeout(timer),timer=setTimeout(NavUpdate,10)}t.reload&&(window.location.href=t.reload)},"json"),!1}function preview_comment(e){return $j("#comment-preview-inp-"+e).val("1"),$j("#comment-edit-preview-"+e).show(),$j.post("item",$j("#comment-edit-form-"+e).serialize(),function(t){t.preview&&($j("#comment-edit-preview-"+e).html(t.preview),$j("#comment-edit-preview-"+e+" a").click(function(){return!1}))},"json"),!0}function preview_post(){return $j("#jot-preview").val("1"),$j("#jot-preview-content").show(),tinyMCE.triggerSave(),$j.post("item",$j("#profile-jot-form").serialize(),function(e){e.preview&&($j("#jot-preview-content").html(e.preview),$j("#jot-preview-content a").click(function(){return!1}))},"json"),$j("#jot-preview").val("0"),!0}function unpause(){totStopped=!1,stopped=!1,$j("#pause").html("")}function bin2hex(e){var t,n,r=0,i=[];e+="",r=e.length;for(n=0;n'+e.desc+'
        '+e.version+'
        '+e.credits+'
        '+theme+'')})}var src=null,prev=null,livetime=null,msie=!1,stopped=!1,totStopped=!1,timer=null,pr=0,liking=0,in_progress=!1,langSelect=!1,commentBusy=!1,last_popup_menu=null,last_popup_button=null;$j(function(){function e(e){last_popup_menu&&"#"+last_popup_menu.attr("id")!==$j(e.target).attr("rel")&&(last_popup_menu.hide(),last_popup_button.removeClass("selected"),last_popup_menu=null,last_popup_button=null)}$j.ajaxSetup({cache:!1}),msie=$j.browser.msie,$j(".onoff input").each(function(){val=$j(this).val(),id=$j(this).attr("id"),$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden")}),$j(".onoff > a").click(function(e){e.preventDefault();var t=$j(this).siblings("input"),n=1-t.val(),r=t.attr("id");$j("#"+r+"_onoff ."+(n==0?"on":"off")).addClass("hidden"),$j("#"+r+"_onoff ."+(n==1?"on":"off")).removeClass("hidden"),t.val(n)}),setupFieldRichtext(),$j("a[rel^=#]").click(function(t){return e(t),menu=$j($j(this).attr("rel")),t.preventDefault(),t.stopPropagation(),menu.attr("popup")=="false"?!1:($j(this).parent().toggleClass("selected"),menu.slideToggle("fast"),menu.css("display")=="none"?(last_popup_menu=null,last_popup_button=null):(last_popup_menu=menu,last_popup_button=$j(this).parent()),!1)}),$j("html").click(function(t){e(t)}),$j("a.popupbox").fancybox({transitionIn:"none",transitionOut:"none"});var t=unescape($j("#nav-notifications-template[rel=template]").html()),n=unescape($j("
        ").append($j("#nav-notifications-see-all").clone()).html()),r=unescape($j("
        ").append($j("#nav-notifications-mark-all").clone()).html()),i=unescape($j("#nav-notifications-menu").html());$j("nav").bind("nav-update",function(e,s){var o=$j(s).find("invalid").text();o==1&&(window.location.href=window.location.href);var u=$j(s).find("net").text();u==0?(u="",$j("#net-update").removeClass("show")):$j("#net-update").addClass("show"),$j("#net-update").html(u);var a=$j(s).find("home").text();a==0?(a="",$j("#home-update").removeClass("show")):$j("#home-update").addClass("show"),$j("#home-update").html(a);var f=$j(s).find("intro").text();f==0?(f="",$j("#intro-update").removeClass("show")):$j("#intro-update").addClass("show"),$j("#intro-update").html(f);var l=$j(s).find("mail").text();l==0?(l="",$j("#mail-update").removeClass("show")):$j("#mail-update").addClass("show"),$j("#mail-update").html(l);var f=$j(s).find("intro").text();f==0?(f="",$j("#intro-update-li").removeClass("show")):$j("#intro-update-li").addClass("show"),$j("#intro-update-li").html(f);var l=$j(s).find("mail").text();l==0?(l="",$j("#mail-update-li").removeClass("show")):$j("#mail-update-li").addClass("show"),$j("#mail-update-li").html(l);var c=$j(s).find("notif");c.children("note").length==0?$j("#nav-notifications-menu").html(i):(nnm=$j("#nav-notifications-menu"),nnm.html(n+r),c.children("note").each(function(){e=$j(this),text=e.text().format(""+e.attr("name")+""),html=t.format(e.attr("href"),e.attr("photo"),text,e.attr("date"),e.attr("seen")),nnm.append(html)})),notif=c.attr("count"),notif>0?$j("#nav-notifications-linkmenu").addClass("on"):$j("#nav-notifications-linkmenu").removeClass("on"),notif==0?(notif="",$j("#notify-update").removeClass("show")):$j("#notify-update").addClass("show"),$j("#notify-update").html(notif);var h=$j(s).find("sysmsgs");h.children("notice").each(function(){text=$j(this).text(),$j.jGrowl(text,{sticky:!1,theme:"notice",life:2e3})}),h.children("info").each(function(){text=$j(this).text(),$j.jGrowl(text,{sticky:!1,theme:"info",life:1500})})}),NavUpdate(),$j(document).keydown(function(e){if(e.keyCode=="8"){var t=e.target||e.srcElement;if(!/input|textarea/i.test(t.nodeName))return!1}e.keyCode=="19"||e.ctrlKey&&e.which=="32"?(e.preventDefault(),stopped==0?(stopped=!0,e.ctrlKey&&(totStopped=!0),$j("#pause").html('pause')):unpause()):totStopped||unpause()})});var lockvisible=!1;String.prototype.format=function(){var e=this;for(var t=0;t img").not(function(){return this.complete}),n=t.length;n?t.load(function(){n--,n||collapseHeight()}):collapseHeight()})}function collapseHeight(){$j(".wall-item-body").each(function(){$j(this).height()>410&&($j(this).hasClass("divmore")||($j(this).divgrow({initialHeight:400,showBrackets:!1,speed:300}),$j(this).addClass("divmore")))})}function imgbright(e){$j(e).removeClass("drophide").addClass("drop")}function imgdull(e){$j(e).removeClass("drop").addClass("drophide")}function dolike(e,t){unpause(),$j("#like-rotator-"+e.toString()).show(),$j.get("like/"+e.toString()+"?verb="+t,NavUpdate),liking=1}function dostar(e){e=e.toString(),$j.get("starred/"+e,function(t){t.match(/1/)?($j("#starred-"+e).addClass("starred"),$j("#starred-"+e).removeClass("unstarred"),$j("#star-"+e).addClass("hidden"),$j("#unstar-"+e).removeClass("hidden")):($j("#starred-"+e).addClass("unstarred"),$j("#starred-"+e).removeClass("starred"),$j("#star-"+e).removeClass("hidden"),$j("#unstar-"+e).addClass("hidden"))})}function getPosition(e){var t={x:0,y:0};if(e.pageX||e.pageY)t.x=e.pageX,t.y=e.pageY;else if(e.clientX||e.clientY)t.x=e.clientX+(document.documentElement.scrollLeft||document.body.scrollLeft)-document.documentElement.clientLeft,t.y=e.clientY+(document.documentElement.scrollTop||document.body.scrollTop)-document.documentElement.clientTop;else if(e.x||e.y)t.x=e.x,t.y=e.y;return t}function lockview(e,t){e=e||window.event,cursor=getPosition(e),lockvisible?lockviewhide():(lockvisible=!0,$j.get("lockview/"+t,function(e){$j("#panel").html(e),$j("#panel").css({left:cursor.x+5,top:cursor.y+5}),$j("#panel").show()}))}function lockviewhide(){lockvisible=!1,$j("#panel").hide()}function post_comment(e){return unpause(),commentBusy=!0,$j("body").css("cursor","wait"),$j("#comment-preview-inp-"+e).val("0"),$j.post("item",$j("#comment-edit-form-"+e).serialize(),function(t){if(t.success){$j("#comment-edit-wrapper-"+e).hide(),$j("#comment-edit-text-"+e).val("");var n=document.getElementById("comment-edit-text-"+e);n&&commentClose(n,e),timer&&clearTimeout(timer),timer=setTimeout(NavUpdate,10)}t.reload&&(window.location.href=t.reload)},"json"),!1}function preview_comment(e){return $j("#comment-preview-inp-"+e).val("1"),$j("#comment-edit-preview-"+e).show(),$j.post("item",$j("#comment-edit-form-"+e).serialize(),function(t){t.preview&&($j("#comment-edit-preview-"+e).html(t.preview),$j("#comment-edit-preview-"+e+" a").click(function(){return!1}))},"json"),!0}function preview_post(){return $j("#jot-preview").val("1"),$j("#jot-preview-content").show(),tinyMCE.triggerSave(),$j.post("item",$j("#profile-jot-form").serialize(),function(e){e.preview&&($j("#jot-preview-content").html(e.preview),$j("#jot-preview-content a").click(function(){return!1}))},"json"),$j("#jot-preview").val("0"),!0}function unpause(){totStopped=!1,stopped=!1,$j("#pause").html("")}function bin2hex(e){var t,n,r=0,i=[];e+="",r=e.length;for(n=0;n'+e.desc+'
        '+e.version+'
        '+e.credits+'
        '+theme+'')})}var src=null,prev=null,livetime=null,msie=!1,stopped=!1,totStopped=!1,timer=null,pr=0,liking=0,in_progress=!1,langSelect=!1,commentBusy=!1,last_popup_menu=null,last_popup_button=null;$j(function(){function e(e){last_popup_menu&&"#"+last_popup_menu.attr("id")!==$j(e.target).attr("rel")&&(last_popup_menu.hide(),last_popup_button.removeClass("selected"),last_popup_menu=null,last_popup_button=null)}$j.ajaxSetup({cache:!1}),msie=$j.browser.msie,$j(".onoff input").each(function(){val=$j(this).val(),id=$j(this).attr("id"),$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden")}),$j(".onoff > a").click(function(e){e.preventDefault();var t=$j(this).siblings("input"),n=1-t.val(),r=t.attr("id");$j("#"+r+"_onoff ."+(n==0?"on":"off")).addClass("hidden"),$j("#"+r+"_onoff ."+(n==1?"on":"off")).removeClass("hidden"),t.val(n)}),setupFieldRichtext(),$j("a[rel^=#]").click(function(t){return e(t),menu=$j($j(this).attr("rel")),t.preventDefault(),t.stopPropagation(),menu.attr("popup")=="false"?!1:($j(this).parent().toggleClass("selected"),menu.slideToggle("fast"),menu.css("display")=="none"?(last_popup_menu=null,last_popup_button=null):(last_popup_menu=menu,last_popup_button=$j(this).parent()),!1)}),$j("html").click(function(t){e(t)}),$j("a.popupbox").fancybox({transitionIn:"none",transitionOut:"none"});var t=unescape($j("#nav-notifications-template[rel=template]").html()),n=unescape($j("
        ").append($j("#nav-notifications-see-all").clone()).html()),r=unescape($j("
        ").append($j("#nav-notifications-mark-all").clone()).html()),i=unescape($j("#nav-notifications-menu").html());$j("nav").bind("nav-update",function(e,s){var o=$j(s).find("invalid").text();o==1&&(window.location.href=window.location.href);var u=$j(s).find("net").text();u==0?(u="",$j("#net-update").removeClass("show")):$j("#net-update").addClass("show"),$j("#net-update").html(u);var a=$j(s).find("home").text();a==0?(a="",$j("#home-update").removeClass("show")):$j("#home-update").addClass("show"),$j("#home-update").html(a);var f=$j(s).find("intro").text();f==0?(f="",$j("#intro-update").removeClass("show")):$j("#intro-update").addClass("show"),$j("#intro-update").html(f);var l=$j(s).find("mail").text();l==0?(l="",$j("#mail-update").removeClass("show")):$j("#mail-update").addClass("show"),$j("#mail-update").html(l);var f=$j(s).find("intro").text();f==0?(f="",$j("#intro-update-li").removeClass("show")):$j("#intro-update-li").addClass("show"),$j("#intro-update-li").html(f);var l=$j(s).find("mail").text();l==0?(l="",$j("#mail-update-li").removeClass("show")):$j("#mail-update-li").addClass("show"),$j("#mail-update-li").html(l);var c=$j(s).find("notif");c.children("note").length==0?$j("#nav-notifications-menu").html(i):(nnm=$j("#nav-notifications-menu"),nnm.html(n+r),c.children("note").each(function(){e=$j(this),text=e.text().format(""+e.attr("name")+""),html=t.format(e.attr("href"),e.attr("photo"),text,e.attr("date"),e.attr("seen")),nnm.append(html)})),notif=c.attr("count"),notif>0?$j("#nav-notifications-linkmenu").addClass("on"):$j("#nav-notifications-linkmenu").removeClass("on"),notif==0?(notif="",$j("#notify-update").removeClass("show")):$j("#notify-update").addClass("show"),$j("#notify-update").html(notif);var h=$j(s).find("sysmsgs");h.children("notice").each(function(){text=$j(this).text(),$j.jGrowl(text,{sticky:!1,theme:"notice",life:2e3})}),h.children("info").each(function(){text=$j(this).text(),$j.jGrowl(text,{sticky:!1,theme:"info",life:1500})})}),NavUpdate(),$j(document).keydown(function(e){if(e.keyCode=="8"){var t=e.target||e.srcElement;if(!/input|textarea/i.test(t.nodeName))return!1}e.keyCode=="19"||e.ctrlKey&&e.which=="32"?(e.preventDefault(),stopped==0?(stopped=!0,e.ctrlKey&&(totStopped=!0),$j("#pause").html('pause')):unpause()):totStopped||unpause()})});var lockvisible=!1;String.prototype.format=function(){var e=this;for(var t=0;t"),r=r.replace("&","&"),r=r.replace(""",'"'),$j("#comment-edit-text-"+t).val(n+r)}function qCommentInsert(e,t){var n=$j("#comment-edit-text-"+t).val();n==window.commentEmptyText&&(n="",$j("#comment-edit-text-"+t).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).removeClass("comment-edit-text-empty"),openMenu("comment-edit-submit-wrapper-"+t));var r=$j(e).val();r=r.replace("<","<"),r=r.replace(">",">"),r=r.replace("&","&"),r=r.replace(""",'"'),$j("#comment-edit-text-"+t).val(n+r),$j(e).val("")}function showHideComments(e){$j("#collapsed-comments-"+e).is(":visible")?($j("#collapsed-comments-"+e).hide(),$j("#hide-comments-"+e).html(window.showMore)):($j("#collapsed-comments-"+e).show(),$j("#hide-comments-"+e).html(window.showFewer))}function enableOnUser(){if(editor)return;$j(this).val(""),initEditor()}function initEditor(e){if(editor==0){$j("#profile-jot-text-loading").show();if(plaintext=="none"){$j("#profile-jot-text-loading").hide(),$j("#profile-jot-text").css({height:200,color:"#000"}),$j("#profile-jot-text").contact_autocomplete(baseurl+"/acl"),editor=!0,$j("a#jot-perms-icon").fancybox({transitionIn:"elastic",transitionOut:"elastic"}),$j(".jothidden").show(),typeof e!="undefined"&&e();return}tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:window.editSelect,auto_focus:"profile-jot-text",plugins:"bbcode,paste,autoresize, inlinepopups",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",gecko_spellcheck:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",convert_urls:!1,content_css:window.baseURL+"/view/custom_tinymce.css",theme_advanced_path:!1,file_browser_callback:"fcFileBrowser",setup:function(t){cPopup=null,t.onKeyDown.add(function(e,t){cPopup!==null&&cPopup.onkey(t)}),t.onKeyUp.add(function(e,t){var n=tinyMCE.activeEditor.getContent();match=n.match(/@([^ \n]+)$/),match!==null?(cPopup===null&&(cPopup=new ACPopup(this,baseurl+"/acl")),cPopup.ready&&match[1]!==cPopup.searchText&&cPopup.search(match[1]),cPopup.ready||(cPopup=null)):cPopup!==null&&(cPopup.close(),cPopup=null),textlen=n.length,textlen!=0&&$j("#jot-perms-icon").is(".unlock")?$j("#profile-jot-desc").html(ispublic):$j("#profile-jot-desc").html(" "),textlen<=140&&($j("#character-counter").removeClass("red"),$j("#character-counter").removeClass("orange"),$j("#character-counter").addClass("grey")),textlen>140&&textlen<=420&&($j("#character-counter").removeClass("grey"),$j("#character-counter").removeClass("red"),$j("#character-counter").addClass("orange")),textlen>420&&($j("#character-counter").removeClass("grey"),$j("#character-counter").removeClass("orange"),$j("#character-counter").addClass("red")),$j("#character-counter").text(textlen)}),t.onInit.add(function(t){t.pasteAsPlainText=!0,$j("#profile-jot-text-loading").hide(),$j(".jothidden").show(),typeof e!="undefined"&&e()})}}),editor=!0,$j("a#jot-perms-icon").fancybox({transitionIn:"none",transitionOut:"none"})}else typeof e!="undefined"&&e()}function msgInitEditor(){plaintext!="none"?tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:/(profile-jot-text|prvmail-text)/,plugins:"bbcode,paste",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",gecko_spellcheck:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",convert_urls:!1,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,setup:function(e){e.onInit.add(function(e){e.pasteAsPlainText=!0;var t=e.editorId,n=$j("#"+t);typeof n.attr("tabindex")!="undefined"&&($j("#"+t+"_ifr").attr("tabindex",n.attr("tabindex")),n.attr("tabindex",null))})}}):$j("#prvmail-text").contact_autocomplete(baseurl+"/acl")}function profInitEditor(){tinyMCE.init({theme:"advanced",mode:window.editSelect,plugins:"bbcode,paste",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",gecko_spellcheck:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,setup:function(e){e.onInit.add(function(e){e.pasteAsPlainText=!0})}})}function eventInitEditor(){tinyMCE.init({theme:"advanced",mode:"textareas",plugins:"bbcode,paste",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",gecko_spellcheck:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,setup:function(e){e.onInit.add(function(e){e.pasteAsPlainText=!0})}})}function contactInitEditor(){tinyMCE.init({theme:"advanced",mode:window.editSelect,elements:"contact-edit-info",plugins:"bbcode",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_styles:"blockquote,code",gecko_spellcheck:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",content_css:baseurl+"/view/custom_tinymce.css"})}function wallInitEditor(){var e=window.editSelect;e!="none"?tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:/(profile-jot-text|prvmail-text)/,plugins:"bbcode,paste",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",gecko_spellcheck:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",convert_urls:!1,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,setup:function(e){e.onInit.add(function(e){e.pasteAsPlainText=!0;var t=e.editorId,n=$j("#"+t);typeof n.attr("tabindex")!="undefined"&&($j("#"+t+"_ifr").attr("tabindex",n.attr("tabindex")),n.attr("tabindex",null))})}}):$j("#prvmail-text").contact_autocomplete(baseurl+"/acl")}function deleteCheckedItems(){var e="";$j(".item-select").each(function(){$j(this).is(":checked")&&(e.length!=0?e=e+","+$j(this).val():e=$j(this).val())}),$j.post("item",{dropitems:e},function(e){window.location.reload()})}function jotVideoURL(){reply=prompt(window.vidURL),reply&&reply.length&&addeditortext("[video]"+reply+"[/video]")}function jotAudioURL(){reply=prompt(window.audURL),reply&&reply.length&&addeditortext("[audio]"+reply+"[/audio]")}function jotGetLocation(){reply=prompt(window.whereAreU,$j("#jot-location").val()),reply&&reply.length&&$j("#jot-location").val(reply)}function jotShare(e){$j("#jot-popup").length!=0&&$j("#jot-popup").show(),$j("#like-rotator-"+e).show(),$j.get("share/"+e,function(t){editor||$j("#profile-jot-text").val(""),initEditor(function(){addeditortext(t),$j("#like-rotator-"+e).hide(),$j(window).scrollTop(0)})})}function linkdropper(e){var t=e.dataTransfer.types.contains("text/uri-list");t&&e.preventDefault()}function itemTag(e){reply=prompt(window.term),reply&&reply.length&&(reply=reply.replace("#",""),reply.length&&(commentBusy=!0,$j("body").css("cursor","wait"),$j.get("tagger/"+e+"?term="+reply,NavUpdate),liking=1))}function itemFiler(e){var t=$j("input").css("border-color");$j.get("filer/",function(n){$j.fancybox(n),$j("#id_term").keypress(function(){$j(this).css("border-color",t)}),$j("#select_term").change(function(){$j("#id_term").css("border-color",t)}),$j("#filer_save").click(function(t){return t.preventDefault(),reply=$j("#id_term").val(),reply&&reply.length?(commentBusy=!0,$j("body").css("cursor","wait"),$j.get("filer/"+e+"?term="+reply,NavUpdate),liking=1,$j.fancybox.close()):$j("#id_term").css("border-color","#FF0000"),!1})})}function jotClearLocation(){$j("#jot-coord").val(""),$j("#profile-nolocation-wrapper").hide()}function addeditortext(e){if(plaintext=="none"){var t=$j("#profile-jot-text").val();$j("#profile-jot-text").val(t+e)}else tinyMCE.execCommand("mceInsertRawHTML",!1,e)}$j(document).ready(function(){window.navMenuTimeout={"#network-menu-list-timeout":null,"#contacts-menu-list-timeout":null,"#system-menu-list-timeout":null,"#network-menu-list-opening":!1,"#contacts-menu-list-opening":!1,"#system-menu-list-opening":!1,"#network-menu-list-closing":!1,"#contacts-menu-list-closing":!1,"#system-menu-list-closing":!1},typeof acl=="undefined"&&(acl=new ACL(baseurl+"/acl",[window.allowCID,window.allowGID,window.denyCID,window.denyGID])),$j("#profile-jot-text").focus(enableOnUser),$j("#profile-jot-text").click(enableOnUser),$j(".nav-menu-link").hover(function(){showNavMenu($j(this).attr("rel"))},function(){hideNavMenu($j(this).attr("rel"))}),$j(".group-edit-icon").hover(function(){$j(this).addClass("icon"),$j(this).removeClass("iconspacer")},function(){$j(this).removeClass("icon"),$j(this).addClass("iconspacer")}),$j(".sidebar-group-element").hover(function(){id=$j(this).attr("id"),$j("#edit-"+id).addClass("icon"),$j("#edit-"+id).removeClass("iconspacer")},function(){id=$j(this).attr("id"),$j("#edit-"+id).removeClass("icon"),$j("#edit-"+id).addClass("iconspacer")}),$j(".savedsearchdrop").hover(function(){$j(this).addClass("drop"),$j(this).addClass("icon"),$j(this).removeClass("iconspacer")},function(){$j(this).removeClass("drop"),$j(this).removeClass("icon"),$j(this).addClass("iconspacer")}),$j(".savedsearchterm").hover(function(){id=$j(this).attr("id"),$j("#drop-"+id).addClass("icon"),$j("#drop-"+id).addClass("drophide"),$j("#drop-"+id).removeClass("iconspacer")},function(){id=$j(this).attr("id"),$j("#drop-"+id).removeClass("icon"),$j("#drop-"+id).removeClass("drophide"),$j("#drop-"+id).addClass("iconspacer")}),window.autoCompleteType=="display-head"&&$j(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl");if(window.aclType=="event_head"){$j("#events-calendar").fullCalendar({events:baseurl+"/events/json/",header:{left:"prev,next today",center:"title",right:"month,agendaWeek,agendaDay"},timeFormat:"H(:mm)",eventClick:function(e,t,n){showEvent(e.id)},eventRender:function(e,t,n){if(e.item["author-name"]==null)return;switch(n.name){case"month":t.find(".fc-event-title").html("{1} : {2}".format(e.item["author-avatar"],e.item["author-name"],e.title));break;case"agendaWeek":t.find(".fc-event-title").html("{1}

        {2}

        {3}

        ".format(e.item["author-avatar"],e.item["author-name"],e.item.desc,e.item.location));break;case"agendaDay":t.find(".fc-event-title").html("{1}

        {2}

        {3}

        ".format(e.item["author-avatar"],e.item["author-name"],e.item.desc,e.item.location))}}});var e=location.href.replace(baseurl,"").split("/");e.length>=4&&$j("#events-calendar").fullCalendar("gotoDate",e[2],e[3]-1);var t=location.hash.split("-");t.length==2&&t[0]=="#link"&&showEvent(t[1])}$j("#event-share-checkbox").change(function(){$j("#event-share-checkbox").is(":checked")?$j("#acl-wrapper").show():$j("#acl-wrapper").hide()}).trigger("change"),(window.aclType=="settings-head"||window.aclType=="photos_head"||window.aclType=="event_head")&&$j("#contact_allow, #contact_deny, #group_allow, #group_deny").change(function(){var e;$j("#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected").each(function(){e=$j(this).text(),$j("#jot-perms-icon").removeClass("unlock").addClass("lock"),$j("#jot-public").hide()}),e==null&&($j("#jot-perms-icon").removeClass("lock").addClass("unlock"),$j("#jot-public").show())}).trigger("change");switch(window.autocompleteType){case"msg-header":var n=$j("#recip").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350,onSelect:function(e,t){$j("#recip-complete").val(t)}});break;case"contacts-head":var n=$j("#contacts-search").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350});n.setOptions({params:{type:"a"}});break;default:}if(typeof window.AjaxUpload!="undefined")switch(window.ajaxType){case"jot-header":var r=new window.AjaxUpload("wall-image-upload",{action:"wall_upload/"+window.nickname,name:"userfile",onSubmit:function(e,t){$j("#profile-rotator").show()},onComplete:function(e,t){addeditortext(t),$j("#profile-rotator").hide()}}),i=new window.AjaxUpload("wall-file-upload",{action:"wall_attach/"+window.nickname,name:"userfile",onSubmit:function(e,t){$j("#profile-rotator").show()},onComplete:function(e,t){addeditortext(t),$j("#profile-rotator").hide()}});break;case"msg-header":var r=new window.AjaxUpload("prvmail-upload",{action:"wall_upload/"+window.nickname,name:"userfile",onSubmit:function(e,t){$j("#profile-rotator").show()},onComplete:function(e,t){tinyMCE.execCommand("mceInsertRawHTML",!1,t),$j("#profile-rotator").hide()}});break;default:}}),$j(function(){$j("nav").bind("nav-update",function(e,t){var n=$j("#pending-update"),r=$j(t).find("register").text();r=="0"?(r="",n.hide()):n.show(),n.html(r)})}),$j(function(){$j("#cnftheme").fancybox({width:800,autoDimensions:!1,onStart:function(){var e=$j("#id_theme :selected").val();$j("#cnftheme").attr("href",baseurl+"/admin/themes/"+e)},onComplete:function(){$j("div#fancybox-content form").submit(function(e){var t=$j(this).attr("action"),n={};return $j(this).find("input").each(function(){n[$j(this).attr("name")]=$j(this).val()}),$j(this).find("select").each(function(){n[$j(this).attr("name")]=$j(this).children(":selected").val()}),console.log(":)",t,n),$j.post(t,n,function(e){timer&&clearTimeout(timer),NavUpdate(),$j.fancybox.close()}),!1})}})}),typeof window.photoEdit!="undefined"&&$j(document).keydown(function(e){window.prevLink!=""&&e.ctrlKey&&e.keyCode==37&&(e.preventDefault(),window.location.href=window.prevLink),window.nextLink!=""&&e.ctrlKey&&e.keyCode==39&&(e.preventDefault(),window.location.href=window.nextLink)});switch(window.ajaxType){case"jot-header":function jotGetLink(){reply=prompt(window.linkURL),reply&&reply.length&&(reply=bin2hex(reply),$j("#profile-rotator").show(),$j.get("parse_url?binurl="+reply,function(e){addeditortext(e),$j("#profile-rotator").hide()}))}function linkdrop(e){var t=e.dataTransfer.getData("text/uri-list");e.target.textContent=t,e.preventDefault(),t&&t.length&&(t=bin2hex(t),$j("#profile-rotator").show(),$j.get("parse_url?binurl="+t,function(e){editor||$j("#profile-jot-text").val(""),initEditor(function(){addeditortext(e),$j("#profile-rotator").hide()})}))}break;case"msg-header":case"wallmsg-header":function jotGetLink(){reply=prompt(window.linkURL),reply&&reply.length&&($j("#profile-rotator").show(),$j.get("parse_url?url="+reply,function(e){tinyMCE.execCommand("mceInsertRawHTML",!1,e),$j("#profile-rotator").hide()}))}function linkdrop(e){var t=e.dataTransfer.getData("text/uri-list");e.target.textContent=t,e.preventDefault(),t&&t.length&&($j("#profile-rotator").show(),$j.get("parse_url?url="+t,function(e){tinyMCE.execCommand("mceInsertRawHTML",!1,e),$j("#profile-rotator").hide()}))}break;default:}var editor=!1,textlen=0,plaintext=window.editSelect,ispublic=window.isPublic;typeof window.geoTag=="function"&&window.geoTag(); \ No newline at end of file +function showEvent(e){$j.get(baseurl+"/events/?id="+e,function(e){$j.fancybox(e)})}function initCrop(){function e(e,t){$("x1").value=e.x1,$("y1").value=e.y1,$("x2").value=e.x2,$("y2").value=e.y2,$("width").value=t.width,$("height").value=t.height}Event.observe(window,"load",function(){new Cropper.ImgWithPreview("croppa",{previewWrap:"previewWrap",minWidth:175,minHeight:175,maxWidth:640,maxHeight:640,ratioDim:{x:100,y:100},displayOnInit:!0,onEndCrop:e})})}function showNavMenu(e){window.navMenuTimeout[e+"-closing"]?(window.navMenuTimeout[e+"-closing"]=!1,clearTimeout(window.navMenuTimeout[e+"-timeout"])):(window.navMenuTimeout[e+"-opening"]=!0,window.navMenuTimeout[e+"-timeout"]=setTimeout(function(){$j(e).slideDown("fast").show(),window.navMenuTimeout[e+"-opening"]=!1},200))}function hideNavMenu(e){window.navMenuTimeout[e+"-opening"]?(window.navMenuTimeout[e+"-opening"]=!1,clearTimeout(window.navMenuTimeout[e+"-timeout"])):(window.navMenuTimeout[e+"-closing"]=!0,window.navMenuTimeout[e+"-timeout"]=setTimeout(function(){$j(e).slideUp("fast"),window.navMenuTimeout[e+"-closing"]=!1},500))}function insertFormatting(e,t,n){var r=$j("#comment-edit-text-"+n).val();r==e&&(r="",$j("#comment-edit-text-"+n).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+n).removeClass("comment-edit-text-empty"),openMenu("comment-edit-submit-wrapper-"+n),$j("#comment-edit-text-"+n).val(r)),textarea=document.getElementById("comment-edit-text-"+n);if(document.selection)textarea.focus(),selected=document.selection.createRange(),t=="url"?selected.text="["+t+"]"+"http://"+selected.text+"[/"+t+"]":selected.text="["+t+"]"+selected.text+"[/"+t+"]";else if(textarea.selectionStart||textarea.selectionStart=="0"){var i=textarea.selectionStart,s=textarea.selectionEnd;t=="url"?textarea.value=textarea.value.substring(0,i)+"["+t+"]"+"http://"+textarea.value.substring(i,s)+"[/"+t+"]"+textarea.value.substring(s,textarea.value.length):textarea.value=textarea.value.substring(0,i)+"["+t+"]"+textarea.value.substring(i,s)+"[/"+t+"]"+textarea.value.substring(s,textarea.value.length)}return!0}function cmtBbOpen(e){$j("#comment-edit-bb-"+e).show()}function cmtBbClose(e){$j("#comment-edit-bb-"+e).hide()}function confirmDelete(){return confirm(window.delItem)}function commentOpen(e,t){e.value==window.commentEmptyText&&(e.value="",$j("#comment-edit-text-"+t).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).removeClass("comment-edit-text-empty"),$j("#mod-cmnt-wrap-"+t).show(),openMenu("comment-edit-submit-wrapper-"+t))}function commentClose(e,t){e.value==""&&(e.value=window.commentEmptyText,$j("#comment-edit-text-"+t).removeClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).addClass("comment-edit-text-empty"),$j("#mod-cmnt-wrap-"+t).hide(),closeMenu("comment-edit-submit-wrapper-"+t))}function commentInsert(e,t){var n=$j("#comment-edit-text-"+t).val();n==window.commentEmptyText&&(n="",$j("#comment-edit-text-"+t).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).removeClass("comment-edit-text-empty"),openMenu("comment-edit-submit-wrapper-"+t));var r=$j(e).html();r=r.replace("<","<"),r=r.replace(">",">"),r=r.replace("&","&"),r=r.replace(""",'"'),$j("#comment-edit-text-"+t).val(n+r)}function qCommentInsert(e,t){var n=$j("#comment-edit-text-"+t).val();n==window.commentEmptyText&&(n="",$j("#comment-edit-text-"+t).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).removeClass("comment-edit-text-empty"),openMenu("comment-edit-submit-wrapper-"+t));var r=$j(e).val();r=r.replace("<","<"),r=r.replace(">",">"),r=r.replace("&","&"),r=r.replace(""",'"'),$j("#comment-edit-text-"+t).val(n+r),$j(e).val("")}function showHideComments(e){$j("#collapsed-comments-"+e).is(":visible")?($j("#collapsed-comments-"+e).hide(),$j("#hide-comments-"+e).html(window.showMore)):($j("#collapsed-comments-"+e).show(),$j("#hide-comments-"+e).html(window.showFewer))}function enableOnUser(){if(editor)return;$j(this).val(""),initEditor()}function initEditor(e){if(editor==0){$j("#profile-jot-text-loading").show();if(plaintext=="none"){$j("#profile-jot-text-loading").hide(),$j("#profile-jot-text").css({height:200,color:"#000"}),$j("#profile-jot-text").contact_autocomplete(baseurl+"/acl"),editor=!0,$j("a#jot-perms-icon").fancybox({transitionIn:"elastic",transitionOut:"elastic"}),$j(".jothidden").show(),typeof e!="undefined"&&e();return}tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:window.editSelect,auto_focus:"profile-jot-text",plugins:"bbcode,paste,autoresize, inlinepopups",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",gecko_spellcheck:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",convert_urls:!1,content_css:window.baseURL+"/view/custom_tinymce.css",theme_advanced_path:!1,file_browser_callback:"fcFileBrowser",setup:function(t){cPopup=null,t.onKeyDown.add(function(e,t){cPopup!==null&&cPopup.onkey(t)}),t.onKeyUp.add(function(e,t){var n=tinyMCE.activeEditor.getContent();match=n.match(/@([^ \n]+)$/),match!==null?(cPopup===null&&(cPopup=new ACPopup(this,baseurl+"/acl")),cPopup.ready&&match[1]!==cPopup.searchText&&cPopup.search(match[1]),cPopup.ready||(cPopup=null)):cPopup!==null&&(cPopup.close(),cPopup=null),textlen=n.length,textlen!=0&&$j("#jot-perms-icon").is(".unlock")?$j("#profile-jot-desc").html(ispublic):$j("#profile-jot-desc").html(" "),textlen<=140&&($j("#character-counter").removeClass("red"),$j("#character-counter").removeClass("orange"),$j("#character-counter").addClass("grey")),textlen>140&&textlen<=420&&($j("#character-counter").removeClass("grey"),$j("#character-counter").removeClass("red"),$j("#character-counter").addClass("orange")),textlen>420&&($j("#character-counter").removeClass("grey"),$j("#character-counter").removeClass("orange"),$j("#character-counter").addClass("red")),$j("#character-counter").text(textlen)}),t.onInit.add(function(t){t.pasteAsPlainText=!0,$j("#profile-jot-text-loading").hide(),$j(".jothidden").show(),typeof e!="undefined"&&e()})}}),editor=!0,$j("a#jot-perms-icon").fancybox({transitionIn:"none",transitionOut:"none"})}else typeof e!="undefined"&&e()}function msgInitEditor(){plaintext!="none"?tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:/(profile-jot-text|prvmail-text)/,plugins:"bbcode,paste",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",gecko_spellcheck:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",convert_urls:!1,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,setup:function(e){e.onInit.add(function(e){e.pasteAsPlainText=!0;var t=e.editorId,n=$j("#"+t);typeof n.attr("tabindex")!="undefined"&&($j("#"+t+"_ifr").attr("tabindex",n.attr("tabindex")),n.attr("tabindex",null))})}}):$j("#prvmail-text").contact_autocomplete(baseurl+"/acl")}function profInitEditor(){tinyMCE.init({theme:"advanced",mode:window.editSelect,plugins:"bbcode,paste",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",gecko_spellcheck:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,setup:function(e){e.onInit.add(function(e){e.pasteAsPlainText=!0})}})}function eventInitEditor(){tinyMCE.init({theme:"advanced",mode:"textareas",plugins:"bbcode,paste",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",gecko_spellcheck:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,setup:function(e){e.onInit.add(function(e){e.pasteAsPlainText=!0})}})}function contactInitEditor(){tinyMCE.init({theme:"advanced",mode:window.editSelect,elements:"contact-edit-info",plugins:"bbcode",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_styles:"blockquote,code",gecko_spellcheck:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",content_css:baseurl+"/view/custom_tinymce.css"})}function wallInitEditor(){var e=window.editSelect;e!="none"?tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:/(profile-jot-text|prvmail-text)/,plugins:"bbcode,paste",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",gecko_spellcheck:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",convert_urls:!1,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,setup:function(e){e.onInit.add(function(e){e.pasteAsPlainText=!0;var t=e.editorId,n=$j("#"+t);typeof n.attr("tabindex")!="undefined"&&($j("#"+t+"_ifr").attr("tabindex",n.attr("tabindex")),n.attr("tabindex",null))})}}):$j("#prvmail-text").contact_autocomplete(baseurl+"/acl")}function deleteCheckedItems(){var e="";$j(".item-select").each(function(){$j(this).is(":checked")&&(e.length!=0?e=e+","+$j(this).val():e=$j(this).val())}),$j.post("item",{dropitems:e},function(e){window.location.reload()})}function jotVideoURL(){reply=prompt(window.vidURL),reply&&reply.length&&addeditortext("[video]"+reply+"[/video]")}function jotAudioURL(){reply=prompt(window.audURL),reply&&reply.length&&addeditortext("[audio]"+reply+"[/audio]")}function jotGetLocation(){reply=prompt(window.whereAreU,$j("#jot-location").val()),reply&&reply.length&&$j("#jot-location").val(reply)}function jotShare(e){$j("#jot-popup").length!=0&&$j("#jot-popup").show(),$j("#like-rotator-"+e).show(),$j.get("share/"+e,function(t){editor||$j("#profile-jot-text").val(""),initEditor(function(){addeditortext(t),$j("#like-rotator-"+e).hide(),$j(window).scrollTop(0)})})}function linkdropper(e){var t=e.dataTransfer.types.contains("text/uri-list");t&&e.preventDefault()}function itemTag(e){reply=prompt(window.term),reply&&reply.length&&(reply=reply.replace("#",""),reply.length&&(commentBusy=!0,$j("body").css("cursor","wait"),$j.get("tagger/"+e+"?term="+reply,NavUpdate),liking=1))}function itemFiler(e){var t=$j("input").css("border-color");$j.get("filer/",function(n){$j.fancybox(n),$j("#id_term").keypress(function(){$j(this).css("border-color",t)}),$j("#select_term").change(function(){$j("#id_term").css("border-color",t)}),$j("#filer_save").click(function(t){return t.preventDefault(),reply=$j("#id_term").val(),reply&&reply.length?(commentBusy=!0,$j("body").css("cursor","wait"),$j.get("filer/"+e+"?term="+reply,NavUpdate),liking=1,$j.fancybox.close()):$j("#id_term").css("border-color","#FF0000"),!1})})}function jotClearLocation(){$j("#jot-coord").val(""),$j("#profile-nolocation-wrapper").hide()}function addeditortext(e){if(plaintext=="none"){var t=$j("#profile-jot-text").val();$j("#profile-jot-text").val(t+e)}else tinyMCE.execCommand("mceInsertRawHTML",!1,e)}$j(document).ready(function(){window.navMenuTimeout={"#network-menu-list-timeout":null,"#contacts-menu-list-timeout":null,"#system-menu-list-timeout":null,"#network-menu-list-opening":!1,"#contacts-menu-list-opening":!1,"#system-menu-list-opening":!1,"#network-menu-list-closing":!1,"#contacts-menu-list-closing":!1,"#system-menu-list-closing":!1},typeof acl=="undefined"&&(acl=new ACL(baseurl+"/acl",[window.allowCID,window.allowGID,window.denyCID,window.denyGID])),$j("#profile-jot-text").focus(enableOnUser),$j("#profile-jot-text").click(enableOnUser),$j(".nav-menu-link").hover(function(){showNavMenu($j(this).attr("rel"))},function(){hideNavMenu($j(this).attr("rel"))}),$j(".group-edit-icon").hover(function(){$j(this).addClass("icon"),$j(this).removeClass("iconspacer")},function(){$j(this).removeClass("icon"),$j(this).addClass("iconspacer")}),$j(".sidebar-group-element").hover(function(){id=$j(this).attr("id"),$j("#edit-"+id).addClass("icon"),$j("#edit-"+id).removeClass("iconspacer")},function(){id=$j(this).attr("id"),$j("#edit-"+id).removeClass("icon"),$j("#edit-"+id).addClass("iconspacer")}),$j(".savedsearchdrop").hover(function(){$j(this).addClass("drop"),$j(this).addClass("icon"),$j(this).removeClass("iconspacer")},function(){$j(this).removeClass("drop"),$j(this).removeClass("icon"),$j(this).addClass("iconspacer")}),$j(".savedsearchterm").hover(function(){id=$j(this).attr("id"),$j("#drop-"+id).addClass("icon"),$j("#drop-"+id).addClass("drophide"),$j("#drop-"+id).removeClass("iconspacer")},function(){id=$j(this).attr("id"),$j("#drop-"+id).removeClass("icon"),$j("#drop-"+id).removeClass("drophide"),$j("#drop-"+id).addClass("iconspacer")}),window.autoCompleteType=="display-head"&&$j(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl");if(window.aclType=="event_head"){$j("#events-calendar").fullCalendar({events:baseurl+"/events/json/",header:{left:"prev,next today",center:"title",right:"month,agendaWeek,agendaDay"},timeFormat:"H(:mm)",eventClick:function(e,t,n){showEvent(e.id)},eventRender:function(e,t,n){if(e.item["author-name"]==null)return;switch(n.name){case"month":t.find(".fc-event-title").html("{1} : {2}".format(e.item["author-avatar"],e.item["author-name"],e.title));break;case"agendaWeek":t.find(".fc-event-title").html("{1}

        {2}

        {3}

        ".format(e.item["author-avatar"],e.item["author-name"],e.item.desc,e.item.location));break;case"agendaDay":t.find(".fc-event-title").html("{1}

        {2}

        {3}

        ".format(e.item["author-avatar"],e.item["author-name"],e.item.desc,e.item.location))}}});var e=location.href.replace(baseurl,"").split("/");e.length>=4&&$j("#events-calendar").fullCalendar("gotoDate",e[2],e[3]-1);var t=location.hash.split("-");t.length==2&&t[0]=="#link"&&showEvent(t[1])}$j("#event-share-checkbox").change(function(){$j("#event-share-checkbox").is(":checked")?$j("#acl-wrapper").show():$j("#acl-wrapper").hide()}).trigger("change"),(window.aclType=="settings-head"||window.aclType=="photos_head"||window.aclType=="event_head")&&$j("#contact_allow, #contact_deny, #group_allow, #group_deny").change(function(){var e;$j("#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected").each(function(){e=$j(this).text(),$j("#jot-perms-icon").removeClass("unlock").addClass("lock"),$j("#jot-public").hide()}),e==null&&($j("#jot-perms-icon").removeClass("lock").addClass("unlock"),$j("#jot-public").show())}).trigger("change");switch(window.autocompleteType){case"msg-header":var n=$j("#recip").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350,onSelect:function(e,t){$j("#recip-complete").val(t)}});break;case"contacts-head":var n=$j("#contacts-search").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350});n.setOptions({params:{type:"a"}});break;default:}if(typeof window.AjaxUpload!="undefined")switch(window.ajaxType){case"jot-header":var r=new window.AjaxUpload("wall-image-upload",{action:"wall_upload/"+window.nickname,name:"userfile",onSubmit:function(e,t){$j("#profile-rotator").show()},onComplete:function(e,t){addeditortext(t),$j("#profile-rotator").hide()}}),i=new window.AjaxUpload("wall-file-upload",{action:"wall_attach/"+window.nickname,name:"userfile",onSubmit:function(e,t){$j("#profile-rotator").show()},onComplete:function(e,t){addeditortext(t),$j("#profile-rotator").hide()}});break;case"msg-header":var r=new window.AjaxUpload("prvmail-upload",{action:"wall_upload/"+window.nickname,name:"userfile",onSubmit:function(e,t){$j("#profile-rotator").show()},onComplete:function(e,t){tinyMCE.execCommand("mceInsertRawHTML",!1,t),$j("#profile-rotator").hide()}});break;default:}}),$j(function(){$j("nav").bind("nav-update",function(e,t){var n=$j("#pending-update"),r=$j(t).find("register").text();r=="0"?(r="",n.hide()):n.show(),n.html(r)})}),$j(function(){$j("#cnftheme").fancybox({width:800,autoDimensions:!1,onStart:function(){var e=$j("#id_theme :selected").val(),t=$j("#id_theme_mobile :selected").val();$j("#cnftheme").attr("href",baseurl+"/admin/themes/"+e)},onComplete:function(){$j("div#fancybox-content form").submit(function(e){var t=$j(this).attr("action"),n={};return $j(this).find("input").each(function(){n[$j(this).attr("name")]=$j(this).val()}),$j(this).find("select").each(function(){n[$j(this).attr("name")]=$j(this).children(":selected").val()}),console.log(":)",t,n),$j.post(t,n,function(e){timer&&clearTimeout(timer),NavUpdate(),$j.fancybox.close()}),!1})}})}),typeof window.photoEdit!="undefined"&&$j(document).keydown(function(e){window.prevLink!=""&&e.ctrlKey&&e.keyCode==37&&(e.preventDefault(),window.location.href=window.prevLink),window.nextLink!=""&&e.ctrlKey&&e.keyCode==39&&(e.preventDefault(),window.location.href=window.nextLink)});switch(window.ajaxType){case"jot-header":function jotGetLink(){reply=prompt(window.linkURL),reply&&reply.length&&(reply=bin2hex(reply),$j("#profile-rotator").show(),$j.get("parse_url?binurl="+reply,function(e){addeditortext(e),$j("#profile-rotator").hide()}))}function linkdrop(e){var t=e.dataTransfer.getData("text/uri-list");e.target.textContent=t,e.preventDefault(),t&&t.length&&(t=bin2hex(t),$j("#profile-rotator").show(),$j.get("parse_url?binurl="+t,function(e){editor||$j("#profile-jot-text").val(""),initEditor(function(){addeditortext(e),$j("#profile-rotator").hide()})}))}break;case"msg-header":case"wallmsg-header":function jotGetLink(){reply=prompt(window.linkURL),reply&&reply.length&&($j("#profile-rotator").show(),$j.get("parse_url?url="+reply,function(e){tinyMCE.execCommand("mceInsertRawHTML",!1,e),$j("#profile-rotator").hide()}))}function linkdrop(e){var t=e.dataTransfer.getData("text/uri-list");e.target.textContent=t,e.preventDefault(),t&&t.length&&($j("#profile-rotator").show(),$j.get("parse_url?url="+t,function(e){tinyMCE.execCommand("mceInsertRawHTML",!1,e),$j("#profile-rotator").hide()}))}break;default:}var editor=!1,textlen=0,plaintext=window.editSelect,ispublic=window.isPublic;typeof window.geoTag=="function"&&window.geoTag(); \ No newline at end of file diff --git a/view/theme/frost/login-style.css b/view/theme/frost/login-style.css index 5b82c11d3b..1c8c1cd45b 100644 --- a/view/theme/frost/login-style.css +++ b/view/theme/frost/login-style.css @@ -1,6 +1,7 @@ body { font-family: helvetica,arial,freesans,clean,sans-serif; font-size: 14px; + /*background-image: none;*/ background-color: #ffffff; color: #505050;/* ZP Change*/ margin: 0px; @@ -11,6 +12,26 @@ a:hover {text-decoration: underline; } img { border :0px; } +nav { + display: none; +} + +/* popup notifications */ +div.jGrowl div.notice { + background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; + color: #ffffff; + padding-left: 58px; +} +div.jGrowl div.info { + background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center; + color: #ffffff; + padding-left: 58px; +} +#jGrowl.top-right { + top: 15px; + right: 15px; +} + .login-button { margin-top: 110px; } @@ -19,7 +40,7 @@ img.login-button-image { max-width: 350px; } -.section-wrapper { +div.section-wrapper { position: relative; width: 800px; margin-left: auto; @@ -28,7 +49,8 @@ img.login-button-image { } .login-form { - margin-top: 200px; + padding-top: 200px; + margin-bottom: 50px; } .register-form { @@ -39,7 +61,13 @@ img.login-button-image { margin-top: 170px; } +.field { + margin-bottom: 2px; + padding-bottom: 0px; +} + .field label { + width: auto; position: absolute; margin-left: 0px; font-weight: 700; @@ -50,7 +78,8 @@ img.login-button-image { width: 200px; } -.openid input { +/*.openid input {*/ +#id_openid_url, .openid input { background: url(login-bg.gif) no-repeat; background-position: 0 50%; width: 182px; diff --git a/view/theme/frost/login_head.tpl b/view/theme/frost/login_head.tpl new file mode 100644 index 0000000000..cd140d6857 --- /dev/null +++ b/view/theme/frost/login_head.tpl @@ -0,0 +1,2 @@ + + diff --git a/view/theme/frost/nav.tpl b/view/theme/frost/nav.tpl index 6ae19650e0..89e1168ab7 100644 --- a/view/theme/frost/nav.tpl +++ b/view/theme/frost/nav.tpl @@ -19,16 +19,16 @@ $nav.register.1 {{ endif }} + {{ if $nav.settings }} +
      • $nav.settings.1
        • + {{ endif }} + {{ if $nav.manage }}
      • $nav.manage.1
        • {{ endif }} - {{ if $nav.settings }} -
      • $nav.settings.1
        • - {{ endif }} - {{ if $nav.profiles }}
      • $nav.profiles.1
        • {{ endif }} diff --git a/view/theme/frost/posted_date_widget.tpl b/view/theme/frost/posted_date_widget.tpl new file mode 100644 index 0000000000..ce70b74255 --- /dev/null +++ b/view/theme/frost/posted_date_widget.tpl @@ -0,0 +1,9 @@ +
        +

        $title

        + + +
        diff --git a/view/theme/frost/style.css b/view/theme/frost/style.css index 3bc9ad1cd0..fa06ef7eda 100644 --- a/view/theme/frost/style.css +++ b/view/theme/frost/style.css @@ -511,8 +511,10 @@ div.wall-item-content-wrapper.shiny { margin-top: 10px; } - -#login_standard { +.login-form { + margin-top: -150px; +} +/*#login_standard { width: 210px; float: left; } @@ -541,9 +543,9 @@ div.wall-item-content-wrapper.shiny { } #login-submit-button { -/* margin-top: 10px; */ + margin-top: 10px; margin-left: 200px; -} +}*/ input#dfrn-url { @@ -1294,7 +1296,7 @@ input#dfrn-url { .wall-item-content { margin-left: 10px; padding-right: 1em; - max-height: 500px; +/* max-height: 500px;*/ overflow: auto; } @@ -1302,6 +1304,14 @@ input#dfrn-url { max-width: 100%; } +.divgrow-showmore { + display: block; + clear: both; + text-align: center; + outline: 0; + border-top: 1px dotted #888; +} + .wall-item-title { @@ -1363,6 +1373,12 @@ input#dfrn-url { margin-left: 50px; } +.comment-wwedit-wrapper.comment { + width: 300px; + margin-left: 150px; + border-radius: 10px; +} + .comment-edit-photo { margin-top: 10px; margin-left: 10px; @@ -1373,6 +1389,9 @@ input#dfrn-url { .comment-edit-photo img { width: 25px; } +.comment .comment-edit-photo { + width: 50px; +} .comment-edit-text-empty, .comment-edit-text-full { float: left; margin-top: 10px; @@ -1398,6 +1417,16 @@ input#dfrn-url { overflow: auto; } +.comment .comment-edit-text-empty { + height: 1.5em; + width: 150px; +} + +.comment .comment-edit-text-full { + margin-left: 10px; + width: 275px; +} + .comment-edit-text-end { clear: both; } @@ -1405,6 +1434,9 @@ input#dfrn-url { .comment-edit-submit { margin: 10px 0px 10px 110px; } +.comment .comment-edit-submit { + margin-left: 30px; +} #profile-jot-plugin-wrapper, #profile-jot-submit-wrapper { @@ -1894,7 +1926,7 @@ input#dfrn-url { #acl-wrapper { - width: 690px; + width: 580px; float:left; } #acl-search { @@ -1935,7 +1967,7 @@ input#dfrn-url { } .acl-list-item { display: block; - width: 150px; + width: 170px; height: 30px; border: 1px solid #cccccc; margin: 5px; @@ -1949,10 +1981,10 @@ input#dfrn-url { } .acl-list-item p { height: 12px; font-size: 10px; margin: 0px; padding: 2px 0px 1px; overflow: hidden;} .acl-list-item a { - font-size: 8px; + font-size: 10px; /* 8px; */ display: block; - width: 40px; - height: 10px; + width: 50px; + height: 12px; float: left; color: #999999; background-color: #cccccc; @@ -3514,13 +3546,19 @@ aside input[type='text'] { } .icon.dim { opacity: 0.3;filter:alpha(opacity=30); } -[class^="comment-edit-bb"] { +/*[class^="comment-edit-bb"] {*/ +.comment-edit-bb { list-style: none; display: none; margin: 0px 0 -5px 60px; width: 75%; } -[class^="comment-edit-bb"] > li { +.comment .comment-edit-bb { + width: 300px; + margin: 0px; +} +/*[class^="comment-edit-bb"] > li {*/ +.comment-edit-bb > li { display: inline-block; margin: 10px 10px 0 0; visibility: none; diff --git a/view/theme/frost/theme.php b/view/theme/frost/theme.php index 24dee31d0d..795f69b714 100644 --- a/view/theme/frost/theme.php +++ b/view/theme/frost/theme.php @@ -4,9 +4,9 @@ * Name: Frost * Description: Like frosted glass * Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0). - * Version: Version 0.2.2 - * Author: Zach P - * Maintainer: Zach P + * Version: Version 0.2.8 + * Author: Zach P + * Maintainer: Zach P */ $a->theme_info = array(); @@ -21,4 +21,8 @@ function frost_init(&$a) { if( $a->module === 'login' ) $a->page['end'] .= ''; + $a->videowidth = 400; + $a->videoheight = 330; + $a->theme_thread_allow = false; + } diff --git a/view/theme/frost/wall_item.tpl b/view/theme/frost/wall_item.tpl index 6903f6e303..fb9290f12c 100644 --- a/view/theme/frost/wall_item.tpl +++ b/view/theme/frost/wall_item.tpl @@ -1,6 +1,6 @@ - -
        + +
        $item.name -
        $item.ago
        +
        $item.ago
        @@ -75,5 +75,5 @@ $item.comment - + diff --git a/view/theme/frost/wall_thread.tpl b/view/theme/frost/wall_thread.tpl new file mode 100644 index 0000000000..69f6c4c142 --- /dev/null +++ b/view/theme/frost/wall_thread.tpl @@ -0,0 +1,104 @@ +{{if $item.comment_firstcollapsed}} +
        + $item.num_comments $item.hide_text +
        + {{endif}} diff --git a/view/theme/frost/wallwall_item.tpl b/view/theme/frost/wallwall_item.tpl index 8260517c8b..4ef81686e7 100644 --- a/view/theme/frost/wallwall_item.tpl +++ b/view/theme/frost/wallwall_item.tpl @@ -1,6 +1,6 @@ - -
        + +
        $item.name $item.to $item.owner_name $item.vwall
        -
        $item.ago
        +
        $item.ago
        $item.title
        @@ -67,7 +67,7 @@ {{ endif }} - {{ if $item.drop.dropping }}{{ endif }} + {{ if $item.drop.dropping }}{{ endif }} {{ if $item.drop.dropping }}{{ endif }} @@ -81,6 +81,6 @@ $item.comment - + diff --git a/view/theme/frost/wallwall_thread.tpl b/view/theme/frost/wallwall_thread.tpl new file mode 100644 index 0000000000..0039e8d91c --- /dev/null +++ b/view/theme/frost/wallwall_thread.tpl @@ -0,0 +1,108 @@ +{{if $item.comment_firstcollapsed}} +
        + $item.num_comments $item.hide_text +
        + {{endif}} + diff --git a/view/theme/quattro/comment_item.tpl b/view/theme/quattro/comment_item.tpl index ea24d95cc3..7d1d7550b2 100644 --- a/view/theme/quattro/comment_item.tpl +++ b/view/theme/quattro/comment_item.tpl @@ -10,8 +10,8 @@
        $mytitle
        -
        -
          +
            • @@ -37,8 +37,11 @@ style="cursor: pointer;" title="$edvideo" onclick="insertFormatting('$comment','video', $id);">
          -
          - + {{ if $qcomment }} {{ endif }} -
          -
        diff --git a/view/theme/quattro/dark/colors.less b/view/theme/quattro/dark/colors.less index 42fdd34bb7..5c9de37531 100644 --- a/view/theme/quattro/dark/colors.less +++ b/view/theme/quattro/dark/colors.less @@ -80,6 +80,9 @@ @ItemColor: @Grey5; @ItemColorDimmed: @Grey3; +@BlockquoteBackgroundColor: #FFFFFF; +@BlockquoteBorderColor: #e6e6e6; + @CommentBoxEmptyColor: @Grey3; @CommentBoxEmptyBorderColor: @Grey3; @CommentBoxFullColor: @Grey5; diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css index 087d9c746f..0bb2cd10eb 100644 --- a/view/theme/quattro/dark/style.css +++ b/view/theme/quattro/dark/style.css @@ -387,6 +387,12 @@ a:hover { color: #005c94; text-decoration: underline; } +blockquote { + background: #ffffff; + padding: 1em; + margin-left: 1em; + border-left: 1em solid #e6e6e6; +} code { font-family: Courier, monospace; white-space: pre; @@ -398,6 +404,9 @@ code { padding: 10px; margin-top: 20px; } +textarea { + font-size: 20px; +} #panel { position: absolute; width: 10em; @@ -1063,15 +1072,19 @@ section { padding: 0.3em; } .wall-item-comment-wrapper .comment-edit-text-full { - font-size: 14px; + font-size: 20px; height: 4em; color: #2d2d2d; border: 1px solid #2d2d2d; } +.threaded .wall-item-comment-wrapper { + margin-left: 0px; +} .comment-edit-preview { width: 710px; border: 1px solid #2d2d2d; margin-top: 10px; + background-color: #fce94f; } .comment-edit-preview .contact-photo { width: 32px; @@ -1088,12 +1101,17 @@ section { padding-left: 12px; } .comment-edit-preview .wall-item-container { - width: 700px; + width: 90%; } .comment-edit-preview .tread-wrapper { - width: 700px; + width: 90%; padding: 0; margin: 10px 0; + background-color: #fce94f; + border-bottom: 0px; +} +.comment-edit-preview .wall-item-conv { + display: none; } .shiny { border-right: 10px solid #fce94f; @@ -1139,6 +1157,68 @@ section { width: 25px; height: 25px; } +/* threaded comments */ +.children { + margin-top: 1em; +} +.children .hide-comments-outer { + margin-left: 60px; +} +.children .wwto { + display: none; +} +.children .comment-edit-preview { + width: 660px; +} +.children .comment-edit-preview .wall-item-container { + width: 610px; +} +.children .children { + margin-left: 40px; +} +.children .children .wall-item-container { + width: 710px; +} +.children .children .comment-edit-preview { + width: 620px; +} +.children .children .comment-edit-preview .wall-item-container { + width: 620px; +} +.children .children .children .wall-item-container { + width: 670px; +} +.children .children .children .comment-edit-preview { + width: 580px; +} +.children .children .children .comment-edit-preview .wall-item-container { + width: 580px; +} +.children .children .children .children .wall-item-container { + width: 630px; +} +.children .children .children .children .comment-edit-preview { + width: 540px; +} +.children .children .children .children .comment-edit-preview .wall-item-container { + width: 540px; +} +.children .children .children .children .children .wall-item-container { + width: 590px; +} +.children .children .children .children .children .comment-edit-preview { + width: 500px; +} +.children .children .children .children .children .comment-edit-preview .wall-item-container { + width: 500px; +} +.children .children .children .children .children .children { + margin-left: 0px; +} +.children .children .children .children .children .children .hide-comments-outer { + margin-left: 0px; +} +/*.threaded .hide-comments-outer { margin-left: 20px; }*/ span[id^="showmore-teaser"] { background: url("showmore-bg.jpg") no-repeat center bottom; } @@ -1235,6 +1315,9 @@ span[id^="showmore-wrap"] { border: 1px solid #999999; padding: 0.3em; } +#jot .profile-jot-text:focus { + font-size: 20px; +} #jot #jot-tools { margin: 0px; padding: 0px; @@ -1975,25 +2058,23 @@ footer { opacity: 0.3; filter: alpha(opacity=30); } -[class^="comment-edit-bb"] { +.comment-edit-bb { list-style: none; display: none; - margin: 0px 0 0px 60px; + margin: 0px; + padding: 0px; width: 75%; } -[class^="comment-edit-bb"] > li { +.comment-edit-bb > li { display: inline-block; margin: 10px 10px 0 0; visibility: none; } -[class^="comment-edit-bb-end"] { - clear: both; -} .editicon { display: inline-block; width: 16px; height: 16px; - background-image: url(bbedit.png); + background-image: url(icons/bbedit.png); text-decoration: none; } .editicon :hover { @@ -2047,28 +2128,3 @@ footer { .videobb:hover { background-position: -112px -16px; } -.attachtype { - display: block; - width: 20px; - height: 23px; - float: left; - background-image: url('../../../images/content-types.png'); -} -.body-attach { - margin-top: 10px; -} -.type-video { - background-position: 0px 0px; -} -.type-image { - background-position: -20px 0px; -} -.type-audio { - background-position: -40px 0px; -} -.type-text { - background-position: -60px 0px; -} -.type-unkn { - background-position: -80px 0px; -} diff --git a/view/theme/quattro/experimental b/view/theme/quattro/experimental deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/view/theme/quattro/green/colors.less b/view/theme/quattro/green/colors.less index 1f1df4c55d..f14c636331 100644 --- a/view/theme/quattro/green/colors.less +++ b/view/theme/quattro/green/colors.less @@ -78,6 +78,9 @@ @ThreadBottomBorderColor: @Grey2; @ShinyBorderColor: @Green4; +@BlockquoteBackgroundColor: #FFFFFF; +@BlockquoteBorderColor: #e6e6e6; + @CommentBoxEmptyColor: @Grey3; @CommentBoxEmptyBorderColor: @Grey3; @CommentBoxFullColor: @Grey5; diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css index 9c28473c61..4897471eac 100644 --- a/view/theme/quattro/green/style.css +++ b/view/theme/quattro/green/style.css @@ -387,6 +387,12 @@ a:hover { color: #009100; text-decoration: underline; } +blockquote { + background: #ffffff; + padding: 1em; + margin-left: 1em; + border-left: 1em solid #e6e6e6; +} code { font-family: Courier, monospace; white-space: pre; @@ -398,6 +404,9 @@ code { padding: 10px; margin-top: 20px; } +textarea { + font-size: 20px; +} #panel { position: absolute; width: 10em; @@ -1063,15 +1072,19 @@ section { padding: 0.3em; } .wall-item-comment-wrapper .comment-edit-text-full { - font-size: 14px; + font-size: 20px; height: 4em; color: #2d2d2d; border: 1px solid #2d2d2d; } +.threaded .wall-item-comment-wrapper { + margin-left: 0px; +} .comment-edit-preview { width: 710px; border: 1px solid #2d2d2d; margin-top: 10px; + background-color: #ddffdd; } .comment-edit-preview .contact-photo { width: 32px; @@ -1088,12 +1101,17 @@ section { padding-left: 12px; } .comment-edit-preview .wall-item-container { - width: 700px; + width: 90%; } .comment-edit-preview .tread-wrapper { - width: 700px; + width: 90%; padding: 0; margin: 10px 0; + background-color: #ddffdd; + border-bottom: 0px; +} +.comment-edit-preview .wall-item-conv { + display: none; } .shiny { border-right: 10px solid #ddffdd; @@ -1139,6 +1157,68 @@ section { width: 25px; height: 25px; } +/* threaded comments */ +.children { + margin-top: 1em; +} +.children .hide-comments-outer { + margin-left: 60px; +} +.children .wwto { + display: none; +} +.children .comment-edit-preview { + width: 660px; +} +.children .comment-edit-preview .wall-item-container { + width: 610px; +} +.children .children { + margin-left: 40px; +} +.children .children .wall-item-container { + width: 710px; +} +.children .children .comment-edit-preview { + width: 620px; +} +.children .children .comment-edit-preview .wall-item-container { + width: 620px; +} +.children .children .children .wall-item-container { + width: 670px; +} +.children .children .children .comment-edit-preview { + width: 580px; +} +.children .children .children .comment-edit-preview .wall-item-container { + width: 580px; +} +.children .children .children .children .wall-item-container { + width: 630px; +} +.children .children .children .children .comment-edit-preview { + width: 540px; +} +.children .children .children .children .comment-edit-preview .wall-item-container { + width: 540px; +} +.children .children .children .children .children .wall-item-container { + width: 590px; +} +.children .children .children .children .children .comment-edit-preview { + width: 500px; +} +.children .children .children .children .children .comment-edit-preview .wall-item-container { + width: 500px; +} +.children .children .children .children .children .children { + margin-left: 0px; +} +.children .children .children .children .children .children .hide-comments-outer { + margin-left: 0px; +} +/*.threaded .hide-comments-outer { margin-left: 20px; }*/ span[id^="showmore-teaser"] { background: url("showmore-bg.jpg") no-repeat center bottom; } @@ -1235,6 +1315,9 @@ span[id^="showmore-wrap"] { border: 1px solid #999999; padding: 0.3em; } +#jot .profile-jot-text:focus { + font-size: 20px; +} #jot #jot-tools { margin: 0px; padding: 0px; @@ -1975,25 +2058,23 @@ footer { opacity: 0.3; filter: alpha(opacity=30); } -[class^="comment-edit-bb"] { +.comment-edit-bb { list-style: none; display: none; - margin: 0px 0 0px 60px; + margin: 0px; + padding: 0px; width: 75%; } -[class^="comment-edit-bb"] > li { +.comment-edit-bb > li { display: inline-block; margin: 10px 10px 0 0; visibility: none; } -[class^="comment-edit-bb-end"] { - clear: both; -} .editicon { display: inline-block; width: 16px; height: 16px; - background-image: url(bbedit.png); + background-image: url(icons/bbedit.png); text-decoration: none; } .editicon :hover { @@ -2047,28 +2128,3 @@ footer { .videobb:hover { background-position: -112px -16px; } -.attachtype { - display: block; - width: 20px; - height: 23px; - float: left; - background-image: url('../../../images/content-types.png'); -} -.body-attach { - margin-top: 10px; -} -.type-video { - background-position: 0px 0px; -} -.type-image { - background-position: -20px 0px; -} -.type-audio { - background-position: -40px 0px; -} -.type-text { - background-position: -60px 0px; -} -.type-unkn { - background-position: -80px 0px; -} diff --git a/view/theme/quattro/icons/bbedit.png b/view/theme/quattro/icons/bbedit.png new file mode 100644 index 0000000000..b89f2f7a83 Binary files /dev/null and b/view/theme/quattro/icons/bbedit.png differ diff --git a/view/theme/quattro/mail_conv.tpl b/view/theme/quattro/mail_conv.tpl index 989f178781..0d673236b7 100644 --- a/view/theme/quattro/mail_conv.tpl +++ b/view/theme/quattro/mail_conv.tpl @@ -22,7 +22,10 @@
        - $mail.from_name $mail.date + $mail.from_name + $mail.ago
        diff --git a/view/theme/quattro/mail_list.tpl b/view/theme/quattro/mail_list.tpl index 6bc6c84f60..4f0fe673a0 100644 --- a/view/theme/quattro/mail_list.tpl +++ b/view/theme/quattro/mail_list.tpl @@ -1,7 +1,7 @@
        $subject $from_name - $date + $ago $count diff --git a/view/theme/quattro/profile_vcard.tpl b/view/theme/quattro/profile_vcard.tpl index 7cd02f1648..cbb7dcc745 100644 --- a/view/theme/quattro/profile_vcard.tpl +++ b/view/theme/quattro/profile_vcard.tpl @@ -45,7 +45,9 @@ {{ if $marital }}
        ♥$marital
        $profile.marital
        {{ endif }} - {{ if $homepage }}
        $homepage
        $profile.homepage
        {{ endif }} + {{ if $homepage }}
        $homepage
        $profile.homepage
        {{ endif }} {{ inc diaspora_vcard.tpl }}{{ endinc }} diff --git a/view/theme/quattro/prv_message.tpl b/view/theme/quattro/prv_message.tpl new file mode 100644 index 0000000000..5aa03688aa --- /dev/null +++ b/view/theme/quattro/prv_message.tpl @@ -0,0 +1,33 @@ + +

        $header

        + +
        +
        + +$parent + +
        $to
        +$select + +
        $subject
        + + +
        $yourmessage
        + + + +
        + +
        +
        +
        + +
        + +
        +
        +
        +
        +
        diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index b5f0af6696..84aa13ac03 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -51,6 +51,14 @@ a:hover {color: @LinkHover; text-decoration: underline; } .fakelink { color: @Link; text-decoration: none; cursor:pointer; } .fakelink:hover { color: @LinkHover; text-decoration: underline; } +blockquote { + background:@BlockquoteBackgroundColor; + padding: 1em; + margin-left: 1em; + border-left: 1em solid @BlockquoteBorderColor; + +} + code { font-family: Courier, monospace; white-space: pre; @@ -63,6 +71,9 @@ code { margin-top: 20px; } +textarea { font-size: 20px; } + + #panel { position: absolute; width: 10em; @@ -531,17 +542,21 @@ section { padding:0.3em; } .comment-edit-text-full { - font-size: 14px; + font-size: 20px; height: 4em; color: @CommentBoxFullColor; border: 1px solid @CommentBoxFullBorderColor; } + } +.threaded .wall-item-comment-wrapper { margin-left: 0px; } + .comment-edit-preview { width: 710px; border: 1px solid @Grey5; margin-top: 10px; + background-color: @JotPreviewBackgroundColor; .contact-photo { width: 32px; height: 32px; margin-left: 16px; /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/ @@ -552,8 +567,13 @@ section { } .wall-item-links { padding-left: 12px; } - .wall-item-container { width: 700px; } - .tread-wrapper { width: 700px; padding: 0; margin: 10px 0;} + .wall-item-container { width: 90%; } + .tread-wrapper { + width: 90%; padding: 0; margin: 10px 0; + background-color: @JotPreviewBackgroundColor; + border-bottom: 0px; + } + .wall-item-conv { display: none; } } .shiny { border-right:10px solid @ShinyBorderColor; } @@ -594,6 +614,55 @@ section { } .wwto .contact-photo { width: 25px; height: 25px; } + +/* threaded comments */ +.children { + margin-top: 1em; + .hide-comments-outer { margin-left:60px; } + + .wwto { display: none; } + + .comment-edit-preview { width: 660px; + .wall-item-container { width: 610px; } + } + + & .children { + + margin-left: 40px; + .wall-item-container { width: 710px; } + .comment-edit-preview { width: 620px; + .wall-item-container { width: 620px; } + } + + & .children { + .wall-item-container { width: 670px; } + .comment-edit-preview { width: 580px; + .wall-item-container { width: 580px; } + } + + & .children { + .wall-item-container { width: 630px; } + .comment-edit-preview { width: 540px; + .wall-item-container { width: 540px; } + } + + & .children { + .wall-item-container { width: 590px; } + .comment-edit-preview { width: 500px; + .wall-item-container { width: 500px; } + } + + .children { + margin-left: 0px; + .hide-comments-outer { margin-left: 0px; } + } + } + } + } + } +} +/*.threaded .hide-comments-outer { margin-left: 20px; }*/ + span[id^="showmore-teaser"]{ background: url("showmore-bg.jpg") no-repeat center bottom; } @@ -675,6 +744,8 @@ span[id^="showmore-wrap"] { color: @CommentBoxEmptyColor; border: 1px solid @CommentBoxEmptyBorderColor; padding:0.3em; + + &:focus { font-size: 20px; } } #jot-tools { @@ -1341,25 +1412,24 @@ footer { height: 100px; display: table-row; } /* edit buttons for comments */ .icon.dim { opacity: 0.3;filter:alpha(opacity=30); } -[class^="comment-edit-bb"] { +.comment-edit-bb { list-style: none; display: none; - margin: 0px 0 0px 60px; + margin: 0px; + padding: 0px; width: 75%; } -[class^="comment-edit-bb"] > li { +.comment-edit-bb > li { display: inline-block; margin: 10px 10px 0 0; visibility: none; } -[class^="comment-edit-bb-end"] { - clear: both; -} + .editicon { display: inline-block; width: 16px; height: 16px; - background-image: url(bbedit.png); + background-image: url(icons/bbedit.png); text-decoration: none; :hover {background-color: #ccc;} } @@ -1380,18 +1450,4 @@ footer { height: 100px; display: table-row; } .videobb { background-position: -112px 0px; } .videobb:hover { background-position: -112px -16px; } -.attachtype { - display: block; width: 20px; height: 23px; - float: left; - background-image: url('../../../images/content-types.png'); -} -.body-attach { - margin-top: 10px; -} - -.type-video { background-position: 0px 0px; } -.type-image { background-position: -20px 0px; } -.type-audio { background-position: -40px 0px; } -.type-text { background-position: -60px 0px; } -.type-unkn { background-position: -80px 0px; } diff --git a/view/theme/quattro/search_item.tpl b/view/theme/quattro/search_item.tpl index 80d6678fb3..e207484dc8 100644 --- a/view/theme/quattro/search_item.tpl +++ b/view/theme/quattro/search_item.tpl @@ -42,7 +42,7 @@
        - $item.name $item.ago + $item.name $item.ago
        diff --git a/view/theme/quattro/theme.php b/view/theme/quattro/theme.php index 5cb373eefe..1c986e4c8f 100644 --- a/view/theme/quattro/theme.php +++ b/view/theme/quattro/theme.php @@ -42,11 +42,21 @@ function insertFormatting(comment,BBcode,id) { return true; } -function cmtBbOpen(id) { - $(".comment-edit-bb-" + id).show(); +function showThread(id) { + $("#collapsed-comments-" + id).show() + $("#collapsed-comments-" + id + " .collapsed-comments").show() } -function cmtBbClose(comment, id) { - $(".comment-edit-bb-" + id).hide(); +function hideThread(id) { + $("#collapsed-comments-" + id).hide() + $("#collapsed-comments-" + id + " .collapsed-comments").hide() +} + + +function cmtBbOpen(id) { + $("#comment-edit-bb-" + id).show(); +} +function cmtBbClose(id) { + $("#comment-edit-bb-" + id).hide(); } $(document).ready(function() { diff --git a/view/theme/quattro/threaded_conversation.tpl b/view/theme/quattro/threaded_conversation.tpl new file mode 100644 index 0000000000..94be864174 --- /dev/null +++ b/view/theme/quattro/threaded_conversation.tpl @@ -0,0 +1,37 @@ +{{ for $threads as $item }} + +
        + + + {{ if $item.type == tag }} + {{ inc wall_item_tag.tpl }}{{ endinc }} + {{ else }} + {{ inc $item.template }}{{ endinc }} + {{ endif }} + +
        +{{ endfor }} + +
        + +{{ if $dropping }} + + $dropping + +{{ endif }} + + + +{{ if $mode == display }} + +{{ endif }} + diff --git a/view/theme/quattro/wall_item.tpl b/view/theme/quattro/wall_item.tpl index 411879def3..731c2d2bfc 100644 --- a/view/theme/quattro/wall_item.tpl +++ b/view/theme/quattro/wall_item.tpl @@ -42,7 +42,11 @@
        - $item.name $item.ago + $item.name + $item.ago
        diff --git a/view/theme/quattro/wall_item_tag.tpl b/view/theme/quattro/wall_item_tag.tpl index 926fc929d2..e1ef932135 100644 --- a/view/theme/quattro/wall_item_tag.tpl +++ b/view/theme/quattro/wall_item_tag.tpl @@ -1,3 +1,5 @@ +{{ if $item.thread_level!=1 }}
        {{ endif }} +
        @@ -13,11 +15,13 @@
        $item.location
        - $item.body + $item.ago $item.body
        -
        - $item.comment -
        +{{ if $item.thread_level!=1 }}
        {{ endif }} + +{{ if $item.flatten }} +
        $item.comment
        +{{ endif }} diff --git a/view/theme/quattro/wall_thread.tpl b/view/theme/quattro/wall_thread.tpl new file mode 100644 index 0000000000..757f175468 --- /dev/null +++ b/view/theme/quattro/wall_thread.tpl @@ -0,0 +1,144 @@ +{{if $mode == display}} +{{ else }} +{{if $item.comment_firstcollapsed}} +
        + $item.num_comments + $item.hide_text + {{ if $item.thread_level==3 }} - + expand / + collapse thread{{ endif }} +
        + {{endif}} +{{ endif }} + +{{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}} +
        $item.comment
        +{{ endif }}{{ endif }}{{ endif }} + + +{{ if $item.flatten }} +
        $item.comment
        +{{ endif }} diff --git a/view/theme/quattro/wallwall_item.tpl b/view/theme/quattro/wallwall_item.tpl index 2e3cf821fb..e26b186360 100644 --- a/view/theme/quattro/wallwall_item.tpl +++ b/view/theme/quattro/wallwall_item.tpl @@ -46,7 +46,7 @@
        - $item.name $item.ago + $item.name $item.ago
        $item.to $item.owner_name $item.vwall
        diff --git a/view/theme/quattro/wallwall_thread.tpl b/view/theme/quattro/wallwall_thread.tpl new file mode 100644 index 0000000000..4589390089 --- /dev/null +++ b/view/theme/quattro/wallwall_thread.tpl @@ -0,0 +1,155 @@ +{{if $mode == display}} +{{ else }} +{{if $item.comment_firstcollapsed}} +
        + $item.num_comments + $item.hide_text + {{ if $item.thread_level==3 }} - + expand / + collapse thread{{ endif }} +
        + {{endif}} +{{ endif }} + +{{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}} +
        $item.comment
        +{{ endif }}{{ endif }}{{ endif }} + + +{{ if $item.flatten }} +
        $item.comment
        +{{ endif }} diff --git a/view/theme/testbubble/search_item.tpl b/view/theme/testbubble/search_item.tpl index a0a4ef393b..4b70ab98d1 100644 --- a/view/theme/testbubble/search_item.tpl +++ b/view/theme/testbubble/search_item.tpl @@ -1,5 +1,5 @@ -
        -
        +
        +
        -
        +
        diff --git a/view/theme/testbubble/wall_item.tpl b/view/theme/testbubble/wall_item.tpl index 44491d967c..63ed406c86 100644 --- a/view/theme/testbubble/wall_item.tpl +++ b/view/theme/testbubble/wall_item.tpl @@ -1,5 +1,5 @@ -
        -
        +
        +
        -
        +
        diff --git a/view/theme/testbubble/wallwall_item.tpl b/view/theme/testbubble/wallwall_item.tpl index eb7c3ddbaf..e4849cf0b1 100644 --- a/view/theme/testbubble/wallwall_item.tpl +++ b/view/theme/testbubble/wallwall_item.tpl @@ -1,5 +1,5 @@ -
        -
        +
        +
        -
        +
        diff --git a/view/theme/vier/threaded_conversation.tpl b/view/theme/vier/threaded_conversation.tpl new file mode 100644 index 0000000000..13c38acb2b --- /dev/null +++ b/view/theme/vier/threaded_conversation.tpl @@ -0,0 +1,37 @@ +{{ for $threads as $item }} + +
        + + + {{ if $item.type == tag }} + {{ inc wall_item_tag.tpl }}{{ endinc }} + {{ else }} + {{ inc $item.template }}{{ endinc }} + {{ endif }} + +
        +{{ endfor }} + +
        + +{{ if $dropping }} +         + $dropping + +{{ endif }} + + + +{{ if $mode == display }} + +{{ endif }} + diff --git a/view/theme/vier/wall_thread.tpl b/view/theme/vier/wall_thread.tpl new file mode 100644 index 0000000000..01738b666b --- /dev/null +++ b/view/theme/vier/wall_thread.tpl @@ -0,0 +1,144 @@ +{{if $mode == display}} +{{ else }} +{{if $item.comment_firstcollapsed}} +
        + $item.num_comments + $item.hide_text + {{ if $item.thread_level==3 }} - + expand / + collapse thread{{ endif }} +
        + {{endif}} +{{ endif }} + +{{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}} +
        $item.comment
        +{{ endif }}{{ endif }}{{ endif }} + + +{{ if $item.flatten }} +
        $item.comment
        +{{ endif }} diff --git a/view/theme/vier/wallwall_thread.tpl b/view/theme/vier/wallwall_thread.tpl new file mode 100644 index 0000000000..93a8838ebd --- /dev/null +++ b/view/theme/vier/wallwall_thread.tpl @@ -0,0 +1,151 @@ +{{if $mode == display}} +{{ else }} +{{if $item.comment_firstcollapsed}} +
        + $item.num_comments + $item.hide_text + {{ if $item.thread_level==3 }} - + expand / + collapse thread{{ endif }} +
        + {{endif}} +{{ endif }} + +{{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}} +
        $item.comment
        +{{ endif }}{{ endif }}{{ endif }} + + +{{ if $item.flatten }} +
        $item.comment
        +{{ endif }} diff --git a/view/threaded_conversation.tpl b/view/threaded_conversation.tpl new file mode 100644 index 0000000000..f60839e495 --- /dev/null +++ b/view/threaded_conversation.tpl @@ -0,0 +1,13 @@ +{{ for $threads as $item }} +{{ inc $item.template }}{{ endinc }} +{{ endfor }} + +
        + +{{ if $dropping }} + +
        +{{ endif }} diff --git a/view/wall_item.tpl b/view/wall_item.tpl index 496dab4a3f..e4eabb9e5c 100644 --- a/view/wall_item.tpl +++ b/view/wall_item.tpl @@ -1,6 +1,6 @@ -
        -
        +
        +
        $item.name -
        $item.ago
        +
        $item.ago
        @@ -75,5 +75,5 @@ $item.comment
        -
        +
        diff --git a/view/wall_thread.tpl b/view/wall_thread.tpl new file mode 100644 index 0000000000..f64f2e44a0 --- /dev/null +++ b/view/wall_thread.tpl @@ -0,0 +1,102 @@ +{{if $item.comment_firstcollapsed}} +
        + $item.num_comments $item.hide_text +
        + {{endif}} diff --git a/view/wallwall_item.tpl b/view/wallwall_item.tpl index b7cca3fab9..e8044532a3 100644 --- a/view/wallwall_item.tpl +++ b/view/wallwall_item.tpl @@ -1,6 +1,6 @@ -
        -
        +
        +
        $item.name $item.to $item.owner_name $item.vwall
        -
        $item.ago
        +
        $item.ago
        $item.title
        @@ -81,6 +81,6 @@ $item.comment
        -
        +
        diff --git a/view/wallwall_thread.tpl b/view/wallwall_thread.tpl new file mode 100644 index 0000000000..68bb3bc9d5 --- /dev/null +++ b/view/wallwall_thread.tpl @@ -0,0 +1,107 @@ +{{if $item.comment_firstcollapsed}} +
        + $item.num_comments $item.hide_text +
        + {{endif}}