diff options
| -rw-r--r-- | boot.php | 8 | ||||
| -rw-r--r-- | include/contact_widgets.php | 3 | ||||
| -rw-r--r-- | include/conversation.php | 2 | ||||
| -rw-r--r-- | include/expire.php | 6 | ||||
| -rw-r--r-- | include/text.php | 6 | ||||
| -rw-r--r-- | mod/follow.php | 45 | ||||
| -rw-r--r-- | mod/message.php | 21 | ||||
| -rw-r--r-- | mod/network.php | 16 | ||||
| -rw-r--r-- | util/messages.po | 242 | ||||
| -rw-r--r-- | view/de/messages.po | 670 | ||||
| -rw-r--r-- | view/de/strings.php | 37 | ||||
| -rw-r--r-- | view/remote_friends_common.tpl | 2 | ||||
| -rw-r--r-- | view/theme/diabook/diabook-dark/custom_tinymce.css | 41 | ||||
| -rw-r--r-- | view/theme/diabook/diabook-dark/style-network.css | 7 | ||||
| -rw-r--r-- | view/theme/diabook/diabook-dark/style-profile.css | 8 | ||||
| -rw-r--r-- | view/theme/diabook/diabook-dark/style.css | 22 |
16 files changed, 650 insertions, 486 deletions
@@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1335' ); +define ( 'FRIENDICA_VERSION', '2.3.1336' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1143 ); @@ -30,6 +30,12 @@ define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); define ( 'JPEG_QUALITY', 100 ); /** + * Not yet used + */ + +define ( 'DEFAULT_DB_ENGINE', 'MyISAM' ); + +/** * SSL redirection policies */ diff --git a/include/contact_widgets.php b/include/contact_widgets.php index 42d3afdee..ce1cdbad5 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -183,7 +183,8 @@ function common_friends_visitor_widget($profile_uid) { '$desc' => sprintf( tt("%d contact in common", "%d contacts in common", $t), $t), '$base' => $a->get_baseurl(), '$uid' => $profile_uid, - '$cid' => $cid, + '$cid' => (($cid) ? $cid : '0'), + '$linkmore' => (($t > 5) ? 'true' : ''), '$more' => t('show more'), '$items' => $r )); diff --git a/include/conversation.php b/include/conversation.php index 521b4623b..e48a8e6d6 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -959,7 +959,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { $tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins)); $o .= replace_macros($tpl,array( - '$return_path' => $a->cmd, + '$return_path' => $a->query_string, '$action' => $a->get_baseurl(true) . '/item', '$share' => (x($x,'button') ? $x['button'] : t('Share')), '$upload' => t('Upload photo'), diff --git a/include/expire.php b/include/expire.php index 5fa0ec758..755cd2494 100644 --- a/include/expire.php +++ b/include/expire.php @@ -32,7 +32,11 @@ function expire_run($argv, $argc){ // physically remove anything that has been deleted for more than two months $r = q("delete from item where deleted = 1 and changed < UTC_TIMESTAMP() - INTERVAL 60 DAY"); - q("optimize table item"); + + // make this optional as it could have a performance impact on large sites + + if(intval(get_config('system','optimize_items'))) + q("optimize table item"); logger('expire: start'); diff --git a/include/text.php b/include/text.php index 1b5b0afd4..e3c683338 100644 --- a/include/text.php +++ b/include/text.php @@ -1524,3 +1524,9 @@ function fix_mce_lf($s) { $s = str_replace("\n\n","\n",$s); return $s; } + + +function protect_sprintf($s) { + return(str_replace('%','%%',$s)); +} + diff --git a/mod/follow.php b/mod/follow.php index ae8cb200c..4a7f99bf0 100644 --- a/mod/follow.php +++ b/mod/follow.php @@ -10,7 +10,10 @@ function follow_init(&$a) { // NOTREACHED } + $uid = local_user(); $url = $orig_url = notags(trim($_REQUEST['url'])); + $return_url = $_SESSION['return_url']; + // remove ajax junk, e.g. Twitter @@ -18,19 +21,25 @@ function follow_init(&$a) { if(! allowed_url($url)) { notice( t('Disallowed profile URL.') . EOL); - goaway($_SESSION['return_url']); + goaway($return_url); // NOTREACHED } if(! $url) { notice( t('Connect URL missing.') . EOL); - goaway($_SESSION['return_url']); + goaway($return_url); // NOTREACHED } + $arr = array('url' => $url, 'contact' => array()); + + call_hooks('follow', $arr); - $ret = probe_url($url); + if(x($arr['contact'],'name')) + $ret = $arr['contact']; + else + $ret = probe_url($url); if($ret['network'] === NETWORK_DFRN) { if(strlen($a->path)) @@ -46,11 +55,11 @@ function follow_init(&$a) { if(get_config('system','dfrn_only')) { notice( t('This site is not configured to allow communications with other networks.') . EOL); notice( t('No compatible communication protocols or feeds were discovered.') . EOL); - goaway($_SESSION['return_url']); + goaway($return_url); } } - // This just confuses things, remove it + // This extra param just confuses things, remove it if($ret['network'] === NETWORK_DIASPORA) $ret['url'] = str_replace('?absolute=true','',$ret['url']); @@ -65,9 +74,11 @@ function follow_init(&$a) { notice( t('An author or name was not found.') . EOL); if(! x($ret,'url')) notice( t('No browser URL could be matched to this address.') . EOL); - if(strpos($url,'@') !== false) - notice('Unable to match @-style Identity Address with a known protocol or email contact'); - goaway($_SESSION['return_url']); + if(strpos($url,'@') !== false) { + notice( t('Unable to match @-style Identity Address with a known protocol or email contact.') . EOL); + notice( t('Use mailto: in front of address to force email check.') . EOL); + } + goaway($return_url); } if($ret['network'] === NETWORK_OSTATUS && get_config('system','ostatus_disabled')) { @@ -94,7 +105,7 @@ function follow_init(&$a) { // indirect links or webfinger links $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `poll` = '%s' LIMIT 1", - intval(local_user()), + intval($uid), dbesc($ret['poll']) ); @@ -104,7 +115,7 @@ function follow_init(&$a) { q("UPDATE `contact` SET `rel` = %d , `readonly` = 0 WHERE `id` = %d AND `uid` = %d LIMIT 1", intval(CONTACT_IS_FRIEND), intval($r[0]['id']), - intval(local_user()) + intval($uid) ); } } @@ -118,7 +129,7 @@ function follow_init(&$a) { $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `alias`, `batch`, `notify`, `poll`, `poco`, `name`, `nick`, `photo`, `network`, `pubkey`, `rel`, `priority`, `writable`, `hidden`, `blocked`, `readonly`, `pending` ) VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d, 0, 0, 0 ) ", - intval(local_user()), + intval($uid), dbesc(datetime_convert()), dbesc($ret['url']), dbesc(normalise_link($ret['url'])), @@ -142,12 +153,12 @@ function follow_init(&$a) { $r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d LIMIT 1", dbesc($ret['url']), - intval(local_user()) + intval($uid) ); if(! count($r)) { notice( t('Unable to retrieve contact information.') . EOL); - goaway($_SESSION['return_url']); + goaway($return_url); // NOTREACHED } @@ -156,7 +167,7 @@ function follow_init(&$a) { require_once("Photo.php"); - $photos = import_profile_photo($ret['photo'],local_user(),$contact_id); + $photos = import_profile_photo($ret['photo'],$uid,$contact_id); $r = q("UPDATE `contact` SET `photo` = '%s', `thumb` = '%s', @@ -200,7 +211,7 @@ function follow_init(&$a) { $r = q("SELECT `contact`.*, `user`.* FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid` WHERE `user`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1", - intval(local_user()) + intval($uid) ); if(count($r)) { @@ -215,9 +226,9 @@ function follow_init(&$a) { } } - if(strstr($_SESSION['return_url'],'contacts')) + if(strstr($return_url,'contacts')) goaway($a->get_baseurl() . '/contacts/' . $contact_id); - goaway($_SESSION['return_url']); + goaway($return_url); // NOTREACHED } diff --git a/mod/message.php b/mod/message.php index 867f199c4..b8695fdd9 100644 --- a/mod/message.php +++ b/mod/message.php @@ -173,15 +173,22 @@ function message_content(&$a) { $preselect = (isset($a->argv[2])?array($a->argv[2]):false); - $select = contact_select('messageto','message-to-select', $preselect, 4, true, false, false, 10); + if(defined('EMAIL_AUTOCOMP')) { -// here's sort of where we want to do contact autocomplete -// comment out the contact selector line just above and use the following one instead, -// then figure out how to make it do the right thing -// pictures would be nice, but that didn't seem to work when I tried it -// (the json backend is found in mod/acl.php) + // here's where we want to do contact autocomplete + // just figure out how to make it do the right thing + // pictures would be nice, but that didn't work when I tried. + // It sort of barely works, but needs help + // (the json backend is found in mod/acl.php) -// $select = '<input type="text" id="recip" name="messageto" value="' . $preselect .'" />'; + $select = '<input type="text" id="recip" name="messageto" value="' . $preselect .'" />'; + } + else { + + // the ugly select box + + $select = contact_select('messageto','message-to-select', $preselect, 4, true, false, false, 10); + } $tpl = get_markup_template('prv_message.tpl'); $o .= replace_macros($tpl,array( diff --git a/mod/network.php b/mod/network.php index 5655f1bfa..e59839ccc 100644 --- a/mod/network.php +++ b/mod/network.php @@ -340,7 +340,7 @@ function network_content(&$a, $update = 0) { info( t('Group is empty')); } - $sql_extra = " AND `item`.`parent` IN ( SELECT DISTINCT(`parent`) FROM `item` WHERE 1 $sql_options AND ( `contact-id` IN ( $contact_str ) OR `allow_gid` REGEXP '<" . intval($group) . ">' ) and deleted = 0 ) "; + $sql_extra = " AND `item`.`parent` IN ( SELECT DISTINCT(`parent`) FROM `item` WHERE 1 $sql_options AND ( `contact-id` IN ( $contact_str ) OR `allow_gid` like '" . protect_sprintf('%<' . intval($group) . '>%') . "' ) and deleted = 0 ) "; $o = '<h2>' . t('Group: ') . $r[0]['name'] . '</h2>' . $o; } elseif($cid) { @@ -398,9 +398,9 @@ function network_content(&$a, $update = 0) { if(x($_GET,'search')) { $search = escape_tags($_GET['search']); - $sql_extra .= sprintf(" AND ( `item`.`body` REGEXP '%s' OR `item`.`tag` REGEXP '%s' ) ", - dbesc(preg_quote($search)), - dbesc('\\]' . preg_quote($search) . '\\[') + $sql_extra .= sprintf(" AND ( `item`.`body` like '%s' OR `item`.`tag` like '%s' ) ", + dbesc(protect_sprintf('%' . $search . '%')), + dbesc(protect_sprintf('%]' . $search . '[%')) ); } if(strlen($file)) { @@ -412,10 +412,10 @@ function network_content(&$a, $update = 0) { $myurl = substr($myurl,strpos($myurl,'://')+3); $myurl = str_replace(array('www.','.'),array('','\\.'),$myurl); $diasp_url = str_replace('/profile/','/u/',$myurl); - $sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where ( `author-link` regexp '%s' or `tag` regexp '%s' or tag regexp '%s' )) ", - dbesc($myurl . '$'), - dbesc($myurl . '\\]'), - dbesc($diasp_url . '\\]') + $sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where ( `author-link` like '%s' or `tag` like '%s' or tag like '%s' )) ", + dbesc(protect_sprintf('%s' . $myurl)), + dbesc(protect_sprintf('%' . $myurl . '\\]%')), + dbesc(protect_sprintf('%' . $diasp_url . '\\]%')) ); } diff --git a/util/messages.po b/util/messages.po index 9e9ecc4d1..e6376310b 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2.3.1335\n" +"Project-Id-Version: 2.3.1336\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-07 10:00-0700\n" +"POT-Creation-Date: 2012-05-08 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -158,9 +158,8 @@ msgstr "" #: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102 #: ../../addon/posterous/posterous.php:90 #: ../../view/theme/cleanzero/config.php:80 -#: ../../view/theme/diabook/theme.php:607 -#: ../../view/theme/diabook/theme.php:642 -#: ../../view/theme/diabook/config.php:107 +#: ../../view/theme/diabook/theme.php:683 +#: ../../view/theme/diabook/config.php:190 #: ../../view/theme/quattro/config.php:52 ../../view/theme/dispy/config.php:70 #: ../../include/conversation.php:555 msgid "Submit" @@ -220,7 +219,7 @@ msgstr "" msgid "link to source" msgstr "" -#: ../../mod/events.php:324 ../../view/theme/diabook/theme.php:66 +#: ../../mod/events.php:324 ../../view/theme/diabook/theme.php:127 #: ../../include/nav.php:52 ../../boot.php:1493 msgid "Events" msgstr "" @@ -353,7 +352,7 @@ msgstr "" #: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php:879 #: ../../mod/photos.php:950 ../../mod/photos.php:965 ../../mod/photos.php:1382 #: ../../mod/photos.php:1394 ../../addon/communityhome/communityhome.php:110 -#: ../../view/theme/diabook/theme.php:522 +#: ../../view/theme/diabook/theme.php:526 msgid "Contact Photos" msgstr "" @@ -376,7 +375,7 @@ msgstr "" #: ../../mod/profile_photo.php:74 ../../mod/profile_photo.php:174 #: ../../mod/profile_photo.php:252 ../../mod/profile_photo.php:261 #: ../../addon/communityhome/communityhome.php:111 -#: ../../view/theme/diabook/theme.php:523 +#: ../../view/theme/diabook/theme.php:527 msgid "Profile Photos" msgstr "" @@ -398,7 +397,7 @@ msgstr "" #: ../../mod/photos.php:528 ../../mod/like.php:127 ../../mod/tagger.php:70 #: ../../addon/communityhome/communityhome.php:163 -#: ../../view/theme/diabook/theme.php:494 ../../include/text.php:1305 +#: ../../view/theme/diabook/theme.php:498 ../../include/text.php:1305 #: ../../include/diaspora.php:1654 ../../include/conversation.php:53 #: ../../include/conversation.php:126 msgid "photo" @@ -533,8 +532,8 @@ msgid "Share" msgstr "" #: ../../mod/photos.php:1214 ../../mod/editpost.php:104 -#: ../../mod/wallmessage.php:145 ../../mod/message.php:199 -#: ../../mod/message.php:391 ../../include/conversation.php:361 +#: ../../mod/wallmessage.php:145 ../../mod/message.php:206 +#: ../../mod/message.php:398 ../../include/conversation.php:361 #: ../../include/conversation.php:706 ../../include/conversation.php:983 msgid "Please wait" msgstr "" @@ -573,7 +572,7 @@ msgstr "" msgid "Not available." msgstr "" -#: ../../mod/community.php:30 ../../view/theme/diabook/theme.php:68 +#: ../../mod/community.php:30 ../../view/theme/diabook/theme.php:129 #: ../../include/nav.php:101 msgid "Community" msgstr "" @@ -632,7 +631,7 @@ msgid "Edit" msgstr "" #: ../../mod/editpost.php:96 ../../mod/wallmessage.php:143 -#: ../../mod/message.php:197 ../../mod/message.php:389 +#: ../../mod/message.php:204 ../../mod/message.php:396 #: ../../include/conversation.php:965 msgid "Upload photo" msgstr "" @@ -642,7 +641,7 @@ msgid "Attach file" msgstr "" #: ../../mod/editpost.php:98 ../../mod/wallmessage.php:144 -#: ../../mod/message.php:198 ../../mod/message.php:390 +#: ../../mod/message.php:205 ../../mod/message.php:397 #: ../../include/conversation.php:969 msgid "Insert web link" msgstr "" @@ -768,7 +767,7 @@ msgstr "" msgid "Invalid profile URL." msgstr "" -#: ../../mod/dfrn_request.php:476 ../../mod/follow.php:20 +#: ../../mod/dfrn_request.php:476 ../../mod/follow.php:23 msgid "Disallowed profile URL." msgstr "" @@ -1215,7 +1214,7 @@ msgstr "" msgid "Personal" msgstr "" -#: ../../mod/notifications.php:90 ../../view/theme/diabook/theme.php:62 +#: ../../mod/notifications.php:90 ../../view/theme/diabook/theme.php:123 #: ../../include/nav.php:77 ../../include/nav.php:115 msgid "Home" msgstr "" @@ -1656,7 +1655,7 @@ msgstr "" msgid "Edit contact" msgstr "" -#: ../../mod/contacts.php:544 ../../view/theme/diabook/theme.php:64 +#: ../../mod/contacts.php:544 ../../view/theme/diabook/theme.php:125 #: ../../include/nav.php:139 msgid "Contacts" msgstr "" @@ -1776,7 +1775,8 @@ msgid "Remove account" msgstr "" #: ../../mod/settings.php:88 ../../mod/admin.php:735 ../../mod/admin.php:940 -#: ../../addon/mathjax/mathjax.php:36 ../../include/nav.php:137 +#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:700 +#: ../../include/nav.php:137 msgid "Settings" msgstr "" @@ -2397,7 +2397,7 @@ msgstr "" msgid "Please enter a link URL:" msgstr "" -#: ../../mod/wallmessage.php:131 ../../mod/message.php:188 +#: ../../mod/wallmessage.php:131 ../../mod/message.php:195 msgid "Send Private Message" msgstr "" @@ -2408,18 +2408,18 @@ msgid "" "your site allow private mail from unknown senders." msgstr "" -#: ../../mod/wallmessage.php:133 ../../mod/message.php:189 -#: ../../mod/message.php:381 +#: ../../mod/wallmessage.php:133 ../../mod/message.php:196 +#: ../../mod/message.php:388 msgid "To:" msgstr "" -#: ../../mod/wallmessage.php:134 ../../mod/message.php:190 -#: ../../mod/message.php:382 +#: ../../mod/wallmessage.php:134 ../../mod/message.php:197 +#: ../../mod/message.php:389 msgid "Subject:" msgstr "" -#: ../../mod/wallmessage.php:140 ../../mod/message.php:194 -#: ../../mod/message.php:385 ../../mod/invite.php:113 +#: ../../mod/wallmessage.php:140 ../../mod/message.php:201 +#: ../../mod/message.php:392 ../../mod/invite.php:113 msgid "Your message:" msgstr "" @@ -2601,7 +2601,7 @@ msgstr "" msgid "Profile Visibility Editor" msgstr "" -#: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:63 +#: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:124 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:74 #: ../../include/nav.php:50 ../../boot.php:1478 msgid "Profile" @@ -2787,8 +2787,8 @@ msgstr "" #: ../../addon/facebook/facebook.php:1564 #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 -#: ../../view/theme/diabook/theme.php:489 -#: ../../view/theme/diabook/theme.php:498 ../../include/diaspora.php:1654 +#: ../../view/theme/diabook/theme.php:493 +#: ../../view/theme/diabook/theme.php:502 ../../include/diaspora.php:1654 #: ../../include/conversation.php:48 ../../include/conversation.php:57 #: ../../include/conversation.php:121 ../../include/conversation.php:130 msgid "status" @@ -2796,7 +2796,7 @@ msgstr "" #: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1568 #: ../../addon/communityhome/communityhome.php:172 -#: ../../view/theme/diabook/theme.php:503 ../../include/diaspora.php:1670 +#: ../../view/theme/diabook/theme.php:507 ../../include/diaspora.php:1670 #: ../../include/conversation.php:65 #, php-format msgid "%1$s likes %2$s's %3$s" @@ -2817,7 +2817,7 @@ msgstr "" msgid "Access denied." msgstr "" -#: ../../mod/fbrowser.php:23 ../../view/theme/diabook/theme.php:65 +#: ../../mod/fbrowser.php:23 ../../view/theme/diabook/theme.php:126 #: ../../include/nav.php:51 ../../boot.php:1484 msgid "Photos" msgstr "" @@ -2974,55 +2974,55 @@ msgstr "" msgid "Conversation removed." msgstr "" -#: ../../mod/message.php:230 +#: ../../mod/message.php:237 msgid "No messages." msgstr "" -#: ../../mod/message.php:237 +#: ../../mod/message.php:244 #, php-format msgid "Unknown sender - %s" msgstr "" -#: ../../mod/message.php:240 +#: ../../mod/message.php:247 #, php-format msgid "You and %s" msgstr "" -#: ../../mod/message.php:243 +#: ../../mod/message.php:250 #, php-format msgid "%s and You" msgstr "" -#: ../../mod/message.php:253 ../../mod/message.php:374 +#: ../../mod/message.php:260 ../../mod/message.php:381 msgid "Delete conversation" msgstr "" -#: ../../mod/message.php:256 +#: ../../mod/message.php:263 msgid "D, d M Y - g:i A" msgstr "" -#: ../../mod/message.php:258 +#: ../../mod/message.php:265 #, php-format msgid "%d message" msgid_plural "%d messages" msgstr[0] "" msgstr[1] "" -#: ../../mod/message.php:293 +#: ../../mod/message.php:300 msgid "Message not available." msgstr "" -#: ../../mod/message.php:358 +#: ../../mod/message.php:365 msgid "Delete message" msgstr "" -#: ../../mod/message.php:376 +#: ../../mod/message.php:383 msgid "" "No secure communications available. You <strong>may</strong> be able to " "respond from the sender's profile page." msgstr "" -#: ../../mod/message.php:380 +#: ../../mod/message.php:387 msgid "Send Reply" msgstr "" @@ -3577,7 +3577,7 @@ msgstr "" msgid "Log level" msgstr "" -#: ../../mod/admin.php:1121 ../../view/theme/diabook/theme.php:652 +#: ../../mod/admin.php:1121 msgid "Close" msgstr "" @@ -3672,48 +3672,58 @@ msgstr "" msgid "Login failed." msgstr "" -#: ../../mod/follow.php:27 +#: ../../mod/follow.php:30 msgid "Connect URL missing." msgstr "" -#: ../../mod/follow.php:47 +#: ../../mod/follow.php:56 msgid "" "This site is not configured to allow communications with other networks." msgstr "" -#: ../../mod/follow.php:48 ../../mod/follow.php:63 +#: ../../mod/follow.php:57 ../../mod/follow.php:72 msgid "No compatible communication protocols or feeds were discovered." msgstr "" -#: ../../mod/follow.php:61 +#: ../../mod/follow.php:70 msgid "The profile address specified does not provide adequate information." msgstr "" -#: ../../mod/follow.php:65 +#: ../../mod/follow.php:74 msgid "An author or name was not found." msgstr "" -#: ../../mod/follow.php:67 +#: ../../mod/follow.php:76 msgid "No browser URL could be matched to this address." msgstr "" -#: ../../mod/follow.php:74 +#: ../../mod/follow.php:78 +msgid "" +"Unable to match @-style Identity Address with a known protocol or email " +"contact." +msgstr "" + +#: ../../mod/follow.php:79 +msgid "Use mailto: in front of address to force email check." +msgstr "" + +#: ../../mod/follow.php:85 msgid "" "The profile address specified belongs to a network which has been disabled " "on this site." msgstr "" -#: ../../mod/follow.php:79 +#: ../../mod/follow.php:90 msgid "" "Limited profile. This person will be unable to receive direct/personal " "notifications from you." msgstr "" -#: ../../mod/follow.php:149 +#: ../../mod/follow.php:160 msgid "Unable to retrieve contact information." msgstr "" -#: ../../mod/follow.php:195 +#: ../../mod/follow.php:206 msgid "following" msgstr "" @@ -4063,7 +4073,7 @@ msgstr "" msgid "No entries." msgstr "" -#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:550 +#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:554 #: ../../include/contact_widgets.php:34 msgid "Friend Suggestions" msgstr "" @@ -4083,7 +4093,7 @@ msgstr "" msgid "%s [%s]" msgstr "" -#: ../../mod/directory.php:47 ../../view/theme/diabook/theme.php:548 +#: ../../mod/directory.php:47 ../../view/theme/diabook/theme.php:552 msgid "Global Directory" msgstr "" @@ -4668,7 +4678,7 @@ msgid "Latest likes" msgstr "" #: ../../addon/communityhome/communityhome.php:155 -#: ../../view/theme/diabook/theme.php:486 ../../include/text.php:1303 +#: ../../view/theme/diabook/theme.php:490 ../../include/text.php:1303 #: ../../include/conversation.php:45 ../../include/conversation.php:118 msgid "event" msgstr "" @@ -5564,7 +5574,7 @@ msgid "Post to Posterous by default" msgstr "" #: ../../view/theme/cleanzero/config.php:82 -#: ../../view/theme/diabook/config.php:109 +#: ../../view/theme/diabook/config.php:192 #: ../../view/theme/quattro/config.php:54 ../../view/theme/dispy/config.php:72 msgid "Theme settings" msgstr "" @@ -5574,7 +5584,7 @@ msgid "Set resize level for images in posts and comments (width and height)" msgstr "" #: ../../view/theme/cleanzero/config.php:84 -#: ../../view/theme/diabook/config.php:110 +#: ../../view/theme/diabook/config.php:193 #: ../../view/theme/dispy/config.php:73 msgid "Set font-size for posts and comments" msgstr "" @@ -5588,118 +5598,168 @@ msgstr "" msgid "Color scheme" msgstr "" -#: ../../view/theme/diabook/theme.php:62 ../../include/nav.php:49 +#: ../../view/theme/diabook/theme.php:123 ../../include/nav.php:49 #: ../../include/nav.php:115 msgid "Your posts and conversations" msgstr "" -#: ../../view/theme/diabook/theme.php:63 ../../include/nav.php:50 +#: ../../view/theme/diabook/theme.php:124 ../../include/nav.php:50 msgid "Your profile page" msgstr "" -#: ../../view/theme/diabook/theme.php:64 +#: ../../view/theme/diabook/theme.php:125 msgid "Your contacts" msgstr "" -#: ../../view/theme/diabook/theme.php:65 ../../include/nav.php:51 +#: ../../view/theme/diabook/theme.php:126 ../../include/nav.php:51 msgid "Your photos" msgstr "" -#: ../../view/theme/diabook/theme.php:66 ../../include/nav.php:52 +#: ../../view/theme/diabook/theme.php:127 ../../include/nav.php:52 msgid "Your events" msgstr "" -#: ../../view/theme/diabook/theme.php:67 ../../include/nav.php:53 +#: ../../view/theme/diabook/theme.php:128 ../../include/nav.php:53 msgid "Personal notes" msgstr "" -#: ../../view/theme/diabook/theme.php:67 ../../include/nav.php:53 +#: ../../view/theme/diabook/theme.php:128 ../../include/nav.php:53 msgid "Your personal photos" msgstr "" -#: ../../view/theme/diabook/theme.php:69 -#: ../../view/theme/diabook/theme.php:567 +#: ../../view/theme/diabook/theme.php:130 +#: ../../view/theme/diabook/theme.php:571 msgid "Community Pages" msgstr "" -#: ../../view/theme/diabook/theme.php:414 +#: ../../view/theme/diabook/theme.php:418 msgid "Community Profiles" msgstr "" -#: ../../view/theme/diabook/theme.php:435 +#: ../../view/theme/diabook/theme.php:439 msgid "Last users" msgstr "" -#: ../../view/theme/diabook/theme.php:464 +#: ../../view/theme/diabook/theme.php:468 msgid "Last likes" msgstr "" -#: ../../view/theme/diabook/theme.php:509 +#: ../../view/theme/diabook/theme.php:513 msgid "Last photos" msgstr "" -#: ../../view/theme/diabook/theme.php:546 +#: ../../view/theme/diabook/theme.php:550 msgid "Find Friends" msgstr "" -#: ../../view/theme/diabook/theme.php:547 +#: ../../view/theme/diabook/theme.php:551 msgid "Local Directory" msgstr "" -#: ../../view/theme/diabook/theme.php:549 ../../include/contact_widgets.php:35 +#: ../../view/theme/diabook/theme.php:553 ../../include/contact_widgets.php:35 msgid "Similar Interests" msgstr "" -#: ../../view/theme/diabook/theme.php:551 ../../include/contact_widgets.php:37 +#: ../../view/theme/diabook/theme.php:555 ../../include/contact_widgets.php:37 msgid "Invite Friends" msgstr "" -#: ../../view/theme/diabook/theme.php:602 +#: ../../view/theme/diabook/theme.php:606 msgid "Earth Layers" msgstr "" -#: ../../view/theme/diabook/theme.php:608 -#: ../../view/theme/diabook/config.php:115 +#: ../../view/theme/diabook/theme.php:611 +#: ../../view/theme/diabook/config.php:198 msgid "Set zoomfactor for Earth Layer" msgstr "" -#: ../../view/theme/diabook/theme.php:609 -#: ../../view/theme/diabook/config.php:116 +#: ../../view/theme/diabook/theme.php:612 +#: ../../view/theme/diabook/config.php:199 msgid "Set longitude (X) for Earth Layer" msgstr "" -#: ../../view/theme/diabook/theme.php:610 -#: ../../view/theme/diabook/config.php:117 +#: ../../view/theme/diabook/theme.php:613 +#: ../../view/theme/diabook/config.php:200 msgid "Set latitude (Y) for Earth Layer" msgstr "" -#: ../../view/theme/diabook/theme.php:625 +#: ../../view/theme/diabook/theme.php:626 msgid "Help or @NewHere ?" msgstr "" -#: ../../view/theme/diabook/theme.php:632 +#: ../../view/theme/diabook/theme.php:633 msgid "Connect Services" msgstr "" -#: ../../view/theme/diabook/theme.php:639 +#: ../../view/theme/diabook/theme.php:640 msgid "Last Tweets" msgstr "" #: ../../view/theme/diabook/theme.php:643 -#: ../../view/theme/diabook/config.php:114 +#: ../../view/theme/diabook/config.php:197 msgid "Set twitter search term" msgstr "" -#: ../../view/theme/diabook/config.php:111 +#: ../../view/theme/diabook/theme.php:673 +#: ../../view/theme/diabook/config.php:201 +msgid "Show \"Cummunity Pages\" at right-hand coloumn?" +msgstr "" + +#: ../../view/theme/diabook/theme.php:674 +#: ../../view/theme/diabook/config.php:202 +msgid "Show \"Earth Layers\" at right-hand coloumn?" +msgstr "" + +#: ../../view/theme/diabook/theme.php:675 +#: ../../view/theme/diabook/config.php:203 +msgid "Show \"Cummunity Profiles\" at right-hand coloumn?" +msgstr "" + +#: ../../view/theme/diabook/theme.php:676 +#: ../../view/theme/diabook/config.php:204 +msgid "Show \"Help or @NewHere\" at right-hand coloumn?" +msgstr "" + +#: ../../view/theme/diabook/theme.php:677 +#: ../../view/theme/diabook/config.php:205 +msgid "Show \"Connect Services\" at right-hand coloumn?" +msgstr "" + +#: ../../view/theme/diabook/theme.php:678 +#: ../../view/theme/diabook/config.php:206 +msgid "Show \"Find Friends\" at right-hand coloumn?" +msgstr "" + +#: ../../view/theme/diabook/theme.php:679 +#: ../../view/theme/diabook/config.php:207 +msgid "Show \"Last Tweets\" at right-hand coloumn?" +msgstr "" + +#: ../../view/theme/diabook/theme.php:680 +#: ../../view/theme/diabook/config.php:208 +msgid "Show \"Last Users\" at right-hand coloumn?" +msgstr "" + +#: ../../view/theme/diabook/theme.php:681 +#: ../../view/theme/diabook/config.php:209 +msgid "Show \"Last Photos\" at right-hand coloumn?" +msgstr "" + +#: ../../view/theme/diabook/theme.php:682 +#: ../../view/theme/diabook/config.php:210 +msgid "Show \"Last Likes\" at right-hand coloumn?" +msgstr "" + +#: ../../view/theme/diabook/config.php:194 #: ../../view/theme/dispy/config.php:74 msgid "Set line-height for posts and comments" msgstr "" -#: ../../view/theme/diabook/config.php:112 +#: ../../view/theme/diabook/config.php:195 msgid "Set resolution for middle column" msgstr "" -#: ../../view/theme/diabook/config.php:113 +#: ../../view/theme/diabook/config.php:196 msgid "Set color scheme" msgstr "" @@ -6108,11 +6168,11 @@ msgstr "" msgid "Finishes:" msgstr "" -#: ../../include/delivery.php:445 ../../include/notifier.php:652 +#: ../../include/delivery.php:452 ../../include/notifier.php:652 msgid "(no subject)" msgstr "" -#: ../../include/delivery.php:452 ../../include/enotify.php:23 +#: ../../include/delivery.php:459 ../../include/enotify.php:23 #: ../../include/notifier.php:659 msgid "noreply" msgstr "" @@ -6586,7 +6646,7 @@ msgstr "" msgid "%1$d %2$s ago" msgstr "" -#: ../../include/onepoll.php:402 +#: ../../include/onepoll.php:406 msgid "From: " msgstr "" diff --git a/view/de/messages.po b/view/de/messages.po index 409a967bd..d7de20cec 100644 --- a/view/de/messages.po +++ b/view/de/messages.po @@ -19,8 +19,8 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n" -"POT-Creation-Date: 2012-05-02 10:00-0700\n" -"PO-Revision-Date: 2012-05-04 05:22+0000\n" +"POT-Creation-Date: 2012-05-06 10:00-0700\n" +"PO-Revision-Date: 2012-05-08 07:06+0000\n" "Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n" "Language-Team: German (http://www.transifex.net/projects/p/friendica/language/de/)\n" "MIME-Version: 1.0\n" @@ -47,7 +47,7 @@ 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:110 ../../mod/api.php:26 +#: ../../mod/fsuggest.php:78 ../../mod/events.php:138 ../../mod/api.php:26 #: ../../mod/api.php:31 ../../mod/photos.php:130 ../../mod/photos.php:865 #: ../../mod/editpost.php:10 ../../mod/install.php:171 #: ../../mod/notifications.php:66 ../../mod/contacts.php:125 @@ -63,12 +63,11 @@ msgstr "Konnte den Kontakt nicht aktualisieren." #: ../../mod/profile_photo.php:163 ../../mod/message.php:38 #: ../../mod/message.php:90 ../../mod/allfriends.php:9 #: ../../mod/nogroup.php:25 ../../mod/wall_upload.php:53 -#: ../../mod/follow.php:8 ../../mod/common.php:9 ../../mod/display.php:138 -#: ../../mod/profiles.php:7 ../../mod/profiles.php:365 -#: ../../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:485 ../../include/items.php:3187 -#: ../../index.php:306 +#: ../../mod/follow.php:8 ../../mod/display.php:138 ../../mod/profiles.php:7 +#: ../../mod/profiles.php:365 ../../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:495 +#: ../../include/items.php:3192 ../../index.php:306 msgid "Permission denied." msgstr "Zugriff verweigert." @@ -98,7 +97,7 @@ msgid "Return to contact editor" msgstr "Zurück zum Kontakteditor" #: ../../mod/crepair.php:148 ../../mod/settings.php:541 -#: ../../mod/settings.php:567 ../../mod/admin.php:638 ../../mod/admin.php:647 +#: ../../mod/settings.php:567 ../../mod/admin.php:640 ../../mod/admin.php:649 msgid "Name" msgstr "Name" @@ -135,17 +134,17 @@ msgid "New photo from this URL" msgstr "Neues Foto von dieser URL" #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107 -#: ../../mod/events.php:400 ../../mod/photos.php:900 ../../mod/photos.php:958 +#: ../../mod/events.php:428 ../../mod/photos.php:900 ../../mod/photos.php:958 #: ../../mod/photos.php:1193 ../../mod/photos.php:1233 #: ../../mod/photos.php:1273 ../../mod/photos.php:1304 #: ../../mod/install.php:251 ../../mod/install.php:289 #: ../../mod/localtime.php:45 ../../mod/contacts.php:322 #: ../../mod/settings.php:539 ../../mod/settings.php:685 #: ../../mod/settings.php:746 ../../mod/settings.php:940 -#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:400 -#: ../../mod/admin.php:635 ../../mod/admin.php:771 ../../mod/admin.php:970 -#: ../../mod/admin.php:1057 ../../mod/profiles.php:534 -#: ../../mod/invite.php:119 ../../addon/facebook/facebook.php:575 +#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:402 +#: ../../mod/admin.php:637 ../../mod/admin.php:773 ../../mod/admin.php:972 +#: ../../mod/admin.php:1059 ../../mod/profiles.php:534 +#: ../../mod/invite.php:119 ../../addon/facebook/facebook.php:597 #: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:93 #: ../../addon/nsfw/nsfw.php:57 ../../addon/planets/planets.php:158 #: ../../addon/uhremotestorage/uhremotestorage.php:89 @@ -170,8 +169,9 @@ msgstr "Neues Foto von dieser URL" #: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:375 #: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102 #: ../../addon/posterous/posterous.php:90 -#: ../../view/theme/cleanzero/config.php:71 -#: ../../view/theme/diabook/config.php:91 +#: ../../view/theme/cleanzero/config.php:80 +#: ../../view/theme/diabook/theme.php:590 +#: ../../view/theme/diabook/config.php:95 #: ../../view/theme/quattro/config.php:52 ../../view/theme/dispy/config.php:70 #: ../../include/conversation.php:555 msgid "Submit" @@ -215,78 +215,78 @@ msgstr "Kontakte vorschlagen" msgid "Suggest a friend for %s" msgstr "Schlage %s einen Kontakt vor" -#: ../../mod/events.php:62 +#: ../../mod/events.php:65 msgid "Event description and start time are required." msgstr "Ereignis Beschreibung und Startzeit sind erforderlich." -#: ../../mod/events.php:230 +#: ../../mod/events.php:258 msgid "l, F j" msgstr "l, F j" -#: ../../mod/events.php:252 +#: ../../mod/events.php:280 msgid "Edit event" msgstr "Veranstaltung bearbeiten" -#: ../../mod/events.php:272 ../../include/text.php:1053 +#: ../../mod/events.php:300 ../../include/text.php:1054 msgid "link to source" msgstr "Link zum Originalbeitrag" -#: ../../mod/events.php:296 ../../view/theme/diabook/theme.php:274 +#: ../../mod/events.php:324 ../../view/theme/diabook/theme.php:69 #: ../../include/nav.php:52 ../../boot.php:1493 msgid "Events" msgstr "Veranstaltungen" -#: ../../mod/events.php:297 +#: ../../mod/events.php:325 msgid "Create New Event" msgstr "Neue Veranstaltung erstellen" -#: ../../mod/events.php:298 +#: ../../mod/events.php:326 msgid "Previous" msgstr "Vorherige" -#: ../../mod/events.php:299 ../../mod/install.php:210 +#: ../../mod/events.php:327 ../../mod/install.php:210 msgid "Next" msgstr "Nächste" -#: ../../mod/events.php:371 +#: ../../mod/events.php:399 msgid "hour:minute" msgstr "Stunde:Minute" -#: ../../mod/events.php:380 +#: ../../mod/events.php:408 msgid "Event details" msgstr "Veranstaltungsdetails" -#: ../../mod/events.php:381 +#: ../../mod/events.php:409 #, php-format msgid "Format is %s %s. Starting date and Description are required." msgstr "Format ist %s %s. Anfangsdatum und Beschreibung sind notwendig." -#: ../../mod/events.php:383 +#: ../../mod/events.php:411 msgid "Event Starts:" msgstr "Veranstaltungsbeginn:" -#: ../../mod/events.php:386 +#: ../../mod/events.php:414 msgid "Finish date/time is not known or not relevant" msgstr "Enddatum/-zeit ist nicht bekannt oder nicht relevant" -#: ../../mod/events.php:388 +#: ../../mod/events.php:416 msgid "Event Finishes:" msgstr "Veranstaltungsende:" -#: ../../mod/events.php:391 +#: ../../mod/events.php:419 msgid "Adjust for viewer timezone" msgstr "An Zeitzone des Betrachters anpassen" -#: ../../mod/events.php:393 +#: ../../mod/events.php:421 msgid "Description:" msgstr "Beschreibung" -#: ../../mod/events.php:395 ../../include/event.php:37 +#: ../../mod/events.php:423 ../../include/event.php:37 #: ../../include/bb2diaspora.php:260 ../../boot.php:1092 msgid "Location:" msgstr "Ort:" -#: ../../mod/events.php:397 +#: ../../mod/events.php:425 msgid "Share this event" msgstr "Veranstaltung teilen" @@ -364,7 +364,7 @@ msgstr "Fotoalben" #: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php:879 #: ../../mod/photos.php:950 ../../mod/photos.php:965 ../../mod/photos.php:1382 #: ../../mod/photos.php:1394 ../../addon/communityhome/communityhome.php:110 -#: ../../view/theme/diabook/theme.php:155 +#: ../../view/theme/diabook/theme.php:485 msgid "Contact Photos" msgstr "Kontaktbilder" @@ -387,7 +387,7 @@ msgstr "Kontaktinformationen nicht verfügbar" #: ../../mod/profile_photo.php:74 ../../mod/profile_photo.php:174 #: ../../mod/profile_photo.php:252 ../../mod/profile_photo.php:261 #: ../../addon/communityhome/communityhome.php:111 -#: ../../view/theme/diabook/theme.php:156 +#: ../../view/theme/diabook/theme.php:486 msgid "Profile Photos" msgstr "Profilbilder" @@ -409,7 +409,7 @@ msgstr "wurde getaggt in einem" #: ../../mod/photos.php:528 ../../mod/like.php:127 ../../mod/tagger.php:70 #: ../../addon/communityhome/communityhome.php:163 -#: ../../view/theme/diabook/theme.php:127 ../../include/text.php:1304 +#: ../../view/theme/diabook/theme.php:457 ../../include/text.php:1305 #: ../../include/diaspora.php:1654 ../../include/conversation.php:53 #: ../../include/conversation.php:126 msgid "photo" @@ -568,7 +568,7 @@ msgid "Preview" msgstr "Vorschau" #: ../../mod/photos.php:1331 ../../mod/settings.php:602 -#: ../../mod/settings.php:683 ../../mod/group.php:168 ../../mod/admin.php:642 +#: ../../mod/settings.php:683 ../../mod/group.php:168 ../../mod/admin.php:644 #: ../../include/conversation.php:318 ../../include/conversation.php:584 msgid "Delete" msgstr "Löschen" @@ -585,7 +585,7 @@ msgstr "Neueste Fotos" msgid "Not available." msgstr "Nicht verfügbar." -#: ../../mod/community.php:30 ../../view/theme/diabook/theme.php:276 +#: ../../mod/community.php:30 ../../view/theme/diabook/theme.php:71 #: ../../include/nav.php:101 msgid "Community" msgstr "Gemeinschaft" @@ -1228,7 +1228,7 @@ msgstr "Netzwerk" msgid "Personal" msgstr "Persönlich" -#: ../../mod/notifications.php:90 ../../view/theme/diabook/theme.php:270 +#: ../../mod/notifications.php:90 ../../view/theme/diabook/theme.php:65 #: ../../include/nav.php:77 ../../include/nav.php:115 msgid "Home" msgstr "Pinnwand" @@ -1277,7 +1277,7 @@ msgid "if applicable" msgstr "falls anwendbar" #: ../../mod/notifications.php:157 ../../mod/notifications.php:204 -#: ../../mod/admin.php:640 +#: ../../mod/admin.php:642 msgid "Approve" msgstr "Genehmigen" @@ -1466,7 +1466,7 @@ msgstr "Kontakte vorschlagen" msgid "Network type: %s" msgstr "Netzwerk Typ: %s" -#: ../../mod/contacts.php:280 +#: ../../mod/contacts.php:280 ../../include/contact_widgets.php:183 #, php-format msgid "%d contact in common" msgid_plural "%d contacts in common" @@ -1478,12 +1478,12 @@ msgid "View all contacts" msgstr "Alle Kontakte anzeigen" #: ../../mod/contacts.php:290 ../../mod/contacts.php:347 -#: ../../mod/admin.php:644 +#: ../../mod/admin.php:646 msgid "Unblock" msgstr "Entsperren" #: ../../mod/contacts.php:290 ../../mod/contacts.php:347 -#: ../../mod/admin.php:643 +#: ../../mod/admin.php:645 msgid "Block" msgstr "Sperren" @@ -1576,7 +1576,7 @@ msgstr "letzte Aktualisierung:" msgid "Update public posts" msgstr "Öffentliche Beiträge aktualisieren" -#: ../../mod/contacts.php:344 ../../mod/admin.php:1115 +#: ../../mod/contacts.php:344 ../../mod/admin.php:1117 msgid "Update now" msgstr "Jetzt aktualisieren" @@ -1669,7 +1669,7 @@ msgstr "du bist Fan von" msgid "Edit contact" msgstr "Kontakt bearbeiten" -#: ../../mod/contacts.php:544 ../../view/theme/diabook/theme.php:272 +#: ../../mod/contacts.php:544 ../../view/theme/diabook/theme.php:67 #: ../../include/nav.php:139 msgid "Contacts" msgstr "Kontakte" @@ -1703,8 +1703,8 @@ msgstr "Anfrage zum Zurücksetzen des Passworts auf %s erhalten" #: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107 #: ../../mod/register.php:388 ../../mod/register.php:442 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:742 -#: ../../addon/facebook/facebook.php:658 -#: ../../addon/facebook/facebook.php:1148 +#: ../../addon/facebook/facebook.php:680 +#: ../../addon/facebook/facebook.php:1170 #: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2716 #: ../../boot.php:686 msgid "Administrator" @@ -1788,7 +1788,7 @@ msgstr "Persönliche Daten exportieren" msgid "Remove account" msgstr "Account entfernen" -#: ../../mod/settings.php:88 ../../mod/admin.php:730 ../../mod/admin.php:935 +#: ../../mod/settings.php:88 ../../mod/admin.php:732 ../../mod/admin.php:937 #: ../../addon/mathjax/mathjax.php:36 ../../include/nav.php:137 msgid "Settings" msgstr "Einstellungen" @@ -1841,7 +1841,7 @@ msgstr " Keine gültige E-Mail." msgid " Cannot change to that email." msgstr "Ändern der E-Mail nicht möglich. " -#: ../../mod/settings.php:468 ../../addon/facebook/facebook.php:470 +#: ../../mod/settings.php:468 ../../addon/facebook/facebook.php:480 #: ../../addon/impressum/impressum.php:77 #: ../../addon/openstreetmap/openstreetmap.php:80 #: ../../addon/mathjax/mathjax.php:66 ../../addon/piwik/piwik.php:105 @@ -2015,7 +2015,7 @@ msgstr "Maximal 100 Beiträge" msgid "Don't show emoticons" msgstr "Keine Smilies anzeigen" -#: ../../mod/settings.php:821 ../../mod/admin.php:180 ../../mod/admin.php:616 +#: ../../mod/settings.php:821 ../../mod/admin.php:180 ../../mod/admin.php:618 msgid "Normal Account" msgstr "Normaler Account" @@ -2023,7 +2023,7 @@ msgstr "Normaler Account" msgid "This account is a normal personal profile" msgstr "Dieser Account ist ein normales persönliches Profil" -#: ../../mod/settings.php:825 ../../mod/admin.php:181 ../../mod/admin.php:617 +#: ../../mod/settings.php:825 ../../mod/admin.php:181 ../../mod/admin.php:619 msgid "Soapbox Account" msgstr "Sandkasten-Account" @@ -2031,7 +2031,7 @@ msgstr "Sandkasten-Account" msgid "Automatically approve all connection/friend requests as read-only fans" msgstr "Kontaktanfragen werden automatisch als Nurlese-Fans akzeptiert" -#: ../../mod/settings.php:829 ../../mod/admin.php:182 ../../mod/admin.php:618 +#: ../../mod/settings.php:829 ../../mod/admin.php:182 ../../mod/admin.php:620 msgid "Community/Celebrity Account" msgstr "Gemeinschafts/Promi-Account" @@ -2040,7 +2040,7 @@ msgid "" "Automatically approve all connection/friend requests as read-write fans" msgstr "Kontaktanfragen werden automatisch als Lese-und-Schreib-Fans akzeptiert" -#: ../../mod/settings.php:833 ../../mod/admin.php:183 ../../mod/admin.php:619 +#: ../../mod/settings.php:833 ../../mod/admin.php:183 ../../mod/admin.php:621 msgid "Automatic Friend Account" msgstr "Automatischer Freundesaccount" @@ -2371,7 +2371,7 @@ msgid "Personal Notes" msgstr "Persönliche Notizen" #: ../../mod/notes.php:63 ../../mod/filer.php:30 -#: ../../addon/facebook/facebook.php:726 +#: ../../addon/facebook/facebook.php:748 #: ../../addon/privacy_image_cache/privacy_image_cache.php:147 #: ../../include/text.php:652 msgid "Save" @@ -2615,7 +2615,7 @@ msgstr "Ungültiger Profil-Bezeichner" msgid "Profile Visibility Editor" msgstr "Editor für die Profil-Sichtbarkeit" -#: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:271 +#: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:66 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:74 #: ../../include/nav.php:50 ../../boot.php:1478 msgid "Profile" @@ -2766,7 +2766,7 @@ msgstr "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung mögli msgid "Your invitation ID: " msgstr "ID deiner Einladung: " -#: ../../mod/register.php:553 ../../mod/admin.php:401 +#: ../../mod/register.php:553 ../../mod/admin.php:403 msgid "Registration" msgstr "Registrierung" @@ -2798,19 +2798,19 @@ msgid "People Search" msgstr "Personen Suche" #: ../../mod/like.php:127 ../../mod/tagger.php:70 -#: ../../addon/facebook/facebook.php:1542 +#: ../../addon/facebook/facebook.php:1564 #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 -#: ../../view/theme/diabook/theme.php:122 -#: ../../view/theme/diabook/theme.php:131 ../../include/diaspora.php:1654 +#: ../../view/theme/diabook/theme.php:452 +#: ../../view/theme/diabook/theme.php:461 ../../include/diaspora.php:1654 #: ../../include/conversation.php:48 ../../include/conversation.php:57 #: ../../include/conversation.php:121 ../../include/conversation.php:130 msgid "status" msgstr "Status" -#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1546 +#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1568 #: ../../addon/communityhome/communityhome.php:172 -#: ../../view/theme/diabook/theme.php:136 ../../include/diaspora.php:1670 +#: ../../view/theme/diabook/theme.php:466 ../../include/diaspora.php:1670 #: ../../include/conversation.php:65 #, php-format msgid "%1$s likes %2$s's %3$s" @@ -2822,8 +2822,8 @@ 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:156 -#: ../../mod/admin.php:679 ../../mod/admin.php:878 ../../mod/display.php:37 -#: ../../mod/display.php:142 ../../include/items.php:3099 +#: ../../mod/admin.php:681 ../../mod/admin.php:880 ../../mod/display.php:37 +#: ../../mod/display.php:142 ../../include/items.php:3074 msgid "Item not found." msgstr "Beitrag nicht gefunden." @@ -2831,7 +2831,7 @@ msgstr "Beitrag nicht gefunden." msgid "Access denied." msgstr "Zugriff verweigert." -#: ../../mod/fbrowser.php:23 ../../view/theme/diabook/theme.php:273 +#: ../../mod/fbrowser.php:23 ../../view/theme/diabook/theme.php:68 #: ../../include/nav.php:51 ../../boot.php:1484 msgid "Photos" msgstr "Bilder" @@ -2867,29 +2867,29 @@ msgstr "Leerer Beitrag wurde verworfen." msgid "Wall Photos" msgstr "Pinnwand-Bilder" -#: ../../mod/item.php:762 +#: ../../mod/item.php:781 msgid "System error. Post not saved." msgstr "Systemfehler. Beitrag konnte nicht gespeichert werden." -#: ../../mod/item.php:787 +#: ../../mod/item.php:806 #, 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:789 +#: ../../mod/item.php:808 #, php-format msgid "You may visit them online at %s" msgstr "Du kannst sie online unter %s besuchen" -#: ../../mod/item.php:790 +#: ../../mod/item.php:809 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:792 +#: ../../mod/item.php:811 #, php-format msgid "%s posted an update." msgstr "%s hat ein Update veröffentlicht." @@ -3054,19 +3054,19 @@ msgstr "Keine Freunde zum Anzeigen." msgid "Theme settings updated." msgstr "Themen Einstellungen aktualisiert." -#: ../../mod/admin.php:96 ../../mod/admin.php:399 +#: ../../mod/admin.php:96 ../../mod/admin.php:401 msgid "Site" msgstr "Seite" -#: ../../mod/admin.php:97 ../../mod/admin.php:634 ../../mod/admin.php:646 +#: ../../mod/admin.php:97 ../../mod/admin.php:636 ../../mod/admin.php:648 msgid "Users" msgstr "Nutzer" -#: ../../mod/admin.php:98 ../../mod/admin.php:728 ../../mod/admin.php:770 +#: ../../mod/admin.php:98 ../../mod/admin.php:730 ../../mod/admin.php:772 msgid "Plugins" msgstr "Plugins" -#: ../../mod/admin.php:99 ../../mod/admin.php:933 ../../mod/admin.php:969 +#: ../../mod/admin.php:99 ../../mod/admin.php:935 ../../mod/admin.php:971 msgid "Themes" msgstr "Themen" @@ -3078,7 +3078,7 @@ msgstr "DB Updates" msgid "Software Update" msgstr "Software Update" -#: ../../mod/admin.php:115 ../../mod/admin.php:1056 +#: ../../mod/admin.php:115 ../../mod/admin.php:1058 msgid "Logs" msgstr "Protokolle" @@ -3086,9 +3086,9 @@ msgstr "Protokolle" msgid "User registrations waiting for confirmation" msgstr "Nutzeranmeldungen die auf Bestätigung warten" -#: ../../mod/admin.php:195 ../../mod/admin.php:398 ../../mod/admin.php:633 -#: ../../mod/admin.php:727 ../../mod/admin.php:769 ../../mod/admin.php:932 -#: ../../mod/admin.php:968 ../../mod/admin.php:1055 +#: ../../mod/admin.php:195 ../../mod/admin.php:400 ../../mod/admin.php:635 +#: ../../mod/admin.php:729 ../../mod/admin.php:771 ../../mod/admin.php:934 +#: ../../mod/admin.php:970 ../../mod/admin.php:1057 msgid "Administration" msgstr "Administration" @@ -3112,483 +3112,493 @@ msgstr "Version" msgid "Active plugins" msgstr "Aktive Plugins" -#: ../../mod/admin.php:337 +#: ../../mod/admin.php:339 msgid "Site settings updated." msgstr "Seiteneinstellungen aktualisiert." -#: ../../mod/admin.php:385 +#: ../../mod/admin.php:387 msgid "Closed" msgstr "Geschlossen" -#: ../../mod/admin.php:386 +#: ../../mod/admin.php:388 msgid "Requires approval" msgstr "Bedarf der Zustimmung" -#: ../../mod/admin.php:387 +#: ../../mod/admin.php:389 msgid "Open" msgstr "Offen" -#: ../../mod/admin.php:391 +#: ../../mod/admin.php:393 msgid "No SSL policy, links will track page SSL state" msgstr "Keine SSL Richtlinie, Links werden das verwendete Protokoll beibehalten" -#: ../../mod/admin.php:392 +#: ../../mod/admin.php:394 msgid "Force all links to use SSL" msgstr "SSL für alle Links erzwingen" -#: ../../mod/admin.php:393 +#: ../../mod/admin.php:395 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:402 +#: ../../mod/admin.php:404 msgid "File upload" msgstr "Datei hochladen" -#: ../../mod/admin.php:403 +#: ../../mod/admin.php:405 msgid "Policies" msgstr "Regeln" -#: ../../mod/admin.php:404 +#: ../../mod/admin.php:406 msgid "Advanced" msgstr "Erweitert" -#: ../../mod/admin.php:408 ../../addon/statusnet/statusnet.php:544 +#: ../../mod/admin.php:410 ../../addon/statusnet/statusnet.php:544 msgid "Site name" msgstr "Seitenname" -#: ../../mod/admin.php:409 +#: ../../mod/admin.php:411 msgid "Banner/Logo" msgstr "Banner/Logo" -#: ../../mod/admin.php:410 +#: ../../mod/admin.php:412 msgid "System language" msgstr "Systemsprache" -#: ../../mod/admin.php:411 +#: ../../mod/admin.php:413 msgid "System theme" msgstr "Systemweites Thema" -#: ../../mod/admin.php:411 +#: ../../mod/admin.php:413 msgid "" "Default system theme - may be over-ridden by user profiles - <a href='#' " "id='cnftheme'>change theme settings</a>" msgstr "Vorgabe für das System-Theme - kann von Benutzerprofilen überschrieben werden - <a href='#' id='cnftheme'>Theme-Einstellungen ändern</a>" -#: ../../mod/admin.php:412 +#: ../../mod/admin.php:414 msgid "SSL link policy" msgstr "Regeln für SSL Links" -#: ../../mod/admin.php:412 +#: ../../mod/admin.php:414 msgid "Determines whether generated links should be forced to use SSL" msgstr "Bestimmt, ob generierte Links SSL verwenden müssen" -#: ../../mod/admin.php:413 +#: ../../mod/admin.php:415 msgid "Maximum image size" msgstr "Maximale Größe von Bildern" -#: ../../mod/admin.php:413 +#: ../../mod/admin.php:415 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:415 +#: ../../mod/admin.php:417 msgid "Register policy" msgstr "Registrierungsmethode" -#: ../../mod/admin.php:416 +#: ../../mod/admin.php:418 msgid "Register text" msgstr "Registrierungstext" -#: ../../mod/admin.php:416 +#: ../../mod/admin.php:418 msgid "Will be displayed prominently on the registration page." msgstr "Wird gut sichtbar auf der Registrierungs-Seite angezeigt." -#: ../../mod/admin.php:417 +#: ../../mod/admin.php:419 msgid "Accounts abandoned after x days" msgstr "Accounts gelten nach x Tagen als unbenutzt" -#: ../../mod/admin.php:417 +#: ../../mod/admin.php:419 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "Verschwende keine System-Ressourcen auf das Pollen externer Seiten, wenn Accounts nicht mehr benutzt werden. 0 eingeben für kein Limit." -#: ../../mod/admin.php:418 +#: ../../mod/admin.php:420 msgid "Allowed friend domains" msgstr "Erlaubte Domains für Kontakte" -#: ../../mod/admin.php:418 +#: ../../mod/admin.php:420 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:419 +#: ../../mod/admin.php:421 msgid "Allowed email domains" msgstr "Erlaubte Domains für Emails" -#: ../../mod/admin.php:419 +#: ../../mod/admin.php:421 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:420 +#: ../../mod/admin.php:422 msgid "Block public" msgstr "Öffentlichen Zugriff blockieren" -#: ../../mod/admin.php:420 +#: ../../mod/admin.php:422 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:421 +#: ../../mod/admin.php:423 msgid "Force publish" msgstr "Erzwinge Veröffentlichung" -#: ../../mod/admin.php:421 +#: ../../mod/admin.php:423 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:422 +#: ../../mod/admin.php:424 msgid "Global directory update URL" msgstr "URL für Updates beim weltweiten Verzeichnis" -#: ../../mod/admin.php:422 +#: ../../mod/admin.php:424 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:424 +#: ../../mod/admin.php:426 msgid "Block multiple registrations" msgstr "Unterbinde Mehrfachregistrierung" -#: ../../mod/admin.php:424 +#: ../../mod/admin.php:426 msgid "Disallow users to register additional accounts for use as pages." msgstr "Benutzern nicht erlauben, weitere Accounts als zusätzliche Profile anzulegen." -#: ../../mod/admin.php:425 +#: ../../mod/admin.php:427 msgid "OpenID support" msgstr "OpenID Unterstützung" -#: ../../mod/admin.php:425 +#: ../../mod/admin.php:427 msgid "OpenID support for registration and logins." msgstr "OpenID-Unterstützung für Registrierung und Login." -#: ../../mod/admin.php:426 +#: ../../mod/admin.php:428 msgid "Fullname check" msgstr "Namen auf Vollständigkeit überprüfen" -#: ../../mod/admin.php:426 +#: ../../mod/admin.php:428 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:427 +#: ../../mod/admin.php:429 msgid "UTF-8 Regular expressions" msgstr "UTF-8 Reguläre Ausdrücke" -#: ../../mod/admin.php:427 +#: ../../mod/admin.php:429 msgid "Use PHP UTF8 regular expressions" msgstr "PHP UTF8 Ausdrücke verwenden" -#: ../../mod/admin.php:428 +#: ../../mod/admin.php:430 msgid "Show Community Page" msgstr "Gemeinschaftsseite anzeigen" -#: ../../mod/admin.php:428 +#: ../../mod/admin.php:430 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:429 +#: ../../mod/admin.php:431 msgid "Enable OStatus support" msgstr "OStatus Unterstützung aktivieren" -#: ../../mod/admin.php:429 +#: ../../mod/admin.php:431 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:430 +#: ../../mod/admin.php:432 msgid "Enable Diaspora support" msgstr "Diaspora-Support aktivieren" -#: ../../mod/admin.php:430 +#: ../../mod/admin.php:432 msgid "Provide built-in Diaspora network compatibility." msgstr "Verwende die eingebaute Diaspora-Verknüpfung." -#: ../../mod/admin.php:431 +#: ../../mod/admin.php:433 msgid "Only allow Friendica contacts" msgstr "Nur Friendica-Kontakte erlauben" -#: ../../mod/admin.php:431 +#: ../../mod/admin.php:433 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:432 +#: ../../mod/admin.php:434 msgid "Verify SSL" msgstr "SSL Überprüfen" -#: ../../mod/admin.php:432 +#: ../../mod/admin.php:434 msgid "" "If you wish, you can turn on strict certificate checking. This will mean you" " cannot connect (at all) to self-signed SSL sites." msgstr "Wenn gewollt, kann man hier eine strenge Zertifikat Kontrolle einstellen. Das bedeutet, dass man zu keinen Seiten mit selbst unterzeichnetem SSL eine Verbindung herstellen kann." -#: ../../mod/admin.php:433 +#: ../../mod/admin.php:435 msgid "Proxy user" msgstr "Proxy Nutzer" -#: ../../mod/admin.php:434 +#: ../../mod/admin.php:436 msgid "Proxy URL" msgstr "Proxy URL" -#: ../../mod/admin.php:435 +#: ../../mod/admin.php:437 msgid "Network timeout" msgstr "Netzwerk Wartezeit" -#: ../../mod/admin.php:435 +#: ../../mod/admin.php:437 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:436 +#: ../../mod/admin.php:438 msgid "Delivery interval" msgstr "Zustellungsintervall" -#: ../../mod/admin.php:436 +#: ../../mod/admin.php:438 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:451 +#: ../../mod/admin.php:439 +msgid "Maximum Load Average" +msgstr "Maximum Load Average" + +#: ../../mod/admin.php:439 +msgid "" +"Maximum system load before delivery and poll processes are deferred - " +"default 50." +msgstr "" + +#: ../../mod/admin.php:453 msgid "Update has been marked successful" msgstr "Update wurde als erfolgreich markiert" -#: ../../mod/admin.php:461 +#: ../../mod/admin.php:463 #, php-format msgid "Executing %s failed. Check system logs." msgstr "Ausführung von %s schlug fehl. Systemprotokolle prüfen." -#: ../../mod/admin.php:464 +#: ../../mod/admin.php:466 #, php-format msgid "Update %s was successfully applied." msgstr "Update %s war erfolgreich." -#: ../../mod/admin.php:468 +#: ../../mod/admin.php:470 #, 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:471 +#: ../../mod/admin.php:473 #, php-format msgid "Update function %s could not be found." msgstr "Updatefunktion %s konnte nicht gefunden werden." -#: ../../mod/admin.php:486 +#: ../../mod/admin.php:488 msgid "No failed updates." msgstr "Keine fehlgeschlagenen Updates." -#: ../../mod/admin.php:490 +#: ../../mod/admin.php:492 msgid "Failed Updates" msgstr "Fehlgeschlagene Updates" -#: ../../mod/admin.php:491 +#: ../../mod/admin.php:493 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:492 +#: ../../mod/admin.php:494 msgid "Mark success (if update was manually applied)" msgstr "Als erfolgreich markieren (falls das Update manuell installiert wurde)" -#: ../../mod/admin.php:493 +#: ../../mod/admin.php:495 msgid "Attempt to execute this update step automatically" msgstr "Versuchen, diesen Schritt automatisch auszuführen" -#: ../../mod/admin.php:518 +#: ../../mod/admin.php:520 #, 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:525 +#: ../../mod/admin.php:527 #, 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:564 +#: ../../mod/admin.php:566 #, php-format msgid "User '%s' deleted" msgstr "Nutzer '%s' gelöscht" -#: ../../mod/admin.php:572 +#: ../../mod/admin.php:574 #, php-format msgid "User '%s' unblocked" msgstr "Nutzer '%s' entsperrt" -#: ../../mod/admin.php:572 +#: ../../mod/admin.php:574 #, php-format msgid "User '%s' blocked" msgstr "Nutzer '%s' gesperrt" -#: ../../mod/admin.php:636 +#: ../../mod/admin.php:638 msgid "select all" msgstr "Alle auswählen" -#: ../../mod/admin.php:637 +#: ../../mod/admin.php:639 msgid "User registrations waiting for confirm" msgstr "Neuanmeldungen, die auf deine Bestätigung warten" -#: ../../mod/admin.php:638 +#: ../../mod/admin.php:640 msgid "Request date" msgstr "Anfrage Datum" -#: ../../mod/admin.php:638 ../../mod/admin.php:647 +#: ../../mod/admin.php:640 ../../mod/admin.php:649 #: ../../include/contact_selectors.php:79 msgid "Email" msgstr "Email" -#: ../../mod/admin.php:639 +#: ../../mod/admin.php:641 msgid "No registrations." msgstr "Keine Neuanmeldungen." -#: ../../mod/admin.php:641 +#: ../../mod/admin.php:643 msgid "Deny" msgstr "Verwehren" -#: ../../mod/admin.php:647 +#: ../../mod/admin.php:649 msgid "Register date" msgstr "Anmeldedatum" -#: ../../mod/admin.php:647 +#: ../../mod/admin.php:649 msgid "Last login" msgstr "Letzte Anmeldung" -#: ../../mod/admin.php:647 +#: ../../mod/admin.php:649 msgid "Last item" msgstr "Letzter Beitrag" -#: ../../mod/admin.php:647 +#: ../../mod/admin.php:649 msgid "Account" msgstr "Nutzerkonto" -#: ../../mod/admin.php:649 +#: ../../mod/admin.php:651 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:650 +#: ../../mod/admin.php:652 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:691 +#: ../../mod/admin.php:693 #, php-format msgid "Plugin %s disabled." msgstr "Plugin %s deaktiviert." -#: ../../mod/admin.php:695 +#: ../../mod/admin.php:697 #, php-format msgid "Plugin %s enabled." msgstr "Plugin %s aktiviert." -#: ../../mod/admin.php:705 ../../mod/admin.php:903 +#: ../../mod/admin.php:707 ../../mod/admin.php:905 msgid "Disable" msgstr "Ausschalten" -#: ../../mod/admin.php:707 ../../mod/admin.php:905 +#: ../../mod/admin.php:709 ../../mod/admin.php:907 msgid "Enable" msgstr "Einschalten" -#: ../../mod/admin.php:729 ../../mod/admin.php:934 +#: ../../mod/admin.php:731 ../../mod/admin.php:936 msgid "Toggle" msgstr "Umschalten" -#: ../../mod/admin.php:737 ../../mod/admin.php:944 +#: ../../mod/admin.php:739 ../../mod/admin.php:946 msgid "Author: " msgstr "Autor:" -#: ../../mod/admin.php:738 ../../mod/admin.php:945 +#: ../../mod/admin.php:740 ../../mod/admin.php:947 msgid "Maintainer: " msgstr "Betreuer:" -#: ../../mod/admin.php:867 +#: ../../mod/admin.php:869 msgid "No themes found." msgstr "Keine Themen gefunden." -#: ../../mod/admin.php:926 +#: ../../mod/admin.php:928 msgid "Screenshot" msgstr "Bildschirmfoto" -#: ../../mod/admin.php:974 +#: ../../mod/admin.php:976 msgid "[Experimental]" msgstr "[Experimentell]" -#: ../../mod/admin.php:975 +#: ../../mod/admin.php:977 msgid "[Unsupported]" msgstr "[Nicht unterstützt]" -#: ../../mod/admin.php:1002 +#: ../../mod/admin.php:1004 msgid "Log settings updated." msgstr "Protokolleinstellungen aktualisiert." -#: ../../mod/admin.php:1058 +#: ../../mod/admin.php:1060 msgid "Clear" msgstr "löschen" -#: ../../mod/admin.php:1064 +#: ../../mod/admin.php:1066 msgid "Debugging" msgstr "Protokoll führen" -#: ../../mod/admin.php:1065 +#: ../../mod/admin.php:1067 msgid "Log file" msgstr "Protokolldatei" -#: ../../mod/admin.php:1065 +#: ../../mod/admin.php:1067 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:1066 +#: ../../mod/admin.php:1068 msgid "Log level" msgstr "Protokoll-Level" -#: ../../mod/admin.php:1116 +#: ../../mod/admin.php:1118 ../../view/theme/diabook/theme.php:599 msgid "Close" msgstr "Schließen" -#: ../../mod/admin.php:1122 +#: ../../mod/admin.php:1124 msgid "FTP Host" msgstr "FTP Host" -#: ../../mod/admin.php:1123 +#: ../../mod/admin.php:1125 msgid "FTP Path" msgstr "FTP Pfad" -#: ../../mod/admin.php:1124 +#: ../../mod/admin.php:1126 msgid "FTP User" msgstr "FTP Nutzername" -#: ../../mod/admin.php:1125 +#: ../../mod/admin.php:1127 msgid "FTP Password" msgstr "FTP Passwort" @@ -3712,13 +3722,13 @@ msgstr "Konnte die Kontaktinformationen nicht empfangen." msgid "following" msgstr "folgen" -#: ../../mod/common.php:34 +#: ../../mod/common.php:42 msgid "Common Friends" msgstr "Gemeinsame Freunde" -#: ../../mod/common.php:42 -msgid "No friends in common." -msgstr "Keine gemeinsamen Freunde." +#: ../../mod/common.php:78 +msgid "No contacts in common." +msgstr "Keine gemeinsamen Kontakte." #: ../../mod/display.php:135 msgid "Item has been removed." @@ -3799,13 +3809,8 @@ msgstr "öffentliches Profil" #: ../../mod/profiles.php:331 #, php-format -msgid "%1$s changed %2$s to \"%3$s\"" -msgstr "%1$s änderte %2$s zu \"%3$s\"" - -#: ../../mod/profiles.php:332 -#, php-format -msgid " - Visit %1$s's %2$s" -msgstr " - %1$s's %2$s besuchen" +msgid "%1$s changed %2$s to “%3$s”" +msgstr "%1$s hat %2$s geändert auf “%3$s”" #: ../../mod/profiles.php:335 #, php-format @@ -4063,7 +4068,7 @@ msgstr "Hinzufügen" msgid "No entries." msgstr "Keine Einträge" -#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:183 +#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:513 #: ../../include/contact_widgets.php:34 msgid "Friend Suggestions" msgstr "Kontaktvorschläge" @@ -4078,7 +4083,7 @@ msgstr "Keine Vorschläge. Falls der Server frisch aufgesetzt wurde, versuche es msgid "Ignore/Hide" msgstr "Ignorieren/Verbergen" -#: ../../mod/directory.php:47 ../../view/theme/diabook/theme.php:181 +#: ../../mod/directory.php:47 ../../view/theme/diabook/theme.php:511 msgid "Global Directory" msgstr "Weltweites Verzeichnis" @@ -4269,71 +4274,83 @@ 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:491 +#: ../../addon/facebook/facebook.php:501 msgid "Facebook disabled" msgstr "Facebook deaktiviert" -#: ../../addon/facebook/facebook.php:496 +#: ../../addon/facebook/facebook.php:506 msgid "Updating contacts" msgstr "Aktualisiere Kontakte" -#: ../../addon/facebook/facebook.php:516 +#: ../../addon/facebook/facebook.php:529 msgid "Facebook API key is missing." msgstr "Facebook-API-Schlüssel nicht gefunden" -#: ../../addon/facebook/facebook.php:523 +#: ../../addon/facebook/facebook.php:536 msgid "Facebook Connect" msgstr "Mit Facebook verbinden" -#: ../../addon/facebook/facebook.php:529 +#: ../../addon/facebook/facebook.php:542 msgid "Install Facebook connector for this account." msgstr "Facebook-Connector für diesen Account installieren." -#: ../../addon/facebook/facebook.php:536 +#: ../../addon/facebook/facebook.php:549 msgid "Remove Facebook connector" msgstr "Facebook-Connector entfernen" -#: ../../addon/facebook/facebook.php:541 +#: ../../addon/facebook/facebook.php:554 msgid "" "Re-authenticate [This is necessary whenever your Facebook password is " "changed.]" msgstr "Neu authentifizieren [Das ist immer dann nötig, wenn Du Dein Facebook-Passwort geändert hast.]" -#: ../../addon/facebook/facebook.php:548 +#: ../../addon/facebook/facebook.php:561 msgid "Post to Facebook by default" msgstr "Veröffentliche standardmäßig bei Facebook" -#: ../../addon/facebook/facebook.php:552 +#: ../../addon/facebook/facebook.php:567 +msgid "" +"Facebook friend linking has been disabled on this site. The following " +"settings will have no effect." +msgstr "" + +#: ../../addon/facebook/facebook.php:571 +msgid "" +"Facebook friend linking has been disabled on this site. If you disable it, " +"you will be unable to re-enable it." +msgstr "" + +#: ../../addon/facebook/facebook.php:574 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:554 +#: ../../addon/facebook/facebook.php:576 msgid "" "Facebook conversations consist of your <em>profile wall</em> and your friend" " <em>stream</em>." msgstr "Facebook-Konversationen bestehen aus deinen Beiträgen auf deiner<em>Pinnwand</em>, sowie den Beiträgen deiner Freunde <em>Stream</em>." -#: ../../addon/facebook/facebook.php:555 +#: ../../addon/facebook/facebook.php:577 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:556 +#: ../../addon/facebook/facebook.php:578 msgid "" "The following settings determine the privacy of your Facebook profile wall " "on this website." msgstr "Mit den folgenden Einstellungen kannst Du die Privatsphäre der Kopie Deiner Facebook-Pinnwand hier auf dieser Seite einstellen." -#: ../../addon/facebook/facebook.php:560 +#: ../../addon/facebook/facebook.php:582 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:565 +#: ../../addon/facebook/facebook.php:587 msgid "Do not import your Facebook profile wall conversations" msgstr "Facebook-Pinnwand nicht importieren" -#: ../../addon/facebook/facebook.php:567 +#: ../../addon/facebook/facebook.php:589 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 " @@ -4341,120 +4358,120 @@ msgid "" "who may see the conversations." msgstr "Wenn Du Facebook-Konversationen importierst und diese beiden Häkchen nicht setzt, wird Deine Facebook-Pinnwand mit der Pinnwand hier auf dieser Webseite vereinigt. Die Privatsphäre-Einstellungen für Deine Pinnwand auf dieser Webseite geben dann an, wer die Konversationen sehen kann." -#: ../../addon/facebook/facebook.php:572 +#: ../../addon/facebook/facebook.php:594 msgid "Comma separated applications to ignore" msgstr "Komma separiert Anwendungen, die ignoriert werden sollen" -#: ../../addon/facebook/facebook.php:656 +#: ../../addon/facebook/facebook.php:678 msgid "Problems with Facebook Real-Time Updates" msgstr "Probleme mit Facebook Echtzeit-Updates" -#: ../../addon/facebook/facebook.php:684 +#: ../../addon/facebook/facebook.php:706 #: ../../include/contact_selectors.php:81 msgid "Facebook" msgstr "Facebook" -#: ../../addon/facebook/facebook.php:685 +#: ../../addon/facebook/facebook.php:707 msgid "Facebook Connector Settings" msgstr "Facebook-Verbindungseinstellungen" -#: ../../addon/facebook/facebook.php:700 +#: ../../addon/facebook/facebook.php:722 msgid "Facebook API Key" msgstr "Facebook API Schlüssel" -#: ../../addon/facebook/facebook.php:710 +#: ../../addon/facebook/facebook.php:732 msgid "" "Error: it appears that you have specified the App-ID and -Secret in your " ".htconfig.php file. As long as they are specified there, they cannot be set " "using this form.<br><br>" msgstr "Fehler: du scheinst die App-ID und das App-Geheimnis in deiner .htconfig.php Datei angegeben zu haben. Solange sie dort festgelegt werden kannst du dieses Formular hier nicht verwenden.<br><br>" -#: ../../addon/facebook/facebook.php:715 +#: ../../addon/facebook/facebook.php:737 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:717 +#: ../../addon/facebook/facebook.php:739 msgid "The given API Key seems to work correctly." msgstr "Der angegebene API Schlüssel scheint korrekt zu funktionieren." -#: ../../addon/facebook/facebook.php:719 +#: ../../addon/facebook/facebook.php:741 msgid "" "The correctness of the API Key could not be detected. Somthing strange's " "going on." msgstr "Die Echtheit des API Schlüssels konnte nicht überprüft werden. Etwas Merkwürdiges ist hier im Gange." -#: ../../addon/facebook/facebook.php:722 +#: ../../addon/facebook/facebook.php:744 msgid "App-ID / API-Key" msgstr "App-ID / API-Key" -#: ../../addon/facebook/facebook.php:723 +#: ../../addon/facebook/facebook.php:745 msgid "Application secret" msgstr "Anwendungs-Geheimnis" -#: ../../addon/facebook/facebook.php:724 +#: ../../addon/facebook/facebook.php:746 #, php-format msgid "Polling Interval in minutes (minimum %1$s minutes)" msgstr "Abfrage-Intervall in Minuten (min %1$s Minuten)" -#: ../../addon/facebook/facebook.php:725 +#: ../../addon/facebook/facebook.php:747 msgid "" "Synchronize comments (no comments on Facebook are missed, at the cost of " "increased system load)" msgstr "Kommentare synchronisieren (Kein Kommentar von Facebook geht verlohren, verursacht höhere Last auf dem Server)" -#: ../../addon/facebook/facebook.php:729 +#: ../../addon/facebook/facebook.php:751 msgid "Real-Time Updates" msgstr "Echt-Zeit Aktualisierungen" -#: ../../addon/facebook/facebook.php:733 +#: ../../addon/facebook/facebook.php:755 msgid "Real-Time Updates are activated." msgstr "Echtzeit-Updates sind aktiviert." -#: ../../addon/facebook/facebook.php:734 +#: ../../addon/facebook/facebook.php:756 msgid "Deactivate Real-Time Updates" msgstr "Echtzeit-Updates deaktivieren" -#: ../../addon/facebook/facebook.php:736 +#: ../../addon/facebook/facebook.php:758 msgid "Real-Time Updates not activated." msgstr "Echtzeit-Updates nicht aktiviert." -#: ../../addon/facebook/facebook.php:736 +#: ../../addon/facebook/facebook.php:758 msgid "Activate Real-Time Updates" msgstr "Echtzeit-Updates aktivieren" -#: ../../addon/facebook/facebook.php:755 +#: ../../addon/facebook/facebook.php:777 msgid "The new values have been saved." msgstr "Die neuen Einstellungen wurden gespeichert." -#: ../../addon/facebook/facebook.php:779 +#: ../../addon/facebook/facebook.php:801 msgid "Post to Facebook" msgstr "Bei Facebook veröffentlichen" -#: ../../addon/facebook/facebook.php:877 +#: ../../addon/facebook/facebook.php:899 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:1097 +#: ../../addon/facebook/facebook.php:1119 msgid "View on Friendica" msgstr "In Friendica betrachten" -#: ../../addon/facebook/facebook.php:1130 +#: ../../addon/facebook/facebook.php:1152 msgid "Facebook post failed. Queued for retry." msgstr "Veröffentlichung bei Facebook gescheitert. Wir versuchen es später erneut." -#: ../../addon/facebook/facebook.php:1170 +#: ../../addon/facebook/facebook.php:1192 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:1171 +#: ../../addon/facebook/facebook.php:1193 msgid "Facebook connection became invalid" msgstr "Facebook Anmeldedaten sind ungültig geworden" -#: ../../addon/facebook/facebook.php:1172 +#: ../../addon/facebook/facebook.php:1194 #, php-format msgid "" "Hi %1$s,\n" @@ -4599,10 +4616,16 @@ msgstr "NSFW-Einstellungen gespeichert" msgid "%s - Click to open/close" msgstr "%s – Zum Öffnen/Schließen klicken" -#: ../../addon/page/page.php:47 +#: ../../addon/page/page.php:48 msgid "Forums" msgstr "Foren" +#: ../../addon/page/page.php:63 ../../addon/showmore/showmore.php:87 +#: ../../include/contact_widgets.php:187 ../../include/conversation.php:466 +#: ../../boot.php:507 +msgid "show more" +msgstr "mehr anzeigen" + #: ../../addon/planets/planets.php:150 msgid "Planets Settings" msgstr "Planeten Einstellungen" @@ -4643,7 +4666,7 @@ msgid "Latest likes" msgstr "Neueste Favoriten" #: ../../addon/communityhome/communityhome.php:155 -#: ../../view/theme/diabook/theme.php:119 ../../include/text.php:1302 +#: ../../view/theme/diabook/theme.php:449 ../../include/text.php:1303 #: ../../include/conversation.php:45 ../../include/conversation.php:118 msgid "event" msgstr "Veranstaltung" @@ -4796,7 +4819,7 @@ msgid "Post to Drupal by default" msgstr "Veröffentliche öffentliche Beiträge standardmäßig bei Drupal" #: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:190 -#: ../../addon/blogger/blogger.php:172 ../../addon/posterous/posterous.php:173 +#: ../../addon/blogger/blogger.php:172 ../../addon/posterous/posterous.php:177 msgid "Post from Friendica" msgstr "Beitrag via Friendica" @@ -5352,11 +5375,6 @@ msgstr "Begrenze Beiträge nach einer bestimmten Anzahl an Buchstaben" msgid "Show More Settings saved." msgstr "\"Mehr zeigen\" Einstellungen gesichert." -#: ../../addon/showmore/showmore.php:87 ../../include/conversation.php:466 -#: ../../boot.php:507 -msgid "show more" -msgstr "mehr anzeigen" - #: ../../addon/piwik/piwik.php:79 msgid "" "This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> " @@ -5539,109 +5557,126 @@ msgstr "Posterous-Passwort" msgid "Post to Posterous by default" msgstr "Veröffentliche öffentliche Beiträge standardmäßig bei Posterous" -#: ../../view/theme/cleanzero/config.php:73 -#: ../../view/theme/diabook/config.php:93 +#: ../../view/theme/cleanzero/config.php:82 +#: ../../view/theme/diabook/config.php:97 #: ../../view/theme/quattro/config.php:54 ../../view/theme/dispy/config.php:72 msgid "Theme settings" msgstr "Themen Einstellungen" -#: ../../view/theme/cleanzero/config.php:74 +#: ../../view/theme/cleanzero/config.php:83 msgid "Set resize level for images in posts and comments (width and height)" msgstr "Wähle das Vergrößerungsmaß für Bilder in Beiträgen und Kommentaren (Höhe und Breite)" -#: ../../view/theme/cleanzero/config.php:75 -#: ../../view/theme/diabook/config.php:94 ../../view/theme/dispy/config.php:73 +#: ../../view/theme/cleanzero/config.php:84 +#: ../../view/theme/diabook/config.php:98 ../../view/theme/dispy/config.php:73 msgid "Set font-size for posts and comments" msgstr "Schriftgröße für Beiträge und Kommentare festlegen" -#: ../../view/theme/cleanzero/config.php:76 +#: ../../view/theme/cleanzero/config.php:85 +msgid "Set theme width" +msgstr "Theme Breite festlegen" + +#: ../../view/theme/cleanzero/config.php:86 #: ../../view/theme/quattro/config.php:56 msgid "Color scheme" msgstr "Farbschema" -#: ../../view/theme/diabook/theme.php:48 +#: ../../view/theme/diabook/theme.php:65 ../../include/nav.php:49 +#: ../../include/nav.php:115 +msgid "Your posts and conversations" +msgstr "Deine Beiträge und Unterhaltungen" + +#: ../../view/theme/diabook/theme.php:66 ../../include/nav.php:50 +msgid "Your profile page" +msgstr "Deine Profilseite" + +#: ../../view/theme/diabook/theme.php:67 +msgid "Your contacts" +msgstr "Deine Kontakte" + +#: ../../view/theme/diabook/theme.php:68 ../../include/nav.php:51 +msgid "Your photos" +msgstr "Deine Fotos" + +#: ../../view/theme/diabook/theme.php:69 ../../include/nav.php:52 +msgid "Your events" +msgstr "Deine Ereignisse" + +#: ../../view/theme/diabook/theme.php:70 ../../include/nav.php:53 +msgid "Personal notes" +msgstr "Persönliche Notizen" + +#: ../../view/theme/diabook/theme.php:70 ../../include/nav.php:53 +msgid "Your personal photos" +msgstr "Deine privaten Fotos" + +#: ../../view/theme/diabook/theme.php:72 +#: ../../view/theme/diabook/theme.php:530 +msgid "Community Pages" +msgstr "Foren" + +#: ../../view/theme/diabook/theme.php:377 msgid "Community Profiles" msgstr "Community-Profile" -#: ../../view/theme/diabook/theme.php:68 +#: ../../view/theme/diabook/theme.php:398 msgid "Last users" msgstr "Letzte Nutzer" -#: ../../view/theme/diabook/theme.php:97 +#: ../../view/theme/diabook/theme.php:427 msgid "Last likes" msgstr "Zuletzt gemocht" -#: ../../view/theme/diabook/theme.php:142 +#: ../../view/theme/diabook/theme.php:472 msgid "Last photos" msgstr "Letzte Fotos" -#: ../../view/theme/diabook/theme.php:179 +#: ../../view/theme/diabook/theme.php:509 msgid "Find Friends" msgstr "Freunde finden" -#: ../../view/theme/diabook/theme.php:180 +#: ../../view/theme/diabook/theme.php:510 msgid "Local Directory" msgstr "Lokales Verzeichnis" -#: ../../view/theme/diabook/theme.php:182 ../../include/contact_widgets.php:35 +#: ../../view/theme/diabook/theme.php:512 ../../include/contact_widgets.php:35 msgid "Similar Interests" msgstr "Ähnliche Interessen" -#: ../../view/theme/diabook/theme.php:184 ../../include/contact_widgets.php:37 +#: ../../view/theme/diabook/theme.php:514 ../../include/contact_widgets.php:37 msgid "Invite Friends" msgstr "Freunde einladen" -#: ../../view/theme/diabook/theme.php:199 -#: ../../view/theme/diabook/theme.php:277 -msgid "Community Pages" -msgstr "Foren" +#: ../../view/theme/diabook/theme.php:565 +msgid "Earth View" +msgstr "Earth View" -#: ../../view/theme/diabook/theme.php:232 +#: ../../view/theme/diabook/theme.php:573 msgid "Help or @NewHere ?" msgstr "Hilfe oder @NewHere" -#: ../../view/theme/diabook/theme.php:238 +#: ../../view/theme/diabook/theme.php:580 msgid "Connect Services" msgstr "Verbinde Dienste" -#: ../../view/theme/diabook/theme.php:270 ../../include/nav.php:49 -#: ../../include/nav.php:115 -msgid "Your posts and conversations" -msgstr "Deine Beiträge und Unterhaltungen" - -#: ../../view/theme/diabook/theme.php:271 ../../include/nav.php:50 -msgid "Your profile page" -msgstr "Deine Profilseite" - -#: ../../view/theme/diabook/theme.php:272 -msgid "Your contacts" -msgstr "Deine Kontakte" +#: ../../view/theme/diabook/theme.php:587 +msgid "Last Tweets" +msgstr "Neueste Tweets" -#: ../../view/theme/diabook/theme.php:273 ../../include/nav.php:51 -msgid "Your photos" -msgstr "Deine Fotos" - -#: ../../view/theme/diabook/theme.php:274 ../../include/nav.php:52 -msgid "Your events" -msgstr "Deine Ereignisse" - -#: ../../view/theme/diabook/theme.php:275 ../../include/nav.php:53 -msgid "Personal notes" -msgstr "Persönliche Notizen" - -#: ../../view/theme/diabook/theme.php:275 ../../include/nav.php:53 -msgid "Your personal photos" -msgstr "Deine privaten Fotos" +#: ../../view/theme/diabook/theme.php:591 +#: ../../view/theme/diabook/config.php:102 +msgid "Set twitter search term" +msgstr "" -#: ../../view/theme/diabook/config.php:95 ../../view/theme/dispy/config.php:74 +#: ../../view/theme/diabook/config.php:99 ../../view/theme/dispy/config.php:74 msgid "Set line-height for posts and comments" msgstr "Liniengröße für Beiträge und Kommantare festlegen" -#: ../../view/theme/diabook/config.php:96 +#: ../../view/theme/diabook/config.php:100 msgid "Set resolution for middle column" msgstr "Auflösung für die Mittelspalte setzen" -#: ../../view/theme/diabook/config.php:97 +#: ../../view/theme/diabook/config.php:101 msgid "Set color scheme" msgstr "Wähle Farbschema" @@ -6050,11 +6085,11 @@ msgstr "Beginnt:" msgid "Finishes:" msgstr "Endet:" -#: ../../include/delivery.php:434 ../../include/notifier.php:652 +#: ../../include/delivery.php:445 ../../include/notifier.php:652 msgid "(no subject)" msgstr "(kein Betreff)" -#: ../../include/delivery.php:441 ../../include/enotify.php:23 +#: ../../include/delivery.php:452 ../../include/enotify.php:23 #: ../../include/notifier.php:659 msgid "noreply" msgstr "noreply" @@ -6170,47 +6205,47 @@ msgstr "Dezember" msgid "bytes" msgstr "Byte" -#: ../../include/text.php:936 -msgid "Categories:" -msgstr "Kategorien:" - -#: ../../include/text.php:948 +#: ../../include/text.php:934 ../../include/text.php:949 msgid "remove" msgstr "löschen" -#: ../../include/text.php:948 +#: ../../include/text.php:934 ../../include/text.php:949 msgid "[remove]" msgstr "[löschen]" -#: ../../include/text.php:951 +#: ../../include/text.php:937 +msgid "Categories:" +msgstr "Kategorien:" + +#: ../../include/text.php:952 msgid "Filed under:" msgstr "Abgelegt unter:" -#: ../../include/text.php:967 ../../include/text.php:979 +#: ../../include/text.php:968 ../../include/text.php:980 msgid "Click to open/close" msgstr "Zum öffnen/schließen klicken" -#: ../../include/text.php:1084 +#: ../../include/text.php:1085 msgid "default" msgstr "standard" -#: ../../include/text.php:1096 +#: ../../include/text.php:1097 msgid "Select an alternate language" msgstr "Alternative Sprache auswählen" -#: ../../include/text.php:1306 +#: ../../include/text.php:1307 msgid "activity" msgstr "Aktivität" -#: ../../include/text.php:1308 +#: ../../include/text.php:1309 msgid "comment" msgstr "Kommentar" -#: ../../include/text.php:1309 +#: ../../include/text.php:1310 msgid "post" msgstr "Beitrag" -#: ../../include/text.php:1464 +#: ../../include/text.php:1465 msgid "Item filed" msgstr "Beitrag abgelegt" @@ -6441,13 +6476,6 @@ msgstr "Alles" msgid "Categories" msgstr "Kategorien" -#: ../../include/contact_widgets.php:183 -#, php-format -msgid "%d friend in common" -msgid_plural "%d friends in common" -msgstr[0] "%d gemeinsamer Freund" -msgstr[1] "%d gemeinsame Freunde" - #: ../../include/auth.php:29 msgid "Logged out." msgstr "Abgemeldet." diff --git a/view/de/strings.php b/view/de/strings.php index f88c969d9..a3ccab692 100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -751,6 +751,8 @@ $a->strings["Network timeout"] = "Netzwerk Wartezeit"; $a->strings["Value is in seconds. Set to 0 for unlimited (not recommended)."] = "Der Wert ist in Sekunden. Setze 0 für unbegrenzt (nicht empfohlen)."; $a->strings["Delivery interval"] = "Zustellungsintervall"; $a->strings["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."] = "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."; +$a->strings["Maximum Load Average"] = "Maximum Load Average"; +$a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = ""; $a->strings["Update has been marked successful"] = "Update wurde als erfolgreich markiert"; $a->strings["Executing %s failed. Check system logs."] = "Ausführung von %s schlug fehl. Systemprotokolle prüfen."; $a->strings["Update %s was successfully applied."] = "Update %s war erfolgreich."; @@ -834,7 +836,7 @@ $a->strings["Limited profile. This person will be unable to receive direct/perso $a->strings["Unable to retrieve contact information."] = "Konnte die Kontaktinformationen nicht empfangen."; $a->strings["following"] = "folgen"; $a->strings["Common Friends"] = "Gemeinsame Freunde"; -$a->strings["No friends in common."] = "Keine gemeinsamen Freunde."; +$a->strings["No contacts in common."] = "Keine gemeinsamen Kontakte."; $a->strings["Item has been removed."] = "Eintrag wurde entfernt."; $a->strings["Applications"] = "Anwendungen"; $a->strings["No installed applications."] = "Keine Applikationen installiert."; @@ -854,8 +856,7 @@ $a->strings["Location"] = "Wohnort"; $a->strings["Profile updated."] = "Profil aktualisiert."; $a->strings[" and "] = " und "; $a->strings["public profile"] = "öffentliches Profil"; -$a->strings["%1\$s changed %2\$s to \"%3\$s\""] = "%1\$s änderte %2\$s zu \"%3\$s\""; -$a->strings[" - Visit %1\$s's %2\$s"] = " - %1\$s's %2\$s besuchen"; +$a->strings["%1\$s changed %2\$s to “%3\$s”"] = "%1\$s hat %2\$s geändert auf “%3\$s”"; $a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s hat folgendes aktualisiert %2\$s, verändert wurde %3\$s."; $a->strings["Profile deleted."] = "Profil gelöscht."; $a->strings["Profile-"] = "Profil-"; @@ -971,6 +972,8 @@ $a->strings["Install Facebook connector for this account."] = "Facebook-Connecto $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["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."] = ""; +$a->strings["Facebook friend linking has been disabled on this site. If you disable it, you will be unable to re-enable it."] = ""; $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 <em>profile wall</em> and your friend <em>stream</em>."] = "Facebook-Konversationen bestehen aus deinen Beiträgen auf deiner<em>Pinnwand</em>, sowie den Beiträgen deiner Freunde <em>Stream</em>."; $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."; @@ -1042,6 +1045,7 @@ $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["Planets Settings"] = "Planeten Einstellungen"; $a->strings["Enable Planets Plugin"] = "Aktiviere Planeten Plugin"; $a->strings["Login"] = "Anmeldung"; @@ -1212,7 +1216,6 @@ $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["show more"] = "mehr anzeigen"; $a->strings["This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> analytics tool."] = "Diese Website benutzt <a href='http://www.piwik.org'>Piwik</a>, eine Open Source-Software zur statistischen Auswertung der Besucherzugriffe."; $a->strings["If you do not want that your visits are logged this way you <a href='%s'>can set a cookie to prevent Piwik from tracking further visits of the site</a> (opt-out)."] = "Wenn Du nicht willst, dass Deine Besuche auf diese Weise gespeichert werden, kannst Du <a href='%s'>ein Cookie setzen</a>. Dann wird Piwik Dich auf dieser Website nicht mehr verfolgen (opt-out)."; $a->strings["Piwik Base URL"] = "Piwik Basis URL"; @@ -1256,7 +1259,16 @@ $a->strings["Post to Posterous by default"] = "Veröffentliche öffentliche Beit $a->strings["Theme settings"] = "Themen Einstellungen"; $a->strings["Set resize level for images in posts and comments (width and height)"] = "Wähle das Vergrößerungsmaß für Bilder in Beiträgen und Kommentaren (Höhe und Breite)"; $a->strings["Set font-size for posts and comments"] = "Schriftgröße für Beiträge und Kommentare festlegen"; +$a->strings["Set theme width"] = "Theme Breite festlegen"; $a->strings["Color scheme"] = "Farbschema"; +$a->strings["Your posts and conversations"] = "Deine Beiträge und Unterhaltungen"; +$a->strings["Your profile page"] = "Deine Profilseite"; +$a->strings["Your contacts"] = "Deine Kontakte"; +$a->strings["Your photos"] = "Deine Fotos"; +$a->strings["Your events"] = "Deine Ereignisse"; +$a->strings["Personal notes"] = "Persönliche Notizen"; +$a->strings["Your personal photos"] = "Deine privaten Fotos"; +$a->strings["Community Pages"] = "Foren"; $a->strings["Community Profiles"] = "Community-Profile"; $a->strings["Last users"] = "Letzte Nutzer"; $a->strings["Last likes"] = "Zuletzt gemocht"; @@ -1265,16 +1277,11 @@ $a->strings["Find Friends"] = "Freunde finden"; $a->strings["Local Directory"] = "Lokales Verzeichnis"; $a->strings["Similar Interests"] = "Ähnliche Interessen"; $a->strings["Invite Friends"] = "Freunde einladen"; -$a->strings["Community Pages"] = "Foren"; +$a->strings["Earth View"] = "Earth View"; $a->strings["Help or @NewHere ?"] = "Hilfe oder @NewHere"; $a->strings["Connect Services"] = "Verbinde Dienste"; -$a->strings["Your posts and conversations"] = "Deine Beiträge und Unterhaltungen"; -$a->strings["Your profile page"] = "Deine Profilseite"; -$a->strings["Your contacts"] = "Deine Kontakte"; -$a->strings["Your photos"] = "Deine Fotos"; -$a->strings["Your events"] = "Deine Ereignisse"; -$a->strings["Personal notes"] = "Persönliche Notizen"; -$a->strings["Your personal photos"] = "Deine privaten Fotos"; +$a->strings["Last Tweets"] = "Neueste Tweets"; +$a->strings["Set twitter search term"] = ""; $a->strings["Set line-height for posts and comments"] = "Liniengröße für Beiträge und Kommantare festlegen"; $a->strings["Set resolution for middle column"] = "Auflösung für die Mittelspalte setzen"; $a->strings["Set color scheme"] = "Wähle Farbschema"; @@ -1411,9 +1418,9 @@ $a->strings["October"] = "Oktober"; $a->strings["November"] = "November"; $a->strings["December"] = "Dezember"; $a->strings["bytes"] = "Byte"; -$a->strings["Categories:"] = "Kategorien:"; $a->strings["remove"] = "löschen"; $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"; @@ -1480,10 +1487,6 @@ $a->strings["All Networks"] = "Alle Netzwerke"; $a->strings["Saved Folders"] = "Gespeicherte Ordner"; $a->strings["Everything"] = "Alles"; $a->strings["Categories"] = "Kategorien"; -$a->strings["%d friend in common"] = array( - 0 => "%d gemeinsamer Freund", - 1 => "%d gemeinsame Freunde", -); $a->strings["Logged out."] = "Abgemeldet."; $a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Beim versuch dich mit der von dir angegebenen OpenID anzumelden trat ein Problem auf. Bitte überprüfe dass du die OpenID richtig geschrieben hast."; $a->strings["The error message was:"] = "Die Fehlermeldung lautete:"; diff --git a/view/remote_friends_common.tpl b/view/remote_friends_common.tpl index fa66c4731..9e0562878 100644 --- a/view/remote_friends_common.tpl +++ b/view/remote_friends_common.tpl @@ -1,5 +1,5 @@ <div id="remote-friends-in-common" class="bigwidget"> - <div id="rfic-desc">$desc <a href="$base/common/rem/$uid/$cid">$more</a></div> + <div id="rfic-desc">$desc {{ if $linkmore }}<a href="$base/common/rem/$uid/$cid">$more</a>{{ endif }}</div> {{ if $items }} {{ for $items as $item }} <div class="profile-match-wrapper"> diff --git a/view/theme/diabook/diabook-dark/custom_tinymce.css b/view/theme/diabook/diabook-dark/custom_tinymce.css new file mode 100644 index 000000000..7932653b6 --- /dev/null +++ b/view/theme/diabook/diabook-dark/custom_tinymce.css @@ -0,0 +1,41 @@ +body, td, pre {color:#000; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:14px; margin:8px;} +body {background:#FFF;} +body.mceForceColors {background:#FFF; color:#000;} +h1 {font-size: 2em} +h2 {font-size: 1.5em} +h3 {font-size: 1.17em} +h4 {font-size: 1em} +h5 {font-size: .83em} +h6 {font-size: .75em} +.mceItemTable, .mceItemTable td, .mceItemTable th, .mceItemTable caption, .mceItemVisualAid {border: 1px dashed #BBB;} +a.mceItemAnchor {display:inline-block; width:11px !important; height:11px !important; background:url(img/items.gif) no-repeat 0 0;} +td.mceSelected, th.mceSelected {background-color:#3399ff !important} +img {border:0;} +table {cursor:default} +table td, table th {cursor:text} +ins {border-bottom:1px solid green; text-decoration: none; color:green} +del {color:red; text-decoration:line-through} +cite {border-bottom:1px dashed blue} +acronym {border-bottom:1px dotted #CCC; cursor:help} +abbr {border-bottom:1px dashed #CCC; cursor:help} + +/* IE */ +* html body { +scrollbar-3dlight-color:#F0F0EE; +scrollbar-arrow-color:#676662; +scrollbar-base-color:#F0F0EE; +scrollbar-darkshadow-color:#DDD; +scrollbar-face-color:#E0E0DD; +scrollbar-highlight-color:#F0F0EE; +scrollbar-shadow-color:#F0F0EE; +scrollbar-track-color:#F5F5F5; +} + +img:-moz-broken {-moz-force-broken-image-icon:1; width:24px; height:24px} +font[face=mceinline] {font-family:inherit !important} + + +object { + display: block; width: 400px; + background: #cccccc url(../images/plugin.png) no-repeat center center; +} diff --git a/view/theme/diabook/diabook-dark/style-network.css b/view/theme/diabook/diabook-dark/style-network.css index 43541d266..d9e2d0094 100644 --- a/view/theme/diabook/diabook-dark/style-network.css +++ b/view/theme/diabook/diabook-dark/style-network.css @@ -522,9 +522,6 @@ header { background: #1d1f1d; background-color: #1d1f1d; z-index: 100; - border-bottom: 1px; - border-bottom-color: black; - border-bottom-style: inset; } header #site-location { display: none; @@ -567,9 +564,7 @@ nav { background: #1d1f1d; color: #2e2f2e; z-index: 99; - border-bottom: 1px; - border-bottom-color: black; - border-bottom-style: inset; + } nav a, nav a:active, diff --git a/view/theme/diabook/diabook-dark/style-profile.css b/view/theme/diabook/diabook-dark/style-profile.css index 3ecad85af..4b6bc15b5 100644 --- a/view/theme/diabook/diabook-dark/style-profile.css +++ b/view/theme/diabook/diabook-dark/style-profile.css @@ -522,9 +522,7 @@ header { background: #1d1f1d; background-color: #1d1f1d; z-index: 100; - border-bottom: 1px; - border-bottom-color: black; - border-bottom-style: inset; + } header #site-location { display: none; @@ -567,9 +565,7 @@ nav { background: #1d1f1d; color: #2e2f2e; z-index: 99; - border-bottom: 1px; - border-bottom-color: black; - border-bottom-style: inset; + } nav a, nav a:active, diff --git a/view/theme/diabook/diabook-dark/style.css b/view/theme/diabook/diabook-dark/style.css index f00973085..fdc4e6481 100644 --- a/view/theme/diabook/diabook-dark/style.css +++ b/view/theme/diabook/diabook-dark/style.css @@ -7,6 +7,18 @@ /* = Admin = */ /* ========= */ +#fancybox-content { + width: 0; + height: 0; + padding: 0; + outline: none; + position: relative; + overflow: hidden; + z-index: 1102; + border: 0px solid #fff; + background: #2e2e2f !important; +} + #adminpage { /* width: 80%;*/ } @@ -576,9 +588,6 @@ header { background: #0c0e0c; background-color: #1d1f1d; z-index: 100; - border-bottom: 1px; - border-bottom-color: black; - border-bottom-style: inset; } header #site-location { display: none; @@ -701,10 +710,7 @@ nav { background: #1d1f1d; color: #2e2f2e; z-index: 99; - border-bottom: 1px; - border-bottom-color: black; - border-bottom-style: inset; -} + } nav a, nav a:active, nav a:visited, @@ -1401,7 +1407,7 @@ body .pageheader{ padding-top: 10px; } .tread-wrapper a{ - color: #1872A2; + /* color: #1872A2; */ } .wall-item-decor { |