clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote branch 'upstream/master'

This commit is contained in:
zottel 2012-05-09 09:27:23 +02:00
parent 78429926bc 70a07086ad
commit d92be9d93c
14 changed files with 632 additions and 479 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
boot.php
View File

@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php'); require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '2.3.1335' ); define ( 'FRIENDICA_VERSION', '2.3.1336' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1143 ); define ( 'DB_UPDATE_VERSION', 1143 );
@ -29,6 +29,12 @@ define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
define ( 'JPEG_QUALITY', 100 ); define ( 'JPEG_QUALITY', 100 );
/**
* Not yet used
*/
define ( 'DEFAULT_DB_ENGINE', 'MyISAM' );
/** /**
* SSL redirection policies * SSL redirection policies
*/ */

3
include/contact_widgets.php
View File

@ -183,7 +183,8 @@ function common_friends_visitor_widget($profile_uid) {
'$desc' => sprintf( tt("%d contact in common", "%d contacts in common", $t), $t), '$desc' => sprintf( tt("%d contact in common", "%d contacts in common", $t), $t),
'$base' => $a->get_baseurl(), '$base' => $a->get_baseurl(),
'$uid' => $profile_uid, '$uid' => $profile_uid,
'$cid' => $cid, '$cid' => (($cid) ? $cid : '0'),
'$linkmore' => (($t > 5) ? 'true' : ''),
'$more' => t('show more'), '$more' => t('show more'),
'$items' => $r '$items' => $r
)); ));

4
include/expire.php
View File

@ -32,6 +32,10 @@ function expire_run($argv, $argc){
// physically remove anything that has been deleted for more than two months // 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"); $r = q("delete from item where deleted = 1 and changed < UTC_TIMESTAMP() - INTERVAL 60 DAY");
// make this optional as it could have a performance impact on large sites
if(intval(get_config('system','optimize_items')))
q("optimize table item"); q("optimize table item");
logger('expire: start'); logger('expire: start');

6
include/text.php
View File

@ -1524,3 +1524,9 @@ function fix_mce_lf($s) {
$s = str_replace("\n\n","\n",$s); $s = str_replace("\n\n","\n",$s);
return $s; return $s;
} }
function protect_sprintf($s) {
return(str_replace('%','%%',$s));
}

23
mod/message.php
View File

@ -173,15 +173,22 @@ function message_content(&$a) {
$preselect = (isset($a->argv[2])?array($a->argv[2]):false); $preselect = (isset($a->argv[2])?array($a->argv[2]):false);
if(defined('EMAIL_AUTOCOMP')) {
// 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 .'" />';
}
else {
// the ugly select box
$select = contact_select('messageto','message-to-select', $preselect, 4, true, false, false, 10); $select = contact_select('messageto','message-to-select', $preselect, 4, true, false, false, 10);
}
// 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)
// $select = '<input type="text" id="recip" name="messageto" value="' . $preselect .'" />';
$tpl = get_markup_template('prv_message.tpl'); $tpl = get_markup_template('prv_message.tpl');
$o .= replace_macros($tpl,array( $o .= replace_macros($tpl,array(

16
mod/network.php
View File

@ -340,7 +340,7 @@ function network_content(&$a, $update = 0) {
info( t('Group is empty')); 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; $o = '<h2>' . t('Group: ') . $r[0]['name'] . '</h2>' . $o;
} }
elseif($cid) { elseif($cid) {
@ -398,9 +398,9 @@ function network_content(&$a, $update = 0) {
if(x($_GET,'search')) { if(x($_GET,'search')) {
$search = escape_tags($_GET['search']); $search = escape_tags($_GET['search']);
$sql_extra .= sprintf(" AND ( `item`.`body` REGEXP '%s' OR `item`.`tag` REGEXP '%s' ) ", $sql_extra .= sprintf(" AND ( `item`.`body` like '%s' OR `item`.`tag` like '%s' ) ",
dbesc(preg_quote($search)), dbesc(protect_sprintf('%' . $search . '%')),
dbesc('\\]' . preg_quote($search) . '\\[') dbesc(protect_sprintf('%]' . $search . '[%'))
); );
} }
if(strlen($file)) { if(strlen($file)) {
@ -412,10 +412,10 @@ function network_content(&$a, $update = 0) {
$myurl = substr($myurl,strpos($myurl,'://')+3); $myurl = substr($myurl,strpos($myurl,'://')+3);
$myurl = str_replace(array('www.','.'),array('','\\.'),$myurl); $myurl = str_replace(array('www.','.'),array('','\\.'),$myurl);
$diasp_url = str_replace('/profile/','/u/',$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' )) ", $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($myurl . '$'), dbesc(protect_sprintf('%s' . $myurl)),
dbesc($myurl . '\\]'), dbesc(protect_sprintf('%' . $myurl . '\\]%')),
dbesc($diasp_url . '\\]') dbesc(protect_sprintf('%' . $diasp_url . '\\]%'))
); );
} }

242
util/messages.po
View File

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2.3.1335\n" "Project-Id-Version: 2.3.1336\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -158,9 +158,8 @@ msgstr ""
#: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102 #: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102
#: ../../addon/posterous/posterous.php:90 #: ../../addon/posterous/posterous.php:90
#: ../../view/theme/cleanzero/config.php:80 #: ../../view/theme/cleanzero/config.php:80
#: ../../view/theme/diabook/theme.php:607 #: ../../view/theme/diabook/theme.php:683
#: ../../view/theme/diabook/theme.php:642 #: ../../view/theme/diabook/config.php:190
#: ../../view/theme/diabook/config.php:107
#: ../../view/theme/quattro/config.php:52 ../../view/theme/dispy/config.php:70 #: ../../view/theme/quattro/config.php:52 ../../view/theme/dispy/config.php:70
#: ../../include/conversation.php:555 #: ../../include/conversation.php:555
msgid "Submit" msgid "Submit"
@ -220,7 +219,7 @@ msgstr ""
msgid "link to source" msgid "link to source"
msgstr "" 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 #: ../../include/nav.php:52 ../../boot.php:1493
msgid "Events" msgid "Events"
msgstr "" msgstr ""
@ -353,7 +352,7 @@ msgstr ""
#: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php:879 #: ../../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:950 ../../mod/photos.php:965 ../../mod/photos.php:1382
#: ../../mod/photos.php:1394 ../../addon/communityhome/communityhome.php:110 #: ../../mod/photos.php:1394 ../../addon/communityhome/communityhome.php:110
#: ../../view/theme/diabook/theme.php:522 #: ../../view/theme/diabook/theme.php:526
msgid "Contact Photos" msgid "Contact Photos"
msgstr "" msgstr ""
@ -376,7 +375,7 @@ msgstr ""
#: ../../mod/profile_photo.php:74 ../../mod/profile_photo.php:174 #: ../../mod/profile_photo.php:74 ../../mod/profile_photo.php:174
#: ../../mod/profile_photo.php:252 ../../mod/profile_photo.php:261 #: ../../mod/profile_photo.php:252 ../../mod/profile_photo.php:261
#: ../../addon/communityhome/communityhome.php:111 #: ../../addon/communityhome/communityhome.php:111
#: ../../view/theme/diabook/theme.php:523 #: ../../view/theme/diabook/theme.php:527
msgid "Profile Photos" msgid "Profile Photos"
msgstr "" msgstr ""
@ -398,7 +397,7 @@ msgstr ""
#: ../../mod/photos.php:528 ../../mod/like.php:127 ../../mod/tagger.php:70 #: ../../mod/photos.php:528 ../../mod/like.php:127 ../../mod/tagger.php:70
#: ../../addon/communityhome/communityhome.php:163 #: ../../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/diaspora.php:1654 ../../include/conversation.php:53
#: ../../include/conversation.php:126 #: ../../include/conversation.php:126
msgid "photo" msgid "photo"
@ -533,8 +532,8 @@ msgid "Share"
msgstr "" msgstr ""
#: ../../mod/photos.php:1214 ../../mod/editpost.php:104 #: ../../mod/photos.php:1214 ../../mod/editpost.php:104
#: ../../mod/wallmessage.php:145 ../../mod/message.php:199 #: ../../mod/wallmessage.php:145 ../../mod/message.php:206
#: ../../mod/message.php:391 ../../include/conversation.php:361 #: ../../mod/message.php:398 ../../include/conversation.php:361
#: ../../include/conversation.php:706 ../../include/conversation.php:983 #: ../../include/conversation.php:706 ../../include/conversation.php:983
msgid "Please wait" msgid "Please wait"
msgstr "" msgstr ""
@ -573,7 +572,7 @@ msgstr ""
msgid "Not available." msgid "Not available."
msgstr "" 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 #: ../../include/nav.php:101
msgid "Community" msgid "Community"
msgstr "" msgstr ""
@ -632,7 +631,7 @@ msgid "Edit"
msgstr "" msgstr ""
#: ../../mod/editpost.php:96 ../../mod/wallmessage.php:143 #: ../../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 #: ../../include/conversation.php:965
msgid "Upload photo" msgid "Upload photo"
msgstr "" msgstr ""
@ -642,7 +641,7 @@ msgid "Attach file"
msgstr "" msgstr ""
#: ../../mod/editpost.php:98 ../../mod/wallmessage.php:144 #: ../../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 #: ../../include/conversation.php:969
msgid "Insert web link" msgid "Insert web link"
msgstr "" msgstr ""
@ -768,7 +767,7 @@ msgstr ""
msgid "Invalid profile URL." msgid "Invalid profile URL."
msgstr "" msgstr ""
#: ../../mod/dfrn_request.php:476 ../../mod/follow.php:20 #: ../../mod/dfrn_request.php:476 ../../mod/follow.php:23
msgid "Disallowed profile URL." msgid "Disallowed profile URL."
msgstr "" msgstr ""
@ -1215,7 +1214,7 @@ msgstr ""
msgid "Personal" msgid "Personal"
msgstr "" 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 #: ../../include/nav.php:77 ../../include/nav.php:115
msgid "Home" msgid "Home"
msgstr "" msgstr ""
@ -1656,7 +1655,7 @@ msgstr ""
msgid "Edit contact" msgid "Edit contact"
msgstr "" 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 #: ../../include/nav.php:139
msgid "Contacts" msgid "Contacts"
msgstr "" msgstr ""
@ -1776,7 +1775,8 @@ msgid "Remove account"
msgstr "" msgstr ""
#: ../../mod/settings.php:88 ../../mod/admin.php:735 ../../mod/admin.php:940 #: ../../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" msgid "Settings"
msgstr "" msgstr ""
@ -2397,7 +2397,7 @@ msgstr ""
msgid "Please enter a link URL:" msgid "Please enter a link URL:"
msgstr "" msgstr ""
#: ../../mod/wallmessage.php:131 ../../mod/message.php:188 #: ../../mod/wallmessage.php:131 ../../mod/message.php:195
msgid "Send Private Message" msgid "Send Private Message"
msgstr "" msgstr ""
@ -2408,18 +2408,18 @@ msgid ""
"your site allow private mail from unknown senders." "your site allow private mail from unknown senders."
msgstr "" msgstr ""
#: ../../mod/wallmessage.php:133 ../../mod/message.php:189 #: ../../mod/wallmessage.php:133 ../../mod/message.php:196
#: ../../mod/message.php:381 #: ../../mod/message.php:388
msgid "To:" msgid "To:"
msgstr "" msgstr ""
#: ../../mod/wallmessage.php:134 ../../mod/message.php:190 #: ../../mod/wallmessage.php:134 ../../mod/message.php:197
#: ../../mod/message.php:382 #: ../../mod/message.php:389
msgid "Subject:" msgid "Subject:"
msgstr "" msgstr ""
#: ../../mod/wallmessage.php:140 ../../mod/message.php:194 #: ../../mod/wallmessage.php:140 ../../mod/message.php:201
#: ../../mod/message.php:385 ../../mod/invite.php:113 #: ../../mod/message.php:392 ../../mod/invite.php:113
msgid "Your message:" msgid "Your message:"
msgstr "" msgstr ""
@ -2601,7 +2601,7 @@ msgstr ""
msgid "Profile Visibility Editor" msgid "Profile Visibility Editor"
msgstr "" 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/profile_advanced.php:7 ../../include/profile_advanced.php:74
#: ../../include/nav.php:50 ../../boot.php:1478 #: ../../include/nav.php:50 ../../boot.php:1478
msgid "Profile" msgid "Profile"
@ -2787,8 +2787,8 @@ msgstr ""
#: ../../addon/facebook/facebook.php:1564 #: ../../addon/facebook/facebook.php:1564
#: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:158
#: ../../addon/communityhome/communityhome.php:167 #: ../../addon/communityhome/communityhome.php:167
#: ../../view/theme/diabook/theme.php:489 #: ../../view/theme/diabook/theme.php:493
#: ../../view/theme/diabook/theme.php:498 ../../include/diaspora.php:1654 #: ../../view/theme/diabook/theme.php:502 ../../include/diaspora.php:1654
#: ../../include/conversation.php:48 ../../include/conversation.php:57 #: ../../include/conversation.php:48 ../../include/conversation.php:57
#: ../../include/conversation.php:121 ../../include/conversation.php:130 #: ../../include/conversation.php:121 ../../include/conversation.php:130
msgid "status" msgid "status"
@ -2796,7 +2796,7 @@ msgstr ""
#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1568 #: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1568
#: ../../addon/communityhome/communityhome.php:172 #: ../../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 #: ../../include/conversation.php:65
#, php-format #, php-format
msgid "%1$s likes %2$s's %3$s" msgid "%1$s likes %2$s's %3$s"
@ -2817,7 +2817,7 @@ msgstr ""
msgid "Access denied." msgid "Access denied."
msgstr "" 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 #: ../../include/nav.php:51 ../../boot.php:1484
msgid "Photos" msgid "Photos"
msgstr "" msgstr ""
@ -2974,55 +2974,55 @@ msgstr ""
msgid "Conversation removed." msgid "Conversation removed."
msgstr "" msgstr ""
#: ../../mod/message.php:230 #: ../../mod/message.php:237
msgid "No messages." msgid "No messages."
msgstr "" msgstr ""
#: ../../mod/message.php:237 #: ../../mod/message.php:244
#, php-format #, php-format
msgid "Unknown sender - %s" msgid "Unknown sender - %s"
msgstr "" msgstr ""
#: ../../mod/message.php:240 #: ../../mod/message.php:247
#, php-format #, php-format
msgid "You and %s" msgid "You and %s"
msgstr "" msgstr ""
#: ../../mod/message.php:243 #: ../../mod/message.php:250
#, php-format #, php-format
msgid "%s and You" msgid "%s and You"
msgstr "" msgstr ""
#: ../../mod/message.php:253 ../../mod/message.php:374 #: ../../mod/message.php:260 ../../mod/message.php:381
msgid "Delete conversation" msgid "Delete conversation"
msgstr "" msgstr ""
#: ../../mod/message.php:256 #: ../../mod/message.php:263
msgid "D, d M Y - g:i A" msgid "D, d M Y - g:i A"
msgstr "" msgstr ""
#: ../../mod/message.php:258 #: ../../mod/message.php:265
#, php-format #, php-format
msgid "%d message" msgid "%d message"
msgid_plural "%d messages" msgid_plural "%d messages"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: ../../mod/message.php:293 #: ../../mod/message.php:300
msgid "Message not available." msgid "Message not available."
msgstr "" msgstr ""
#: ../../mod/message.php:358 #: ../../mod/message.php:365
msgid "Delete message" msgid "Delete message"
msgstr "" msgstr ""
#: ../../mod/message.php:376 #: ../../mod/message.php:383
msgid "" msgid ""
"No secure communications available. You <strong>may</strong> be able to " "No secure communications available. You <strong>may</strong> be able to "
"respond from the sender's profile page." "respond from the sender's profile page."
msgstr "" msgstr ""
#: ../../mod/message.php:380 #: ../../mod/message.php:387
msgid "Send Reply" msgid "Send Reply"
msgstr "" msgstr ""
@ -3577,7 +3577,7 @@ msgstr ""
msgid "Log level" msgid "Log level"
msgstr "" msgstr ""
#: ../../mod/admin.php:1121 ../../view/theme/diabook/theme.php:652 #: ../../mod/admin.php:1121
msgid "Close" msgid "Close"
msgstr "" msgstr ""
@ -3672,48 +3672,58 @@ msgstr ""
msgid "Login failed." msgid "Login failed."
msgstr "" msgstr ""
#: ../../mod/follow.php:27 #: ../../mod/follow.php:30
msgid "Connect URL missing." msgid "Connect URL missing."
msgstr "" msgstr ""
#: ../../mod/follow.php:47 #: ../../mod/follow.php:56
msgid "" msgid ""
"This site is not configured to allow communications with other networks." "This site is not configured to allow communications with other networks."
msgstr "" 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." msgid "No compatible communication protocols or feeds were discovered."
msgstr "" msgstr ""
#: ../../mod/follow.php:61 #: ../../mod/follow.php:70
msgid "The profile address specified does not provide adequate information." msgid "The profile address specified does not provide adequate information."
msgstr "" msgstr ""
#: ../../mod/follow.php:65 #: ../../mod/follow.php:74
msgid "An author or name was not found." msgid "An author or name was not found."
msgstr "" msgstr ""
#: ../../mod/follow.php:67 #: ../../mod/follow.php:76
msgid "No browser URL could be matched to this address." msgid "No browser URL could be matched to this address."
msgstr "" 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 "" msgid ""
"The profile address specified belongs to a network which has been disabled " "The profile address specified belongs to a network which has been disabled "
"on this site." "on this site."
msgstr "" msgstr ""
#: ../../mod/follow.php:79 #: ../../mod/follow.php:90
msgid "" msgid ""
"Limited profile. This person will be unable to receive direct/personal " "Limited profile. This person will be unable to receive direct/personal "
"notifications from you." "notifications from you."
msgstr "" msgstr ""
#: ../../mod/follow.php:149 #: ../../mod/follow.php:160
msgid "Unable to retrieve contact information." msgid "Unable to retrieve contact information."
msgstr "" msgstr ""
#: ../../mod/follow.php:195 #: ../../mod/follow.php:206
msgid "following" msgid "following"
msgstr "" msgstr ""
@ -4063,7 +4073,7 @@ msgstr ""
msgid "No entries." msgid "No entries."
msgstr "" 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 #: ../../include/contact_widgets.php:34
msgid "Friend Suggestions" msgid "Friend Suggestions"
msgstr "" msgstr ""
@ -4083,7 +4093,7 @@ msgstr ""
msgid "%s [%s]" msgid "%s [%s]"
msgstr "" msgstr ""
#: ../../mod/directory.php:47 ../../view/theme/diabook/theme.php:548 #: ../../mod/directory.php:47 ../../view/theme/diabook/theme.php:552
msgid "Global Directory" msgid "Global Directory"
msgstr "" msgstr ""
@ -4668,7 +4678,7 @@ msgid "Latest likes"
msgstr "" msgstr ""
#: ../../addon/communityhome/communityhome.php:155 #: ../../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 #: ../../include/conversation.php:45 ../../include/conversation.php:118
msgid "event" msgid "event"
msgstr "" msgstr ""
@ -5564,7 +5574,7 @@ msgid "Post to Posterous by default"
msgstr "" msgstr ""
#: ../../view/theme/cleanzero/config.php:82 #: ../../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 #: ../../view/theme/quattro/config.php:54 ../../view/theme/dispy/config.php:72
msgid "Theme settings" msgid "Theme settings"
msgstr "" msgstr ""
@ -5574,7 +5584,7 @@ msgid "Set resize level for images in posts and comments (width and height)"
msgstr "" msgstr ""
#: ../../view/theme/cleanzero/config.php:84 #: ../../view/theme/cleanzero/config.php:84
#: ../../view/theme/diabook/config.php:110 #: ../../view/theme/diabook/config.php:193
#: ../../view/theme/dispy/config.php:73 #: ../../view/theme/dispy/config.php:73
msgid "Set font-size for posts and comments" msgid "Set font-size for posts and comments"
msgstr "" msgstr ""
@ -5588,118 +5598,168 @@ msgstr ""
msgid "Color scheme" msgid "Color scheme"
msgstr "" 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 #: ../../include/nav.php:115
msgid "Your posts and conversations" msgid "Your posts and conversations"
msgstr "" 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" msgid "Your profile page"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:64 #: ../../view/theme/diabook/theme.php:125
msgid "Your contacts" msgid "Your contacts"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:65 ../../include/nav.php:51 #: ../../view/theme/diabook/theme.php:126 ../../include/nav.php:51
msgid "Your photos" msgid "Your photos"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:66 ../../include/nav.php:52 #: ../../view/theme/diabook/theme.php:127 ../../include/nav.php:52
msgid "Your events" msgid "Your events"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:67 ../../include/nav.php:53 #: ../../view/theme/diabook/theme.php:128 ../../include/nav.php:53
msgid "Personal notes" msgid "Personal notes"
msgstr "" 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" msgid "Your personal photos"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:69 #: ../../view/theme/diabook/theme.php:130
#: ../../view/theme/diabook/theme.php:567 #: ../../view/theme/diabook/theme.php:571
msgid "Community Pages" msgid "Community Pages"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:414 #: ../../view/theme/diabook/theme.php:418
msgid "Community Profiles" msgid "Community Profiles"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:435 #: ../../view/theme/diabook/theme.php:439
msgid "Last users" msgid "Last users"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:464 #: ../../view/theme/diabook/theme.php:468
msgid "Last likes" msgid "Last likes"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:509 #: ../../view/theme/diabook/theme.php:513
msgid "Last photos" msgid "Last photos"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:546 #: ../../view/theme/diabook/theme.php:550
msgid "Find Friends" msgid "Find Friends"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:547 #: ../../view/theme/diabook/theme.php:551
msgid "Local Directory" msgid "Local Directory"
msgstr "" 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" msgid "Similar Interests"
msgstr "" 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" msgid "Invite Friends"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:602 #: ../../view/theme/diabook/theme.php:606
msgid "Earth Layers" msgid "Earth Layers"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:608 #: ../../view/theme/diabook/theme.php:611
#: ../../view/theme/diabook/config.php:115 #: ../../view/theme/diabook/config.php:198
msgid "Set zoomfactor for Earth Layer" msgid "Set zoomfactor for Earth Layer"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:609 #: ../../view/theme/diabook/theme.php:612
#: ../../view/theme/diabook/config.php:116 #: ../../view/theme/diabook/config.php:199
msgid "Set longitude (X) for Earth Layer" msgid "Set longitude (X) for Earth Layer"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:610 #: ../../view/theme/diabook/theme.php:613
#: ../../view/theme/diabook/config.php:117 #: ../../view/theme/diabook/config.php:200
msgid "Set latitude (Y) for Earth Layer" msgid "Set latitude (Y) for Earth Layer"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:625 #: ../../view/theme/diabook/theme.php:626
msgid "Help or @NewHere ?" msgid "Help or @NewHere ?"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:632 #: ../../view/theme/diabook/theme.php:633
msgid "Connect Services" msgid "Connect Services"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:639 #: ../../view/theme/diabook/theme.php:640
msgid "Last Tweets" msgid "Last Tweets"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:643 #: ../../view/theme/diabook/theme.php:643
#: ../../view/theme/diabook/config.php:114 #: ../../view/theme/diabook/config.php:197
msgid "Set twitter search term" msgid "Set twitter search term"
msgstr "" 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 #: ../../view/theme/dispy/config.php:74
msgid "Set line-height for posts and comments" msgid "Set line-height for posts and comments"
msgstr "" msgstr ""
#: ../../view/theme/diabook/config.php:112 #: ../../view/theme/diabook/config.php:195
msgid "Set resolution for middle column" msgid "Set resolution for middle column"
msgstr "" msgstr ""
#: ../../view/theme/diabook/config.php:113 #: ../../view/theme/diabook/config.php:196
msgid "Set color scheme" msgid "Set color scheme"
msgstr "" msgstr ""
@ -6108,11 +6168,11 @@ msgstr ""
msgid "Finishes:" msgid "Finishes:"
msgstr "" msgstr ""
#: ../../include/delivery.php:445 ../../include/notifier.php:652 #: ../../include/delivery.php:452 ../../include/notifier.php:652
msgid "(no subject)" msgid "(no subject)"
msgstr "" msgstr ""
#: ../../include/delivery.php:452 ../../include/enotify.php:23 #: ../../include/delivery.php:459 ../../include/enotify.php:23
#: ../../include/notifier.php:659 #: ../../include/notifier.php:659
msgid "noreply" msgid "noreply"
msgstr "" msgstr ""
@ -6586,7 +6646,7 @@ msgstr ""
msgid "%1$d %2$s ago" msgid "%1$d %2$s ago"
msgstr "" msgstr ""
#: ../../include/onepoll.php:402 #: ../../include/onepoll.php:406
msgid "From: " msgid "From: "
msgstr "" msgstr ""

692
view/de/messages.po
View File

File diff suppressed because it is too large Load Diff

37
view/de/strings.php
View File

@ -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["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["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["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["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["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."; $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["Unable to retrieve contact information."] = "Konnte die Kontaktinformationen nicht empfangen.";
$a->strings["following"] = "folgen"; $a->strings["following"] = "folgen";
$a->strings["Common Friends"] = "Gemeinsame Freunde"; $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["Item has been removed."] = "Eintrag wurde entfernt.";
$a->strings["Applications"] = "Anwendungen"; $a->strings["Applications"] = "Anwendungen";
$a->strings["No installed applications."] = "Keine Applikationen installiert."; $a->strings["No installed applications."] = "Keine Applikationen installiert.";
@ -854,8 +856,7 @@ $a->strings["Location"] = "Wohnort";
$a->strings["Profile updated."] = "Profil aktualisiert."; $a->strings["Profile updated."] = "Profil aktualisiert.";
$a->strings[" and "] = " und "; $a->strings[" and "] = " und ";
$a->strings["public profile"] = "öffentliches Profil"; $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["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "%1\$s hat %2\$s geändert auf &ldquo;%3\$s&rdquo;";
$a->strings[" - Visit %1\$s's %2\$s"] = " - %1\$s's %2\$s besuchen";
$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s hat folgendes aktualisiert %2\$s, verändert wurde %3\$s."; $a->strings["%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 deleted."] = "Profil gelöscht.";
$a->strings["Profile-"] = "Profil-"; $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["Remove Facebook connector"] = "Facebook-Connector entfernen";
$a->strings["Re-authenticate [This is necessary whenever your Facebook password is changed.]"] = "Neu authentifizieren [Das ist immer dann nötig, wenn Du Dein Facebook-Passwort geändert hast.]"; $a->strings["Re-authenticate [This is necessary whenever your Facebook password is changed.]"] = "Neu authentifizieren [Das ist immer dann nötig, wenn Du Dein Facebook-Passwort geändert hast.]";
$a->strings["Post to Facebook by default"] = "Veröffentliche standardmäßig bei Facebook"; $a->strings["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["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["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."; $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["NSFW Settings saved."] = "NSFW-Einstellungen gespeichert";
$a->strings["%s - Click to open/close"] = "%s – Zum Öffnen/Schließen klicken"; $a->strings["%s - Click to open/close"] = "%s – Zum Öffnen/Schließen klicken";
$a->strings["Forums"] = "Foren"; $a->strings["Forums"] = "Foren";
$a->strings["show more"] = "mehr anzeigen";
$a->strings["Planets Settings"] = "Planeten Einstellungen"; $a->strings["Planets Settings"] = "Planeten Einstellungen";
$a->strings["Enable Planets Plugin"] = "Aktiviere Planeten Plugin"; $a->strings["Enable Planets Plugin"] = "Aktiviere Planeten Plugin";
$a->strings["Login"] = "Anmeldung"; $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["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["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 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["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["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"; $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["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 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 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["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["Community Profiles"] = "Community-Profile";
$a->strings["Last users"] = "Letzte Nutzer"; $a->strings["Last users"] = "Letzte Nutzer";
$a->strings["Last likes"] = "Zuletzt gemocht"; $a->strings["Last likes"] = "Zuletzt gemocht";
@ -1265,16 +1277,11 @@ $a->strings["Find Friends"] = "Freunde finden";
$a->strings["Local Directory"] = "Lokales Verzeichnis"; $a->strings["Local Directory"] = "Lokales Verzeichnis";
$a->strings["Similar Interests"] = "Ähnliche Interessen"; $a->strings["Similar Interests"] = "Ähnliche Interessen";
$a->strings["Invite Friends"] = "Freunde einladen"; $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["Help or @NewHere ?"] = "Hilfe oder @NewHere";
$a->strings["Connect Services"] = "Verbinde Dienste"; $a->strings["Connect Services"] = "Verbinde Dienste";
$a->strings["Your posts and conversations"] = "Deine Beiträge und Unterhaltungen"; $a->strings["Last Tweets"] = "Neueste Tweets";
$a->strings["Your profile page"] = "Deine Profilseite"; $a->strings["Set twitter search term"] = "";
$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["Set line-height for posts and comments"] = "Liniengröße für Beiträge und Kommantare festlegen"; $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 resolution for middle column"] = "Auflösung für die Mittelspalte setzen";
$a->strings["Set color scheme"] = "Wähle Farbschema"; $a->strings["Set color scheme"] = "Wähle Farbschema";
@ -1411,9 +1418,9 @@ $a->strings["October"] = "Oktober";
$a->strings["November"] = "November"; $a->strings["November"] = "November";
$a->strings["December"] = "Dezember"; $a->strings["December"] = "Dezember";
$a->strings["bytes"] = "Byte"; $a->strings["bytes"] = "Byte";
$a->strings["Categories:"] = "Kategorien:";
$a->strings["remove"] = "löschen"; $a->strings["remove"] = "löschen";
$a->strings["[remove]"] = "[löschen]"; $a->strings["[remove]"] = "[löschen]";
$a->strings["Categories:"] = "Kategorien:";
$a->strings["Filed under:"] = "Abgelegt unter:"; $a->strings["Filed under:"] = "Abgelegt unter:";
$a->strings["Click to open/close"] = "Zum öffnen/schließen klicken"; $a->strings["Click to open/close"] = "Zum öffnen/schließen klicken";
$a->strings["default"] = "standard"; $a->strings["default"] = "standard";
@ -1480,10 +1487,6 @@ $a->strings["All Networks"] = "Alle Netzwerke";
$a->strings["Saved Folders"] = "Gespeicherte Ordner"; $a->strings["Saved Folders"] = "Gespeicherte Ordner";
$a->strings["Everything"] = "Alles"; $a->strings["Everything"] = "Alles";
$a->strings["Categories"] = "Kategorien"; $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["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["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Beim versuch dich mit der von dir angegebenen OpenID anzumelden trat ein Problem auf. Bitte überprüfe dass du die OpenID richtig geschrieben hast.";
$a->strings["The error message was:"] = "Die Fehlermeldung lautete:"; $a->strings["The error message was:"] = "Die Fehlermeldung lautete:";

2
view/remote_friends_common.tpl
View File

@ -1,5 +1,5 @@
<div id="remote-friends-in-common" class="bigwidget"> <div id="remote-friends-in-common" class="bigwidget">
<div id="rfic-desc">$desc &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="$base/common/rem/$uid/$cid">$more</a></div> <div id="rfic-desc">$desc &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ if $linkmore }}<a href="$base/common/rem/$uid/$cid">$more</a>{{ endif }}</div>
{{ if $items }} {{ if $items }}
{{ for $items as $item }} {{ for $items as $item }}
<div class="profile-match-wrapper"> <div class="profile-match-wrapper">

41
view/theme/diabook/diabook-dark/custom_tinymce.css Normal file
View File

@ -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;
}

7
view/theme/diabook/diabook-dark/style-network.css
View File

@ -522,9 +522,6 @@ header {
background: #1d1f1d; background: #1d1f1d;
background-color: #1d1f1d; background-color: #1d1f1d;
z-index: 100; z-index: 100;
border-bottom: 1px;
border-bottom-color: black;
border-bottom-style: inset;
} }
header #site-location { header #site-location {
display: none; display: none;
@ -567,9 +564,7 @@ nav {
background: #1d1f1d; background: #1d1f1d;
color: #2e2f2e; color: #2e2f2e;
z-index: 99; z-index: 99;
border-bottom: 1px;
border-bottom-color: black;
border-bottom-style: inset;
} }
nav a, nav a,
nav a:active, nav a:active,

8
view/theme/diabook/diabook-dark/style-profile.css
View File

@ -522,9 +522,7 @@ header {
background: #1d1f1d; background: #1d1f1d;
background-color: #1d1f1d; background-color: #1d1f1d;
z-index: 100; z-index: 100;
border-bottom: 1px;
border-bottom-color: black;
border-bottom-style: inset;
} }
header #site-location { header #site-location {
display: none; display: none;
@ -567,9 +565,7 @@ nav {
background: #1d1f1d; background: #1d1f1d;
color: #2e2f2e; color: #2e2f2e;
z-index: 99; z-index: 99;
border-bottom: 1px;
border-bottom-color: black;
border-bottom-style: inset;
} }
nav a, nav a,
nav a:active, nav a:active,

22
view/theme/diabook/diabook-dark/style.css
View File

@ -7,6 +7,18 @@
/* = Admin = */ /* = 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 { #adminpage {
/* width: 80%;*/ /* width: 80%;*/
} }
@ -576,9 +588,6 @@ header {
background: #0c0e0c; background: #0c0e0c;
background-color: #1d1f1d; background-color: #1d1f1d;
z-index: 100; z-index: 100;
border-bottom: 1px;
border-bottom-color: black;
border-bottom-style: inset;
} }
header #site-location { header #site-location {
display: none; display: none;
@ -701,10 +710,7 @@ nav {
background: #1d1f1d; background: #1d1f1d;
color: #2e2f2e; color: #2e2f2e;
z-index: 99; z-index: 99;
border-bottom: 1px; }
border-bottom-color: black;
border-bottom-style: inset;
}
nav a, nav a,
nav a:active, nav a:active,
nav a:visited, nav a:visited,
@ -1401,7 +1407,7 @@ body .pageheader{
padding-top: 10px; padding-top: 10px;
} }
.tread-wrapper a{ .tread-wrapper a{
color: #1872A2; /* color: #1872A2; */
} }
.wall-item-decor { .wall-item-decor {