bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge branch 'master' of https://github.com/friendica/friendica

Browse source
This commit is contained in:
Alexander Kampmann 2012-04-09 14:28:21 +02:00
commit 1370ba5d16
30 changed files with 593 additions and 418 deletions
Download patch file Download diff file Expand all files Collapse all files

2
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.1305' ); define ( 'FRIENDICA_VERSION', '2.3.1306' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1137 ); define ( 'DB_UPDATE_VERSION', 1137 );

10
include/datetime.php
View file

@ -80,6 +80,16 @@ function field_timezone($name='timezone', $label='', $current = 'America/Los_Ang
if(! function_exists('datetime_convert')) { if(! function_exists('datetime_convert')) {
function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d H:i:s") { function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d H:i:s") {
// Defaults to UTC if nothing is set, but throws an exception if set to empty string.
// Provide some sane defaults regardless.
if($from === '')
$from = 'UTC';
if($to === '')
$to = 'UTC';
if($s === '')
$s = 'now';
// Slight hackish adjustment so that 'zero' datetime actually returns what is intended // Slight hackish adjustment so that 'zero' datetime actually returns what is intended
// otherwise we end up with -0001-11-30 ... // otherwise we end up with -0001-11-30 ...
// add 32 days so that we at least get year 00, and then hack around the fact that // add 32 days so that we at least get year 00, and then hack around the fact that

2
mod/dfrn_request.php
View file

@ -180,7 +180,7 @@ function dfrn_request_post(&$a) {
// (ignore reply, nothing we can do it failed) // (ignore reply, nothing we can do it failed)
goaway($dfrn_url); goaway(zrl($dfrn_url));
return; // NOTREACHED return; // NOTREACHED
} }

4
mod/item.php
View file

@ -351,7 +351,7 @@ function item_post(&$a) {
$image_uri = substr($image_uri,0, strpos($image_uri,'-')); $image_uri = substr($image_uri,0, strpos($image_uri,'-'));
if(! strlen($image_uri)) if(! strlen($image_uri))
continue; continue;
$srch = '<' . intval($profile_uid) . '>'; $srch = '<' . intval($contact_record['id']) . '>';
$r = q("SELECT `id` FROM `photo` WHERE `allow_cid` = '%s' AND `allow_gid` = '' AND `deny_cid` = '' AND `deny_gid` = '' $r = q("SELECT `id` FROM `photo` WHERE `allow_cid` = '%s' AND `allow_gid` = '' AND `deny_cid` = '' AND `deny_gid` = ''
AND `resource-id` = '%s' AND `uid` = %d LIMIT 1", AND `resource-id` = '%s' AND `uid` = %d LIMIT 1",
dbesc($srch), dbesc($srch),
@ -447,7 +447,7 @@ function item_post(&$a) {
if(count($tags)) { if(count($tags)) {
foreach($tags as $tag) { foreach($tags as $tag) {
handle_tag($a, $body, $inform, $str_tags, $profile_uid, $tag); handle_tag($a, $body, $inform, $str_tags, (local_user()) ? local_user() : $profile_uid , $tag);
} }
} }

5
mod/wall_attach.php
View file

@ -7,7 +7,7 @@ function wall_attach_post(&$a) {
if($a->argc > 1) { if($a->argc > 1) {
$nick = $a->argv[1]; $nick = $a->argv[1];
$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1", $r = q("SELECT `user`.*, `contact`.`id` FROM `user` LEFT JOIN `contact` on `user`.`uid` = `contact`.`uid` WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1",
dbesc($nick) dbesc($nick)
); );
if(! count($r)) if(! count($r))
@ -21,6 +21,7 @@ function wall_attach_post(&$a) {
$visitor = 0; $visitor = 0;
$page_owner_uid = $r[0]['uid']; $page_owner_uid = $r[0]['uid'];
$page_owner_cid = $r[0]['id'];
$page_owner_nick = $r[0]['nickname']; $page_owner_nick = $r[0]['nickname'];
$community_page = (($r[0]['page-flags'] == PAGE_COMMUNITY) ? true : false); $community_page = (($r[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
@ -73,7 +74,7 @@ function wall_attach_post(&$a) {
dbesc($filedata), dbesc($filedata),
dbesc($created), dbesc($created),
dbesc($created), dbesc($created),
dbesc('<' . $page_owner_uid . '>'), dbesc('<' . $page_owner_cid . '>'),
dbesc(''), dbesc(''),
dbesc(''), dbesc(''),
dbesc('') dbesc('')

8
mod/wall_upload.php
View file

@ -6,7 +6,7 @@ function wall_upload_post(&$a) {
if($a->argc > 1) { if($a->argc > 1) {
$nick = $a->argv[1]; $nick = $a->argv[1];
$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1", $r = q("SELECT `user`.*, `contact`.`id` FROM `user` LEFT JOIN `contact` on `user`.`uid` = `contact`.`uid` WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1",
dbesc($nick) dbesc($nick)
); );
if(! count($r)) if(! count($r))
@ -16,10 +16,13 @@ function wall_upload_post(&$a) {
else else
return; return;
$can_post = false; $can_post = false;
$visitor = 0; $visitor = 0;
$page_owner_uid = $r[0]['uid']; $page_owner_uid = $r[0]['uid'];
$default_cid = $r[0]['id'];
$page_owner_nick = $r[0]['nickname']; $page_owner_nick = $r[0]['nickname'];
$community_page = (($r[0]['page-flags'] == PAGE_COMMUNITY) ? true : false); $community_page = (($r[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
@ -34,6 +37,7 @@ function wall_upload_post(&$a) {
if(count($r)) { if(count($r)) {
$can_post = true; $can_post = true;
$visitor = remote_user(); $visitor = remote_user();
$default_cid = $visitor;
} }
} }
} }
@ -76,7 +80,7 @@ function wall_upload_post(&$a) {
$smallest = 0; $smallest = 0;
$defperm = '<' . $page_owner_uid . '>'; $defperm = '<' . $default_cid . '>';
$r = $ph->store($page_owner_uid, $visitor, $hash, $filename, t('Wall Photos'), 0, 0, $defperm); $r = $ph->store($page_owner_uid, $visitor, $hash, $filename, t('Wall Photos'), 0, 0, $defperm);

628
util/messages.po
View file

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2.3.1305\n" "Project-Id-Version: 2.3.1306\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-04-07 10:00-0700\n" "POT-Creation-Date: 2012-04-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"
@ -54,8 +54,8 @@ msgstr ""
#: ../../mod/display.php:138 ../../mod/profiles.php:7 #: ../../mod/display.php:138 ../../mod/profiles.php:7
#: ../../mod/profiles.php:232 ../../mod/delegate.php:6 #: ../../mod/profiles.php:232 ../../mod/delegate.php:6
#: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81 #: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81
#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:456 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:460
#: ../../include/items.php:3118 ../../index.php:294 #: ../../include/items.php:3118 ../../index.php:306
msgid "Permission denied." msgid "Permission denied."
msgstr "" msgstr ""
@ -132,12 +132,12 @@ msgstr ""
#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:357 #: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:357
#: ../../mod/admin.php:525 ../../mod/admin.php:654 ../../mod/admin.php:826 #: ../../mod/admin.php:525 ../../mod/admin.php:654 ../../mod/admin.php:826
#: ../../mod/admin.php:906 ../../mod/profiles.php:390 ../../mod/invite.php:119 #: ../../mod/admin.php:906 ../../mod/profiles.php:390 ../../mod/invite.php:119
#: ../../addon/facebook/facebook.php:547 ../../addon/yourls/yourls.php:76 #: ../../addon/facebook/facebook.php:551 ../../addon/yourls/yourls.php:76
#: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:57 #: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:57
#: ../../addon/uhremotestorage/uhremotestorage.php:89 #: ../../addon/uhremotestorage/uhremotestorage.php:89
#: ../../addon/randplace/randplace.php:179 ../../addon/dwpost/dwpost.php:93 #: ../../addon/randplace/randplace.php:179 ../../addon/dwpost/dwpost.php:93
#: ../../addon/drpost/drpost.php:110 ../../addon/geonames/geonames.php:187 #: ../../addon/drpost/drpost.php:110 ../../addon/geonames/geonames.php:187
#: ../../addon/oembed.old/oembed.php:41 ../../addon/impressum/impressum.php:69 #: ../../addon/oembed.old/oembed.php:41 ../../addon/impressum/impressum.php:80
#: ../../addon/blockem/blockem.php:57 ../../addon/qcomment/qcomment.php:61 #: ../../addon/blockem/blockem.php:57 ../../addon/qcomment/qcomment.php:61
#: ../../addon/openstreetmap/openstreetmap.php:70 #: ../../addon/openstreetmap/openstreetmap.php:70
#: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:94 #: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:94
@ -147,11 +147,11 @@ msgstr ""
#: ../../addon/statusnet/statusnet.php:318 #: ../../addon/statusnet/statusnet.php:318
#: ../../addon/statusnet/statusnet.php:325 #: ../../addon/statusnet/statusnet.php:325
#: ../../addon/statusnet/statusnet.php:353 #: ../../addon/statusnet/statusnet.php:353
#: ../../addon/statusnet/statusnet.php:547 ../../addon/tumblr/tumblr.php:90 #: ../../addon/statusnet/statusnet.php:553 ../../addon/tumblr/tumblr.php:90
#: ../../addon/numfriends/numfriends.php:85 ../../addon/gnot/gnot.php:88 #: ../../addon/numfriends/numfriends.php:85 ../../addon/gnot/gnot.php:88
#: ../../addon/wppost/wppost.php:102 ../../addon/showmore/showmore.php:48 #: ../../addon/wppost/wppost.php:102 ../../addon/showmore/showmore.php:48
#: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180 #: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180
#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:369 #: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:375
#: ../../addon/posterous/posterous.php:90 #: ../../addon/posterous/posterous.php:90
#: ../../view/theme/quattro/config.php:21 ../../include/conversation.php:555 #: ../../view/theme/quattro/config.php:21 ../../include/conversation.php:555
msgid "Submit" msgid "Submit"
@ -211,11 +211,11 @@ msgstr ""
msgid "link to source" msgid "link to source"
msgstr "" msgstr ""
#: ../../mod/events.php:296 ../../view/theme/diabook-red/theme.php:240 #: ../../mod/events.php:296 ../../view/theme/diabook-red/theme.php:244
#: ../../view/theme/diabook-blue/theme.php:240 #: ../../view/theme/diabook-blue/theme.php:244
#: ../../view/theme/diabook/theme.php:248 #: ../../view/theme/diabook/theme.php:251
#: ../../view/theme/diabook-aerith/theme.php:240 ../../include/nav.php:52 #: ../../view/theme/diabook-aerith/theme.php:245 ../../include/nav.php:52
#: ../../boot.php:1421 #: ../../boot.php:1422
msgid "Events" msgid "Events"
msgstr "" msgstr ""
@ -265,7 +265,7 @@ msgid "Description:"
msgstr "" msgstr ""
#: ../../mod/events.php:395 ../../include/event.php:37 #: ../../mod/events.php:395 ../../include/event.php:37
#: ../../include/bb2diaspora.php:260 ../../boot.php:1042 #: ../../include/bb2diaspora.php:260 ../../boot.php:1043
msgid "Location:" msgid "Location:"
msgstr "" msgstr ""
@ -347,10 +347,10 @@ msgstr ""
#: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php:880 #: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php:880
#: ../../mod/photos.php:951 ../../mod/photos.php:966 ../../mod/photos.php:1383 #: ../../mod/photos.php:951 ../../mod/photos.php:966 ../../mod/photos.php:1383
#: ../../mod/photos.php:1395 ../../addon/communityhome/communityhome.php:110 #: ../../mod/photos.php:1395 ../../addon/communityhome/communityhome.php:110
#: ../../view/theme/diabook-red/theme.php:110 #: ../../view/theme/diabook-red/theme.php:114
#: ../../view/theme/diabook-blue/theme.php:110 #: ../../view/theme/diabook-blue/theme.php:114
#: ../../view/theme/diabook/theme.php:114 #: ../../view/theme/diabook/theme.php:117
#: ../../view/theme/diabook-aerith/theme.php:110 #: ../../view/theme/diabook-aerith/theme.php:115
msgid "Contact Photos" msgid "Contact Photos"
msgstr "" msgstr ""
@ -373,10 +373,10 @@ 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-red/theme.php:111 #: ../../view/theme/diabook-red/theme.php:115
#: ../../view/theme/diabook-blue/theme.php:111 #: ../../view/theme/diabook-blue/theme.php:115
#: ../../view/theme/diabook/theme.php:115 #: ../../view/theme/diabook/theme.php:118
#: ../../view/theme/diabook-aerith/theme.php:111 #: ../../view/theme/diabook-aerith/theme.php:116
msgid "Profile Photos" msgid "Profile Photos"
msgstr "" msgstr ""
@ -398,10 +398,10 @@ msgstr ""
#: ../../mod/photos.php:529 ../../mod/like.php:127 ../../mod/tagger.php:70 #: ../../mod/photos.php:529 ../../mod/like.php:127 ../../mod/tagger.php:70
#: ../../addon/communityhome/communityhome.php:163 #: ../../addon/communityhome/communityhome.php:163
#: ../../view/theme/diabook-red/theme.php:82 #: ../../view/theme/diabook-red/theme.php:86
#: ../../view/theme/diabook-blue/theme.php:82 #: ../../view/theme/diabook-blue/theme.php:86
#: ../../view/theme/diabook/theme.php:86 #: ../../view/theme/diabook/theme.php:89
#: ../../view/theme/diabook-aerith/theme.php:82 ../../include/text.php:1297 #: ../../view/theme/diabook-aerith/theme.php:87 ../../include/text.php:1297
#: ../../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"
@ -576,11 +576,10 @@ msgstr ""
msgid "Not available." msgid "Not available."
msgstr "" msgstr ""
#: ../../mod/community.php:30 ../../addon/pages/pages.php:75 #: ../../mod/community.php:30 ../../view/theme/diabook-red/theme.php:246
#: ../../view/theme/diabook-red/theme.php:242 #: ../../view/theme/diabook-blue/theme.php:246
#: ../../view/theme/diabook-blue/theme.php:242 #: ../../view/theme/diabook/theme.php:253
#: ../../view/theme/diabook/theme.php:250 #: ../../view/theme/diabook-aerith/theme.php:247 ../../include/nav.php:101
#: ../../view/theme/diabook-aerith/theme.php:242 ../../include/nav.php:101
msgid "Community" msgid "Community"
msgstr "" msgstr ""
@ -1165,7 +1164,7 @@ msgid "is interested in:"
msgstr "" msgstr ""
#: ../../mod/match.php:58 ../../mod/suggest.php:59 #: ../../mod/match.php:58 ../../mod/suggest.php:59
#: ../../include/contact_widgets.php:9 ../../boot.php:986 #: ../../include/contact_widgets.php:9 ../../boot.php:987
msgid "Connect" msgid "Connect"
msgstr "" msgstr ""
@ -1213,10 +1212,10 @@ msgstr ""
msgid "Personal" msgid "Personal"
msgstr "" msgstr ""
#: ../../mod/notifications.php:90 ../../view/theme/diabook-red/theme.php:236 #: ../../mod/notifications.php:90 ../../view/theme/diabook-red/theme.php:240
#: ../../view/theme/diabook-blue/theme.php:236 #: ../../view/theme/diabook-blue/theme.php:240
#: ../../view/theme/diabook/theme.php:244 #: ../../view/theme/diabook/theme.php:247
#: ../../view/theme/diabook-aerith/theme.php:236 ../../include/nav.php:77 #: ../../view/theme/diabook-aerith/theme.php:241 ../../include/nav.php:77
#: ../../include/nav.php:115 #: ../../include/nav.php:115
msgid "Home" msgid "Home"
msgstr "" msgstr ""
@ -1594,10 +1593,10 @@ msgstr ""
msgid "Edit contact" msgid "Edit contact"
msgstr "" msgstr ""
#: ../../mod/contacts.php:523 ../../view/theme/diabook-red/theme.php:238 #: ../../mod/contacts.php:523 ../../view/theme/diabook-red/theme.php:242
#: ../../view/theme/diabook-blue/theme.php:238 #: ../../view/theme/diabook-blue/theme.php:242
#: ../../view/theme/diabook/theme.php:246 #: ../../view/theme/diabook/theme.php:249
#: ../../view/theme/diabook-aerith/theme.php:238 ../../include/nav.php:139 #: ../../view/theme/diabook-aerith/theme.php:243 ../../include/nav.php:139
msgid "Contacts" msgid "Contacts"
msgstr "" msgstr ""
@ -1630,8 +1629,8 @@ msgstr ""
#: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107 #: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107
#: ../../mod/register.php:392 ../../mod/register.php:446 #: ../../mod/register.php:392 ../../mod/register.php:446
#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:732 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:732
#: ../../addon/facebook/facebook.php:617 #: ../../addon/facebook/facebook.php:621
#: ../../addon/facebook/facebook.php:1069 ../../include/items.php:2658 #: ../../addon/facebook/facebook.php:1073 ../../include/items.php:2658
msgid "Administrator" msgid "Administrator"
msgstr "" msgstr ""
@ -1733,52 +1732,52 @@ msgstr ""
msgid " Cannot change to that email." msgid " Cannot change to that email."
msgstr "" msgstr ""
#: ../../mod/settings.php:420 ../../addon/facebook/facebook.php:445 #: ../../mod/settings.php:420 ../../addon/facebook/facebook.php:449
#: ../../addon/impressum/impressum.php:64 #: ../../addon/impressum/impressum.php:75
#: ../../addon/openstreetmap/openstreetmap.php:80 #: ../../addon/openstreetmap/openstreetmap.php:80
#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:364 #: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:370
msgid "Settings updated." msgid "Settings updated."
msgstr "" msgstr ""
#: ../../mod/settings.php:484 ../../view/theme/diabook-red/theme.php:284 #: ../../mod/settings.php:484 ../../view/theme/diabook-red/theme.php:288
#: ../../view/theme/diabook-blue/theme.php:283 #: ../../view/theme/diabook-blue/theme.php:287
#: ../../view/theme/diabook/theme.php:293 #: ../../view/theme/diabook/theme.php:298
#: ../../view/theme/diabook-aerith/theme.php:283 ../../include/nav.php:137 #: ../../view/theme/diabook-aerith/theme.php:288 ../../include/nav.php:137
msgid "Account settings" msgid "Account settings"
msgstr "" msgstr ""
#: ../../mod/settings.php:489 ../../view/theme/diabook-red/theme.php:289 #: ../../mod/settings.php:489 ../../view/theme/diabook-red/theme.php:293
#: ../../view/theme/diabook-blue/theme.php:288 #: ../../view/theme/diabook-blue/theme.php:292
#: ../../view/theme/diabook/theme.php:298 #: ../../view/theme/diabook/theme.php:303
#: ../../view/theme/diabook-aerith/theme.php:288 #: ../../view/theme/diabook-aerith/theme.php:293
msgid "Display settings" msgid "Display settings"
msgstr "" msgstr ""
#: ../../mod/settings.php:495 ../../view/theme/diabook-red/theme.php:298 #: ../../mod/settings.php:495 ../../view/theme/diabook-red/theme.php:302
#: ../../view/theme/diabook-blue/theme.php:297 #: ../../view/theme/diabook-blue/theme.php:301
#: ../../view/theme/diabook/theme.php:307 #: ../../view/theme/diabook/theme.php:312
#: ../../view/theme/diabook-aerith/theme.php:297 #: ../../view/theme/diabook-aerith/theme.php:302
msgid "Connector settings" msgid "Connector settings"
msgstr "" msgstr ""
#: ../../mod/settings.php:500 ../../view/theme/diabook-red/theme.php:303 #: ../../mod/settings.php:500 ../../view/theme/diabook-red/theme.php:307
#: ../../view/theme/diabook-blue/theme.php:302 #: ../../view/theme/diabook-blue/theme.php:306
#: ../../view/theme/diabook/theme.php:312 #: ../../view/theme/diabook/theme.php:317
#: ../../view/theme/diabook-aerith/theme.php:302 #: ../../view/theme/diabook-aerith/theme.php:307
msgid "Plugin settings" msgid "Plugin settings"
msgstr "" msgstr ""
#: ../../mod/settings.php:505 ../../view/theme/diabook-red/theme.php:308 #: ../../mod/settings.php:505 ../../view/theme/diabook-red/theme.php:312
#: ../../view/theme/diabook-blue/theme.php:307 #: ../../view/theme/diabook-blue/theme.php:311
#: ../../view/theme/diabook/theme.php:317 #: ../../view/theme/diabook/theme.php:322
#: ../../view/theme/diabook-aerith/theme.php:307 #: ../../view/theme/diabook-aerith/theme.php:312
msgid "Connections" msgid "Connections"
msgstr "" msgstr ""
#: ../../mod/settings.php:510 ../../view/theme/diabook-red/theme.php:313 #: ../../mod/settings.php:510 ../../view/theme/diabook-red/theme.php:317
#: ../../view/theme/diabook-blue/theme.php:312 #: ../../view/theme/diabook-blue/theme.php:316
#: ../../view/theme/diabook/theme.php:322 #: ../../view/theme/diabook/theme.php:327
#: ../../view/theme/diabook-aerith/theme.php:312 #: ../../view/theme/diabook-aerith/theme.php:317
msgid "Export personal data" msgid "Export personal data"
msgstr "" msgstr ""
@ -1788,12 +1787,12 @@ msgid "Add application"
msgstr "" msgstr ""
#: ../../mod/settings.php:532 ../../mod/settings.php:559 #: ../../mod/settings.php:532 ../../mod/settings.php:559
#: ../../addon/statusnet/statusnet.php:541 #: ../../addon/statusnet/statusnet.php:547
msgid "Consumer Key" msgid "Consumer Key"
msgstr "" msgstr ""
#: ../../mod/settings.php:533 ../../mod/settings.php:560 #: ../../mod/settings.php:533 ../../mod/settings.php:560
#: ../../addon/statusnet/statusnet.php:540 #: ../../addon/statusnet/statusnet.php:546
msgid "Consumer Secret" msgid "Consumer Secret"
msgstr "" msgstr ""
@ -2258,12 +2257,12 @@ msgstr ""
msgid "Invalid contact." msgid "Invalid contact."
msgstr "" msgstr ""
#: ../../mod/notes.php:44 ../../boot.php:1426 #: ../../mod/notes.php:44 ../../boot.php:1427
msgid "Personal Notes" msgid "Personal Notes"
msgstr "" msgstr ""
#: ../../mod/notes.php:63 ../../mod/filer.php:30 #: ../../mod/notes.php:63 ../../mod/filer.php:30
#: ../../addon/facebook/facebook.php:673 ../../include/text.php:652 #: ../../addon/facebook/facebook.php:677 ../../include/text.php:652
msgid "Save" msgid "Save"
msgstr "" msgstr ""
@ -2465,7 +2464,7 @@ msgstr ""
msgid "Group name changed." msgid "Group name changed."
msgstr "" msgstr ""
#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:293 #: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:305
msgid "Permission denied" msgid "Permission denied"
msgstr "" msgstr ""
@ -2505,12 +2504,12 @@ msgstr ""
msgid "Profile Visibility Editor" msgid "Profile Visibility Editor"
msgstr "" msgstr ""
#: ../../mod/profperm.php:103 ../../view/theme/diabook-red/theme.php:237 #: ../../mod/profperm.php:103 ../../view/theme/diabook-red/theme.php:241
#: ../../view/theme/diabook-blue/theme.php:237 #: ../../view/theme/diabook-blue/theme.php:241
#: ../../view/theme/diabook/theme.php:245 #: ../../view/theme/diabook/theme.php:248
#: ../../view/theme/diabook-aerith/theme.php:237 #: ../../view/theme/diabook-aerith/theme.php:242
#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:76 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:76
#: ../../include/nav.php:50 ../../boot.php:1408 #: ../../include/nav.php:50 ../../boot.php:1409
msgid "Profile" msgid "Profile"
msgstr "" msgstr ""
@ -2691,28 +2690,28 @@ msgid "People Search"
msgstr "" msgstr ""
#: ../../mod/like.php:127 ../../mod/tagger.php:70 #: ../../mod/like.php:127 ../../mod/tagger.php:70
#: ../../addon/facebook/facebook.php:1440 #: ../../addon/facebook/facebook.php:1546
#: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:158
#: ../../addon/communityhome/communityhome.php:167 #: ../../addon/communityhome/communityhome.php:167
#: ../../view/theme/diabook-red/theme.php:77 #: ../../view/theme/diabook-red/theme.php:81
#: ../../view/theme/diabook-red/theme.php:86 #: ../../view/theme/diabook-red/theme.php:90
#: ../../view/theme/diabook-blue/theme.php:77 #: ../../view/theme/diabook-blue/theme.php:81
#: ../../view/theme/diabook-blue/theme.php:86 #: ../../view/theme/diabook-blue/theme.php:90
#: ../../view/theme/diabook/theme.php:81 ../../view/theme/diabook/theme.php:90 #: ../../view/theme/diabook/theme.php:84 ../../view/theme/diabook/theme.php:93
#: ../../view/theme/diabook-aerith/theme.php:77 #: ../../view/theme/diabook-aerith/theme.php:82
#: ../../view/theme/diabook-aerith/theme.php:86 #: ../../view/theme/diabook-aerith/theme.php:91
#: ../../include/diaspora.php:1654 ../../include/conversation.php:48 #: ../../include/diaspora.php:1654 ../../include/conversation.php:48
#: ../../include/conversation.php:57 ../../include/conversation.php:121 #: ../../include/conversation.php:57 ../../include/conversation.php:121
#: ../../include/conversation.php:130 #: ../../include/conversation.php:130
msgid "status" msgid "status"
msgstr "" msgstr ""
#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1444 #: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1550
#: ../../addon/communityhome/communityhome.php:172 #: ../../addon/communityhome/communityhome.php:172
#: ../../view/theme/diabook-red/theme.php:91 #: ../../view/theme/diabook-red/theme.php:95
#: ../../view/theme/diabook-blue/theme.php:91 #: ../../view/theme/diabook-blue/theme.php:95
#: ../../view/theme/diabook/theme.php:95 #: ../../view/theme/diabook/theme.php:98
#: ../../view/theme/diabook-aerith/theme.php:91 #: ../../view/theme/diabook-aerith/theme.php:96
#: ../../include/diaspora.php:1670 ../../include/conversation.php:65 #: ../../include/diaspora.php:1670 ../../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"
@ -3032,7 +3031,7 @@ msgstr ""
msgid "Advanced" msgid "Advanced"
msgstr "" msgstr ""
#: ../../mod/admin.php:365 ../../addon/statusnet/statusnet.php:538 #: ../../mod/admin.php:365 ../../addon/statusnet/statusnet.php:544
msgid "Site name" msgid "Site name"
msgstr "" msgstr ""
@ -3758,30 +3757,30 @@ msgstr ""
msgid "Age: " msgid "Age: "
msgstr "" msgstr ""
#: ../../mod/profiles.php:476 ../../view/theme/diabook-red/theme.php:294 #: ../../mod/profiles.php:476 ../../view/theme/diabook-red/theme.php:298
#: ../../view/theme/diabook-blue/theme.php:293 #: ../../view/theme/diabook-blue/theme.php:297
#: ../../view/theme/diabook/theme.php:303 #: ../../view/theme/diabook/theme.php:308
#: ../../view/theme/diabook-aerith/theme.php:293 #: ../../view/theme/diabook-aerith/theme.php:298
msgid "Edit/Manage Profiles" msgid "Edit/Manage Profiles"
msgstr "" msgstr ""
#: ../../mod/profiles.php:477 ../../boot.php:1008 #: ../../mod/profiles.php:477 ../../boot.php:1009
msgid "Change profile photo" msgid "Change profile photo"
msgstr "" msgstr ""
#: ../../mod/profiles.php:478 ../../boot.php:1009 #: ../../mod/profiles.php:478 ../../boot.php:1010
msgid "Create New Profile" msgid "Create New Profile"
msgstr "" msgstr ""
#: ../../mod/profiles.php:489 ../../boot.php:1019 #: ../../mod/profiles.php:489 ../../boot.php:1020
msgid "Profile Image" msgid "Profile Image"
msgstr "" msgstr ""
#: ../../mod/profiles.php:491 ../../boot.php:1022 #: ../../mod/profiles.php:491 ../../boot.php:1023
msgid "visible to everybody" msgid "visible to everybody"
msgstr "" msgstr ""
#: ../../mod/profiles.php:492 ../../boot.php:1023 #: ../../mod/profiles.php:492 ../../boot.php:1024
msgid "Edit visibility" msgid "Edit visibility"
msgstr "" msgstr ""
@ -3833,10 +3832,10 @@ msgstr ""
msgid "No entries." msgid "No entries."
msgstr "" msgstr ""
#: ../../mod/suggest.php:38 ../../view/theme/diabook-red/theme.php:146 #: ../../mod/suggest.php:38 ../../view/theme/diabook-red/theme.php:150
#: ../../view/theme/diabook-blue/theme.php:146 #: ../../view/theme/diabook-blue/theme.php:150
#: ../../view/theme/diabook/theme.php:150 #: ../../view/theme/diabook/theme.php:153
#: ../../view/theme/diabook-aerith/theme.php:146 #: ../../view/theme/diabook-aerith/theme.php:151
#: ../../include/contact_widgets.php:33 #: ../../include/contact_widgets.php:33
msgid "Friend Suggestions" msgid "Friend Suggestions"
msgstr "" msgstr ""
@ -3851,10 +3850,10 @@ msgstr ""
msgid "Ignore/Hide" msgid "Ignore/Hide"
msgstr "" msgstr ""
#: ../../mod/directory.php:47 ../../view/theme/diabook-red/theme.php:144 #: ../../mod/directory.php:47 ../../view/theme/diabook-red/theme.php:148
#: ../../view/theme/diabook-blue/theme.php:144 #: ../../view/theme/diabook-blue/theme.php:148
#: ../../view/theme/diabook/theme.php:148 #: ../../view/theme/diabook/theme.php:151
#: ../../view/theme/diabook-aerith/theme.php:144 #: ../../view/theme/diabook-aerith/theme.php:149
msgid "Global Directory" msgid "Global Directory"
msgstr "" msgstr ""
@ -4040,71 +4039,71 @@ msgstr ""
msgid "Connection accepted at %s" msgid "Connection accepted at %s"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:462 #: ../../addon/facebook/facebook.php:466
msgid "Facebook disabled" msgid "Facebook disabled"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:467 #: ../../addon/facebook/facebook.php:471
msgid "Updating contacts" msgid "Updating contacts"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:488 #: ../../addon/facebook/facebook.php:492
msgid "Facebook API key is missing." msgid "Facebook API key is missing."
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:495 #: ../../addon/facebook/facebook.php:499
msgid "Facebook Connect" msgid "Facebook Connect"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:501 #: ../../addon/facebook/facebook.php:505
msgid "Install Facebook connector for this account." msgid "Install Facebook connector for this account."
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:508 #: ../../addon/facebook/facebook.php:512
msgid "Remove Facebook connector" msgid "Remove Facebook connector"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:513 #: ../../addon/facebook/facebook.php:517
msgid "" msgid ""
"Re-authenticate [This is necessary whenever your Facebook password is " "Re-authenticate [This is necessary whenever your Facebook password is "
"changed.]" "changed.]"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:520 #: ../../addon/facebook/facebook.php:524
msgid "Post to Facebook by default" msgid "Post to Facebook by default"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:524 #: ../../addon/facebook/facebook.php:528
msgid "Link all your Facebook friends and conversations on this website" msgid "Link all your Facebook friends and conversations on this website"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:526 #: ../../addon/facebook/facebook.php:530
msgid "" msgid ""
"Facebook conversations consist of your <em>profile wall</em> and your friend " "Facebook conversations consist of your <em>profile wall</em> and your friend "
"<em>stream</em>." "<em>stream</em>."
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:527 #: ../../addon/facebook/facebook.php:531
msgid "On this website, your Facebook friend stream is only visible to you." msgid "On this website, your Facebook friend stream is only visible to you."
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:528 #: ../../addon/facebook/facebook.php:532
msgid "" msgid ""
"The following settings determine the privacy of your Facebook profile wall " "The following settings determine the privacy of your Facebook profile wall "
"on this website." "on this website."
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:532 #: ../../addon/facebook/facebook.php:536
msgid "" msgid ""
"On this website your Facebook profile wall conversations will only be " "On this website your Facebook profile wall conversations will only be "
"visible to you" "visible to you"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:537 #: ../../addon/facebook/facebook.php:541
msgid "Do not import your Facebook profile wall conversations" msgid "Do not import your Facebook profile wall conversations"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:539 #: ../../addon/facebook/facebook.php:543
msgid "" msgid ""
"If you choose to link conversations and leave both of these boxes unchecked, " "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 " "your Facebook profile wall will be merged with your profile wall on this "
@ -4112,114 +4111,114 @@ msgid ""
"who may see the conversations." "who may see the conversations."
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:544 #: ../../addon/facebook/facebook.php:548
msgid "Comma separated applications to ignore" msgid "Comma separated applications to ignore"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:615 #: ../../addon/facebook/facebook.php:619
msgid "Problems with Facebook Real-Time Updates" msgid "Problems with Facebook Real-Time Updates"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:639 #: ../../addon/facebook/facebook.php:643
#: ../../include/contact_selectors.php:81 #: ../../include/contact_selectors.php:81
msgid "Facebook" msgid "Facebook"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:640 #: ../../addon/facebook/facebook.php:644
msgid "Facebook Connector Settings" msgid "Facebook Connector Settings"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:649 #: ../../addon/facebook/facebook.php:653
msgid "Facebook API Key" msgid "Facebook API Key"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:658 #: ../../addon/facebook/facebook.php:662
msgid "" msgid ""
"Error: it appears that you have specified the App-ID and -Secret in your ." "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 " "htconfig.php file. As long as they are specified there, they cannot be set "
"using this form.<br><br>" "using this form.<br><br>"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:663 #: ../../addon/facebook/facebook.php:667
msgid "" msgid ""
"Error: the given API Key seems to be incorrect (the application access token " "Error: the given API Key seems to be incorrect (the application access token "
"could not be retrieved)." "could not be retrieved)."
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:665 #: ../../addon/facebook/facebook.php:669
msgid "The given API Key seems to work correctly." msgid "The given API Key seems to work correctly."
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:667 #: ../../addon/facebook/facebook.php:671
msgid "" msgid ""
"The correctness of the API Key could not be detected. Somthing strange's " "The correctness of the API Key could not be detected. Somthing strange's "
"going on." "going on."
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:670 #: ../../addon/facebook/facebook.php:674
msgid "App-ID / API-Key" msgid "App-ID / API-Key"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:671 #: ../../addon/facebook/facebook.php:675
msgid "Application secret" msgid "Application secret"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:672 #: ../../addon/facebook/facebook.php:676
#, php-format #, php-format
msgid "Polling Interval (min. %1$s minutes)" msgid "Polling Interval (min. %1$s minutes)"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:676 #: ../../addon/facebook/facebook.php:680
msgid "Real-Time Updates" msgid "Real-Time Updates"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:680 #: ../../addon/facebook/facebook.php:684
msgid "Real-Time Updates are activated." msgid "Real-Time Updates are activated."
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:681 #: ../../addon/facebook/facebook.php:685
msgid "Deactivate Real-Time Updates" msgid "Deactivate Real-Time Updates"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:683 #: ../../addon/facebook/facebook.php:687
msgid "Real-Time Updates not activated." msgid "Real-Time Updates not activated."
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:683 #: ../../addon/facebook/facebook.php:687
msgid "Activate Real-Time Updates" msgid "Activate Real-Time Updates"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:697 #: ../../addon/facebook/facebook.php:701
msgid "The new values have been saved." msgid "The new values have been saved."
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:716 #: ../../addon/facebook/facebook.php:720
msgid "Post to Facebook" msgid "Post to Facebook"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:808 #: ../../addon/facebook/facebook.php:812
msgid "" msgid ""
"Post to Facebook cancelled because of multi-network access permission " "Post to Facebook cancelled because of multi-network access permission "
"conflict." "conflict."
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:1026 #: ../../addon/facebook/facebook.php:1030
msgid "View on Friendica" msgid "View on Friendica"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:1051 #: ../../addon/facebook/facebook.php:1055
msgid "Facebook post failed. Queued for retry." msgid "Facebook post failed. Queued for retry."
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:1087 #: ../../addon/facebook/facebook.php:1091
msgid "Your Facebook connection became invalid. Please Re-authenticate." msgid "Your Facebook connection became invalid. Please Re-authenticate."
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:1088 #: ../../addon/facebook/facebook.php:1092
msgid "Facebook connection became invalid" msgid "Facebook connection became invalid"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:1089 #: ../../addon/facebook/facebook.php:1093
#, php-format #, php-format
msgid "" msgid ""
"Hi %1$s,\n" "Hi %1$s,\n"
@ -4229,11 +4228,6 @@ msgid ""
"connection again, you have to %3$sre-authenticate the Facebook-connector%4$s." "connection again, you have to %3$sre-authenticate the Facebook-connector%4$s."
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:1214
#: ../../addon/facebook/facebook.php:1223 ../../include/bb2diaspora.php:102
msgid "link"
msgstr ""
#: ../../addon/widgets/widget_like.php:58 #: ../../addon/widgets/widget_like.php:58
#, php-format #, php-format
msgid "%d person likes this" msgid "%d person likes this"
@ -4383,10 +4377,10 @@ msgid "Latest likes"
msgstr "" msgstr ""
#: ../../addon/communityhome/communityhome.php:155 #: ../../addon/communityhome/communityhome.php:155
#: ../../view/theme/diabook-red/theme.php:74 #: ../../view/theme/diabook-red/theme.php:78
#: ../../view/theme/diabook-blue/theme.php:74 #: ../../view/theme/diabook-blue/theme.php:78
#: ../../view/theme/diabook/theme.php:78 #: ../../view/theme/diabook/theme.php:81
#: ../../view/theme/diabook-aerith/theme.php:74 ../../include/text.php:1295 #: ../../view/theme/diabook-aerith/theme.php:79 ../../include/text.php:1295
#: ../../include/conversation.php:45 ../../include/conversation.php:118 #: ../../include/conversation.php:45 ../../include/conversation.php:118
msgid "event" msgid "event"
msgstr "" msgstr ""
@ -4594,41 +4588,69 @@ msgstr ""
msgid "URL to embed:" msgid "URL to embed:"
msgstr "" msgstr ""
#: ../../addon/impressum/impressum.php:25 #: ../../addon/impressum/impressum.php:34
msgid "Impressum" msgid "Impressum"
msgstr "" msgstr ""
#: ../../addon/impressum/impressum.php:38 #: ../../addon/impressum/impressum.php:47
#: ../../addon/impressum/impressum.php:40 #: ../../addon/impressum/impressum.php:49
#: ../../addon/impressum/impressum.php:70 #: ../../addon/impressum/impressum.php:81
msgid "Site Owner" msgid "Site Owner"
msgstr "" msgstr ""
#: ../../addon/impressum/impressum.php:38 #: ../../addon/impressum/impressum.php:47
#: ../../addon/impressum/impressum.php:74 #: ../../addon/impressum/impressum.php:85
msgid "Email Address" msgid "Email Address"
msgstr "" msgstr ""
#: ../../addon/impressum/impressum.php:43 #: ../../addon/impressum/impressum.php:52
#: ../../addon/impressum/impressum.php:72 #: ../../addon/impressum/impressum.php:83
msgid "Postal Address" msgid "Postal Address"
msgstr "" msgstr ""
#: ../../addon/impressum/impressum.php:49 #: ../../addon/impressum/impressum.php:58
msgid "" msgid ""
"The impressum addon needs to be configured!<br />Please add at least the " "The impressum addon needs to be configured!<br />Please add at least the "
"<tt>owner</tt> variable to your config file. For other variables please " "<tt>owner</tt> variable to your config file. For other variables please "
"refer to the README file of the addon." "refer to the README file of the addon."
msgstr "" msgstr ""
#: ../../addon/impressum/impressum.php:71 #: ../../addon/impressum/impressum.php:81
msgid "The page operators name."
msgstr ""
#: ../../addon/impressum/impressum.php:82
msgid "Site Owners Profile" msgid "Site Owners Profile"
msgstr "" msgstr ""
#: ../../addon/impressum/impressum.php:73 #: ../../addon/impressum/impressum.php:82
msgid "Profile address of the operator."
msgstr ""
#: ../../addon/impressum/impressum.php:83
msgid "How to contact the operator via snail mail."
msgstr ""
#: ../../addon/impressum/impressum.php:84
msgid "Notes" msgid "Notes"
msgstr "" msgstr ""
#: ../../addon/impressum/impressum.php:84
msgid "Additional notes that are displayed beneath the contact information."
msgstr ""
#: ../../addon/impressum/impressum.php:85
msgid "How to contact the operator via email. (will be displayed obfuscated)"
msgstr ""
#: ../../addon/impressum/impressum.php:86
msgid "Footer note"
msgstr ""
#: ../../addon/impressum/impressum.php:86
msgid "Text for the footer."
msgstr ""
#: ../../addon/buglink/buglink.php:15 #: ../../addon/buglink/buglink.php:15
msgid "Report Bug" msgid "Report Bug"
msgstr "" msgstr ""
@ -4879,7 +4901,7 @@ msgstr ""
msgid "Clear OAuth configuration" msgid "Clear OAuth configuration"
msgstr "" msgstr ""
#: ../../addon/statusnet/statusnet.php:539 #: ../../addon/statusnet/statusnet.php:545
msgid "API URL" msgid "API URL"
msgstr "" msgstr ""
@ -4982,11 +5004,11 @@ msgstr ""
msgid "Cutting posts after how much characters" msgid "Cutting posts after how much characters"
msgstr "" msgstr ""
#: ../../addon/showmore/showmore.php:64 #: ../../addon/showmore/showmore.php:65
msgid "Show More Settings saved." msgid "Show More Settings saved."
msgstr "" msgstr ""
#: ../../addon/showmore/showmore.php:86 ../../include/conversation.php:466 #: ../../addon/showmore/showmore.php:87 ../../include/conversation.php:466
#: ../../boot.php:495 #: ../../boot.php:495
msgid "show more" msgid "show more"
msgstr "" msgstr ""
@ -5089,11 +5111,11 @@ msgstr ""
msgid "Send #tag links to Twitter" msgid "Send #tag links to Twitter"
msgstr "" msgstr ""
#: ../../addon/twitter/twitter.php:371 #: ../../addon/twitter/twitter.php:377
msgid "Consumer key" msgid "Consumer key"
msgstr "" msgstr ""
#: ../../addon/twitter/twitter.php:372 #: ../../addon/twitter/twitter.php:378
msgid "Consumer secret" msgid "Consumer secret"
msgstr "" msgstr ""
@ -5129,159 +5151,159 @@ msgstr ""
msgid "Post to Posterous by default" msgid "Post to Posterous by default"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/theme.php:23 #: ../../view/theme/diabook-red/theme.php:27
#: ../../view/theme/diabook-blue/theme.php:23 #: ../../view/theme/diabook-blue/theme.php:27
#: ../../view/theme/diabook/theme.php:27 #: ../../view/theme/diabook/theme.php:30
#: ../../view/theme/dispy-dark/theme.php:116 #: ../../view/theme/dispy-dark/theme.php:120
#: ../../view/theme/diabook-aerith/theme.php:23 #: ../../view/theme/diabook-aerith/theme.php:28
msgid "Last users" msgid "Last users"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/theme.php:52 #: ../../view/theme/diabook-red/theme.php:56
#: ../../view/theme/diabook-blue/theme.php:52 #: ../../view/theme/diabook-blue/theme.php:56
#: ../../view/theme/diabook/theme.php:56 #: ../../view/theme/diabook/theme.php:59
#: ../../view/theme/diabook-aerith/theme.php:52 #: ../../view/theme/diabook-aerith/theme.php:57
msgid "Last likes" msgid "Last likes"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/theme.php:97 #: ../../view/theme/diabook-red/theme.php:101
#: ../../view/theme/diabook-blue/theme.php:97 #: ../../view/theme/diabook-blue/theme.php:101
#: ../../view/theme/diabook/theme.php:101 #: ../../view/theme/diabook/theme.php:104
#: ../../view/theme/diabook-aerith/theme.php:97 #: ../../view/theme/diabook-aerith/theme.php:102
msgid "Last photos" msgid "Last photos"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/theme.php:142 #: ../../view/theme/diabook-red/theme.php:146
#: ../../view/theme/diabook-blue/theme.php:142 #: ../../view/theme/diabook-blue/theme.php:146
#: ../../view/theme/diabook/theme.php:146
#: ../../view/theme/diabook-aerith/theme.php:142
msgid "Find Friends"
msgstr ""
#: ../../view/theme/diabook-red/theme.php:143
#: ../../view/theme/diabook-blue/theme.php:143
#: ../../view/theme/diabook/theme.php:147
#: ../../view/theme/diabook-aerith/theme.php:143
msgid "Local Directory"
msgstr ""
#: ../../view/theme/diabook-red/theme.php:145
#: ../../view/theme/diabook-blue/theme.php:145
#: ../../view/theme/diabook/theme.php:149 #: ../../view/theme/diabook/theme.php:149
#: ../../view/theme/diabook-aerith/theme.php:145 #: ../../view/theme/diabook-aerith/theme.php:147
#: ../../include/contact_widgets.php:34 msgid "Find Friends"
msgid "Similar Interests"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/theme.php:147 #: ../../view/theme/diabook-red/theme.php:147
#: ../../view/theme/diabook-blue/theme.php:147 #: ../../view/theme/diabook-blue/theme.php:147
#: ../../view/theme/diabook/theme.php:151 #: ../../view/theme/diabook/theme.php:150
#: ../../view/theme/diabook-aerith/theme.php:147 #: ../../view/theme/diabook-aerith/theme.php:148
msgid "Local Directory"
msgstr ""
#: ../../view/theme/diabook-red/theme.php:149
#: ../../view/theme/diabook-blue/theme.php:149
#: ../../view/theme/diabook/theme.php:152
#: ../../view/theme/diabook-aerith/theme.php:150
#: ../../include/contact_widgets.php:34
msgid "Similar Interests"
msgstr ""
#: ../../view/theme/diabook-red/theme.php:151
#: ../../view/theme/diabook-blue/theme.php:151
#: ../../view/theme/diabook/theme.php:154
#: ../../view/theme/diabook-aerith/theme.php:152
#: ../../include/contact_widgets.php:35 #: ../../include/contact_widgets.php:35
msgid "Invite Friends" msgid "Invite Friends"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/theme.php:162 #: ../../view/theme/diabook-red/theme.php:166
#: ../../view/theme/diabook-red/theme.php:243 #: ../../view/theme/diabook-red/theme.php:247
#: ../../view/theme/diabook-blue/theme.php:162 #: ../../view/theme/diabook-blue/theme.php:166
#: ../../view/theme/diabook-blue/theme.php:243 #: ../../view/theme/diabook-blue/theme.php:247
#: ../../view/theme/diabook/theme.php:167 #: ../../view/theme/diabook/theme.php:170
#: ../../view/theme/diabook/theme.php:251 #: ../../view/theme/diabook/theme.php:254
#: ../../view/theme/diabook-aerith/theme.php:162 #: ../../view/theme/diabook-aerith/theme.php:167
#: ../../view/theme/diabook-aerith/theme.php:243 #: ../../view/theme/diabook-aerith/theme.php:248
msgid "Community Pages" msgid "Community Pages"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/theme.php:195 #: ../../view/theme/diabook-red/theme.php:199
#: ../../view/theme/diabook-blue/theme.php:195 #: ../../view/theme/diabook-blue/theme.php:199
#: ../../view/theme/diabook/theme.php:200 #: ../../view/theme/diabook/theme.php:203
#: ../../view/theme/diabook-aerith/theme.php:195 #: ../../view/theme/diabook-aerith/theme.php:200
msgid "Help or @NewHere ?" msgid "Help or @NewHere ?"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/theme.php:201 #: ../../view/theme/diabook-red/theme.php:205
#: ../../view/theme/diabook-blue/theme.php:201 #: ../../view/theme/diabook-blue/theme.php:205
#: ../../view/theme/diabook/theme.php:206 #: ../../view/theme/diabook/theme.php:209
#: ../../view/theme/diabook-aerith/theme.php:201 #: ../../view/theme/diabook-aerith/theme.php:206
msgid "Connect Services" msgid "Connect Services"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/theme.php:207 #: ../../view/theme/diabook-red/theme.php:211
#: ../../view/theme/diabook-blue/theme.php:207 #: ../../view/theme/diabook-blue/theme.php:211
#: ../../view/theme/diabook/theme.php:212 #: ../../view/theme/diabook/theme.php:215
#: ../../view/theme/diabook-aerith/theme.php:207 #: ../../view/theme/diabook-aerith/theme.php:212
msgid "PostIt to Friendica" msgid "PostIt to Friendica"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/theme.php:207 #: ../../view/theme/diabook-red/theme.php:211
#: ../../view/theme/diabook-blue/theme.php:207 #: ../../view/theme/diabook-blue/theme.php:211
#: ../../view/theme/diabook/theme.php:212 #: ../../view/theme/diabook/theme.php:215
#: ../../view/theme/diabook-aerith/theme.php:207 #: ../../view/theme/diabook-aerith/theme.php:212
msgid "Post to Friendica" msgid "Post to Friendica"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/theme.php:208 #: ../../view/theme/diabook-red/theme.php:212
#: ../../view/theme/diabook-blue/theme.php:208 #: ../../view/theme/diabook-blue/theme.php:212
#: ../../view/theme/diabook/theme.php:213 #: ../../view/theme/diabook/theme.php:216
#: ../../view/theme/diabook-aerith/theme.php:208 #: ../../view/theme/diabook-aerith/theme.php:213
msgid " from anywhere by bookmarking this Link." msgid " from anywhere by bookmarking this Link."
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/theme.php:236
#: ../../view/theme/diabook-blue/theme.php:236
#: ../../view/theme/diabook/theme.php:244
#: ../../view/theme/diabook-aerith/theme.php:236 ../../include/nav.php:49
#: ../../include/nav.php:115
msgid "Your posts and conversations"
msgstr ""
#: ../../view/theme/diabook-red/theme.php:237
#: ../../view/theme/diabook-blue/theme.php:237
#: ../../view/theme/diabook/theme.php:245
#: ../../view/theme/diabook-aerith/theme.php:237 ../../include/nav.php:50
msgid "Your profile page"
msgstr ""
#: ../../view/theme/diabook-red/theme.php:238
#: ../../view/theme/diabook-blue/theme.php:238
#: ../../view/theme/diabook/theme.php:246
#: ../../view/theme/diabook-aerith/theme.php:238
msgid "Your contacts"
msgstr ""
#: ../../view/theme/diabook-red/theme.php:239
#: ../../view/theme/diabook-blue/theme.php:239
#: ../../view/theme/diabook/theme.php:247
#: ../../view/theme/diabook-aerith/theme.php:239 ../../include/nav.php:51
#: ../../boot.php:1413
msgid "Photos"
msgstr ""
#: ../../view/theme/diabook-red/theme.php:239
#: ../../view/theme/diabook-blue/theme.php:239
#: ../../view/theme/diabook/theme.php:247
#: ../../view/theme/diabook-aerith/theme.php:239 ../../include/nav.php:51
msgid "Your photos"
msgstr ""
#: ../../view/theme/diabook-red/theme.php:240 #: ../../view/theme/diabook-red/theme.php:240
#: ../../view/theme/diabook-blue/theme.php:240 #: ../../view/theme/diabook-blue/theme.php:240
#: ../../view/theme/diabook/theme.php:247
#: ../../view/theme/diabook-aerith/theme.php:241 ../../include/nav.php:49
#: ../../include/nav.php:115
msgid "Your posts and conversations"
msgstr ""
#: ../../view/theme/diabook-red/theme.php:241
#: ../../view/theme/diabook-blue/theme.php:241
#: ../../view/theme/diabook/theme.php:248 #: ../../view/theme/diabook/theme.php:248
#: ../../view/theme/diabook-aerith/theme.php:240 ../../include/nav.php:52 #: ../../view/theme/diabook-aerith/theme.php:242 ../../include/nav.php:50
msgid "Your profile page"
msgstr ""
#: ../../view/theme/diabook-red/theme.php:242
#: ../../view/theme/diabook-blue/theme.php:242
#: ../../view/theme/diabook/theme.php:249
#: ../../view/theme/diabook-aerith/theme.php:243
msgid "Your contacts"
msgstr ""
#: ../../view/theme/diabook-red/theme.php:243
#: ../../view/theme/diabook-blue/theme.php:243
#: ../../view/theme/diabook/theme.php:250
#: ../../view/theme/diabook-aerith/theme.php:244 ../../include/nav.php:51
#: ../../boot.php:1414
msgid "Photos"
msgstr ""
#: ../../view/theme/diabook-red/theme.php:243
#: ../../view/theme/diabook-blue/theme.php:243
#: ../../view/theme/diabook/theme.php:250
#: ../../view/theme/diabook-aerith/theme.php:244 ../../include/nav.php:51
msgid "Your photos"
msgstr ""
#: ../../view/theme/diabook-red/theme.php:244
#: ../../view/theme/diabook-blue/theme.php:244
#: ../../view/theme/diabook/theme.php:251
#: ../../view/theme/diabook-aerith/theme.php:245 ../../include/nav.php:52
msgid "Your events" msgid "Your events"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/theme.php:241 #: ../../view/theme/diabook-red/theme.php:245
#: ../../view/theme/diabook-blue/theme.php:241 #: ../../view/theme/diabook-blue/theme.php:245
#: ../../view/theme/diabook/theme.php:249 #: ../../view/theme/diabook/theme.php:252
#: ../../view/theme/diabook-aerith/theme.php:241 ../../include/nav.php:53 #: ../../view/theme/diabook-aerith/theme.php:246 ../../include/nav.php:53
msgid "Personal notes" msgid "Personal notes"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/theme.php:241 #: ../../view/theme/diabook-red/theme.php:245
#: ../../view/theme/diabook-blue/theme.php:241 #: ../../view/theme/diabook-blue/theme.php:245
#: ../../view/theme/diabook/theme.php:249 #: ../../view/theme/diabook/theme.php:252
#: ../../view/theme/diabook-aerith/theme.php:241 ../../include/nav.php:53 #: ../../view/theme/diabook-aerith/theme.php:246 ../../include/nav.php:53
msgid "Your personal photos" msgid "Your personal photos"
msgstr "" msgstr ""
@ -5305,7 +5327,7 @@ msgstr ""
msgid "Color scheme" msgid "Color scheme"
msgstr "" msgstr ""
#: ../../include/profile_advanced.php:17 ../../boot.php:1044 #: ../../include/profile_advanced.php:17 ../../boot.php:1045
msgid "Gender:" msgid "Gender:"
msgstr "" msgstr ""
@ -5326,11 +5348,11 @@ msgstr ""
msgid "Age:" msgid "Age:"
msgstr "" msgstr ""
#: ../../include/profile_advanced.php:37 ../../boot.php:1047 #: ../../include/profile_advanced.php:37 ../../boot.php:1048
msgid "Status:" msgid "Status:"
msgstr "" msgstr ""
#: ../../include/profile_advanced.php:45 ../../boot.php:1049 #: ../../include/profile_advanced.php:45 ../../boot.php:1050
msgid "Homepage:" msgid "Homepage:"
msgstr "" msgstr ""
@ -5898,7 +5920,7 @@ msgstr ""
msgid "End this session" msgid "End this session"
msgstr "" msgstr ""
#: ../../include/nav.php:49 ../../boot.php:1403 #: ../../include/nav.php:49 ../../boot.php:1404
msgid "Status" msgid "Status"
msgstr "" msgstr ""
@ -5978,11 +6000,11 @@ msgstr ""
msgid "Manage other pages" msgid "Manage other pages"
msgstr "" msgstr ""
#: ../../include/nav.php:138 ../../boot.php:1002 #: ../../include/nav.php:138 ../../boot.php:1003
msgid "Profiles" msgid "Profiles"
msgstr "" msgstr ""
#: ../../include/nav.php:138 ../../boot.php:1002 #: ../../include/nav.php:138 ../../boot.php:1003
msgid "Manage/edit profiles" msgid "Manage/edit profiles"
msgstr "" msgstr ""
@ -6144,7 +6166,7 @@ msgstr ""
msgid "%1$d %2$s ago" msgid "%1$d %2$s ago"
msgstr "" msgstr ""
#: ../../include/poller.php:533 #: ../../include/poller.php:543
msgid "From: " msgid "From: "
msgstr "" msgstr ""
@ -6152,7 +6174,7 @@ msgstr ""
msgid "$1 wrote:" msgid "$1 wrote:"
msgstr "" msgstr ""
#: ../../include/bbcode.php:237 ../../include/bbcode.php:303 #: ../../include/bbcode.php:238 ../../include/bbcode.php:304
msgid "Image/photo" msgid "Image/photo"
msgstr "" msgstr ""
@ -6378,6 +6400,10 @@ msgstr ""
msgid "image/photo" msgid "image/photo"
msgstr "" msgstr ""
#: ../../include/bb2diaspora.php:102
msgid "link"
msgstr ""
#: ../../include/security.php:21 #: ../../include/security.php:21
msgid "Welcome " msgid "Welcome "
msgstr "" msgstr ""
@ -6636,42 +6662,42 @@ msgstr ""
msgid "Forgot your password?" msgid "Forgot your password?"
msgstr "" msgstr ""
#: ../../boot.php:935 #: ../../boot.php:936
msgid "Edit profile" msgid "Edit profile"
msgstr "" msgstr ""
#: ../../boot.php:994 #: ../../boot.php:995
msgid "Message" msgid "Message"
msgstr "" msgstr ""
#: ../../boot.php:1109 ../../boot.php:1180 #: ../../boot.php:1110 ../../boot.php:1181
msgid "g A l F d" msgid "g A l F d"
msgstr "" msgstr ""
#: ../../boot.php:1110 ../../boot.php:1181 #: ../../boot.php:1111 ../../boot.php:1182
msgid "F d" msgid "F d"
msgstr "" msgstr ""
#: ../../boot.php:1135 #: ../../boot.php:1136
msgid "Birthday Reminders" msgid "Birthday Reminders"
msgstr "" msgstr ""
#: ../../boot.php:1136 #: ../../boot.php:1137
msgid "Birthdays this week:" msgid "Birthdays this week:"
msgstr "" msgstr ""
#: ../../boot.php:1159 ../../boot.php:1223 #: ../../boot.php:1160 ../../boot.php:1224
msgid "[today]" msgid "[today]"
msgstr "" msgstr ""
#: ../../boot.php:1204 #: ../../boot.php:1205
msgid "Event Reminders" msgid "Event Reminders"
msgstr "" msgstr ""
#: ../../boot.php:1205 #: ../../boot.php:1206
msgid "Events this week:" msgid "Events this week:"
msgstr "" msgstr ""
#: ../../boot.php:1217 #: ../../boot.php:1218
msgid "[No description]" msgid "[No description]"
msgstr "" msgstr ""

118
view/de/messages.po
View file

@ -16,9 +16,9 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: friendica\n" "Project-Id-Version: friendica\n"
"Report-Msgid-Bugs-To: http://bugs.friendica.com/\n" "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
"POT-Creation-Date: 2012-04-05 10:00-0700\n" "POT-Creation-Date: 2012-04-06 10:00-0700\n"
"PO-Revision-Date: 2012-04-06 10:40+0000\n" "PO-Revision-Date: 2012-04-08 23:57+0000\n"
"Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n" "Last-Translator: zottel <transifex@zottel.net>\n"
"Language-Team: German (http://www.transifex.net/projects/p/friendica/language/de/)\n" "Language-Team: German (http://www.transifex.net/projects/p/friendica/language/de/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
@ -216,7 +216,7 @@ msgstr "l, F j"
msgid "Edit event" msgid "Edit event"
msgstr "Veranstaltung bearbeiten" msgstr "Veranstaltung bearbeiten"
#: ../../mod/events.php:272 ../../include/text.php:1050 #: ../../mod/events.php:272 ../../include/text.php:1053
msgid "link to source" msgid "link to source"
msgstr "Link zum Originalbeitrag" msgstr "Link zum Originalbeitrag"
@ -410,7 +410,7 @@ msgstr "wurde getaggt in einem"
#: ../../view/theme/diabook-red/theme.php:82 #: ../../view/theme/diabook-red/theme.php:82
#: ../../view/theme/diabook-blue/theme.php:82 #: ../../view/theme/diabook-blue/theme.php:82
#: ../../view/theme/diabook/theme.php:86 #: ../../view/theme/diabook/theme.php:86
#: ../../view/theme/diabook-aerith/theme.php:82 ../../include/text.php:1294 #: ../../view/theme/diabook-aerith/theme.php:82 ../../include/text.php:1297
#: ../../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"
@ -2234,7 +2234,7 @@ msgstr "Markierte"
msgid "Shared Links" msgid "Shared Links"
msgstr "Geteilte Links" msgstr "Geteilte Links"
#: ../../mod/network.php:270 #: ../../mod/network.php:274
#, php-format #, php-format
msgid "Warning: This group contains %s member from an insecure network." msgid "Warning: This group contains %s member from an insecure network."
msgid_plural "" msgid_plural ""
@ -2242,31 +2242,31 @@ msgid_plural ""
msgstr[0] "Warnung: Diese Gruppe beinhaltet %s Person aus einem unsicheren Netzwerk." msgstr[0] "Warnung: Diese Gruppe beinhaltet %s Person aus einem unsicheren Netzwerk."
msgstr[1] "Warnung: Diese Gruppe beinhaltet %s Personen aus unsicheren Netzwerken." msgstr[1] "Warnung: Diese Gruppe beinhaltet %s Personen aus unsicheren Netzwerken."
#: ../../mod/network.php:273 #: ../../mod/network.php:277
msgid "Private messages to this group are at risk of public disclosure." msgid "Private messages to this group are at risk of public disclosure."
msgstr "Private Nachrichten an diese Gruppe könnten an die Öffentlichkeit geraten." msgstr "Private Nachrichten an diese Gruppe könnten an die Öffentlichkeit geraten."
#: ../../mod/network.php:318 #: ../../mod/network.php:322
msgid "No such group" msgid "No such group"
msgstr "Es gibt keine solche Gruppe" msgstr "Es gibt keine solche Gruppe"
#: ../../mod/network.php:329 #: ../../mod/network.php:333
msgid "Group is empty" msgid "Group is empty"
msgstr "Gruppe ist leer" msgstr "Gruppe ist leer"
#: ../../mod/network.php:333 #: ../../mod/network.php:337
msgid "Group: " msgid "Group: "
msgstr "Gruppe: " msgstr "Gruppe: "
#: ../../mod/network.php:343 #: ../../mod/network.php:347
msgid "Contact: " msgid "Contact: "
msgstr "Kontakt: " msgstr "Kontakt: "
#: ../../mod/network.php:345 #: ../../mod/network.php:349
msgid "Private messages to this person are at risk of public disclosure." msgid "Private messages to this person are at risk of public disclosure."
msgstr "Private Nachrichten an diese Person könnten an die Öffentlichkeit gelangen." msgstr "Private Nachrichten an diese Person könnten an die Öffentlichkeit gelangen."
#: ../../mod/network.php:350 #: ../../mod/network.php:354
msgid "Invalid contact." msgid "Invalid contact."
msgstr "Ungültiger Kontakt." msgstr "Ungültiger Kontakt."
@ -2275,7 +2275,7 @@ msgid "Personal Notes"
msgstr "Persönliche Notizen" msgstr "Persönliche Notizen"
#: ../../mod/notes.php:63 ../../mod/filer.php:30 #: ../../mod/notes.php:63 ../../mod/filer.php:30
#: ../../addon/facebook/facebook.php:673 ../../include/text.php:649 #: ../../addon/facebook/facebook.php:673 ../../include/text.php:652
msgid "Save" msgid "Save"
msgstr "Speichern" msgstr "Speichern"
@ -2538,7 +2538,7 @@ msgstr "Alle Kontakte (mit gesichertem Profilzugriff)"
msgid "No contacts." msgid "No contacts."
msgstr "Keine Kontakte." msgstr "Keine Kontakte."
#: ../../mod/viewcontacts.php:76 ../../include/text.php:586 #: ../../mod/viewcontacts.php:76 ../../include/text.php:589
msgid "View Contacts" msgid "View Contacts"
msgstr "Kontakte anzeigen" msgstr "Kontakte anzeigen"
@ -4397,7 +4397,7 @@ msgstr "Neueste Favoriten"
#: ../../view/theme/diabook-red/theme.php:74 #: ../../view/theme/diabook-red/theme.php:74
#: ../../view/theme/diabook-blue/theme.php:74 #: ../../view/theme/diabook-blue/theme.php:74
#: ../../view/theme/diabook/theme.php:78 #: ../../view/theme/diabook/theme.php:78
#: ../../view/theme/diabook-aerith/theme.php:74 ../../include/text.php:1292 #: ../../view/theme/diabook-aerith/theme.php:74 ../../include/text.php:1295
#: ../../include/conversation.php:45 ../../include/conversation.php:118 #: ../../include/conversation.php:45 ../../include/conversation.php:118
msgid "event" msgid "event"
msgstr "Veranstaltung" msgstr "Veranstaltung"
@ -5223,21 +5223,21 @@ msgstr "Verbinde Dienste"
#: ../../view/theme/diabook/theme.php:212 #: ../../view/theme/diabook/theme.php:212
#: ../../view/theme/diabook-aerith/theme.php:207 #: ../../view/theme/diabook-aerith/theme.php:207
msgid "PostIt to Friendica" msgid "PostIt to Friendica"
msgstr "PostIt nach Friendica" msgstr "Bei Friendica posten"
#: ../../view/theme/diabook-red/theme.php:207 #: ../../view/theme/diabook-red/theme.php:207
#: ../../view/theme/diabook-blue/theme.php:207 #: ../../view/theme/diabook-blue/theme.php:207
#: ../../view/theme/diabook/theme.php:212 #: ../../view/theme/diabook/theme.php:212
#: ../../view/theme/diabook-aerith/theme.php:207 #: ../../view/theme/diabook-aerith/theme.php:207
msgid "Post to Friendica" msgid "Post to Friendica"
msgstr "Bei Friendica veröffentlichen" msgstr "Wenn du diesen Link"
#: ../../view/theme/diabook-red/theme.php:208 #: ../../view/theme/diabook-red/theme.php:208
#: ../../view/theme/diabook-blue/theme.php:208 #: ../../view/theme/diabook-blue/theme.php:208
#: ../../view/theme/diabook/theme.php:213 #: ../../view/theme/diabook/theme.php:213
#: ../../view/theme/diabook-aerith/theme.php:208 #: ../../view/theme/diabook-aerith/theme.php:208
msgid " from anywhere by bookmarking this Link." msgid " from anywhere by bookmarking this Link."
msgstr " von überall her indem du diesen Link zu deinen Lesezeichen hinzufügst." msgstr "zu deinen Lesezeichen hinzufügst, kannst du von überallher Links bei Friendica veröffentlichen."
#: ../../view/theme/diabook-red/theme.php:236 #: ../../view/theme/diabook-red/theme.php:236
#: ../../view/theme/diabook-blue/theme.php:236 #: ../../view/theme/diabook-blue/theme.php:236
@ -5695,158 +5695,158 @@ msgstr "(kein Betreff)"
msgid "noreply" msgid "noreply"
msgstr "noreply" msgstr "noreply"
#: ../../include/text.php:240 #: ../../include/text.php:243
msgid "prev" msgid "prev"
msgstr "vorige" msgstr "vorige"
#: ../../include/text.php:242 #: ../../include/text.php:245
msgid "first" msgid "first"
msgstr "erste" msgstr "erste"
#: ../../include/text.php:271 #: ../../include/text.php:274
msgid "last" msgid "last"
msgstr "letzte" msgstr "letzte"
#: ../../include/text.php:274 #: ../../include/text.php:277
msgid "next" msgid "next"
msgstr "nächste" msgstr "nächste"
#: ../../include/text.php:565 #: ../../include/text.php:568
msgid "No contacts" msgid "No contacts"
msgstr "Keine Kontakte" msgstr "Keine Kontakte"
#: ../../include/text.php:574 #: ../../include/text.php:577
#, php-format #, php-format
msgid "%d Contact" msgid "%d Contact"
msgid_plural "%d Contacts" msgid_plural "%d Contacts"
msgstr[0] "%d Kontakt" msgstr[0] "%d Kontakt"
msgstr[1] "%d Kontakte" msgstr[1] "%d Kontakte"
#: ../../include/text.php:647 ../../include/nav.php:91 #: ../../include/text.php:650 ../../include/nav.php:91
msgid "Search" msgid "Search"
msgstr "Suche" msgstr "Suche"
#: ../../include/text.php:828 #: ../../include/text.php:831
msgid "Monday" msgid "Monday"
msgstr "Montag" msgstr "Montag"
#: ../../include/text.php:828 #: ../../include/text.php:831
msgid "Tuesday" msgid "Tuesday"
msgstr "Dienstag" msgstr "Dienstag"
#: ../../include/text.php:828 #: ../../include/text.php:831
msgid "Wednesday" msgid "Wednesday"
msgstr "Mittwoch" msgstr "Mittwoch"
#: ../../include/text.php:828 #: ../../include/text.php:831
msgid "Thursday" msgid "Thursday"
msgstr "Donnerstag" msgstr "Donnerstag"
#: ../../include/text.php:828 #: ../../include/text.php:831
msgid "Friday" msgid "Friday"
msgstr "Freitag" msgstr "Freitag"
#: ../../include/text.php:828 #: ../../include/text.php:831
msgid "Saturday" msgid "Saturday"
msgstr "Samstag" msgstr "Samstag"
#: ../../include/text.php:828 #: ../../include/text.php:831
msgid "Sunday" msgid "Sunday"
msgstr "Sonntag" msgstr "Sonntag"
#: ../../include/text.php:832 #: ../../include/text.php:835
msgid "January" msgid "January"
msgstr "Januar" msgstr "Januar"
#: ../../include/text.php:832 #: ../../include/text.php:835
msgid "February" msgid "February"
msgstr "Februar" msgstr "Februar"
#: ../../include/text.php:832 #: ../../include/text.php:835
msgid "March" msgid "March"
msgstr "März" msgstr "März"
#: ../../include/text.php:832 #: ../../include/text.php:835
msgid "April" msgid "April"
msgstr "April" msgstr "April"
#: ../../include/text.php:832 #: ../../include/text.php:835
msgid "May" msgid "May"
msgstr "Mai" msgstr "Mai"
#: ../../include/text.php:832 #: ../../include/text.php:835
msgid "June" msgid "June"
msgstr "Juni" msgstr "Juni"
#: ../../include/text.php:832 #: ../../include/text.php:835
msgid "July" msgid "July"
msgstr "Juli" msgstr "Juli"
#: ../../include/text.php:832 #: ../../include/text.php:835
msgid "August" msgid "August"
msgstr "August" msgstr "August"
#: ../../include/text.php:832 #: ../../include/text.php:835
msgid "September" msgid "September"
msgstr "September" msgstr "September"
#: ../../include/text.php:832 #: ../../include/text.php:835
msgid "October" msgid "October"
msgstr "Oktober" msgstr "Oktober"
#: ../../include/text.php:832 #: ../../include/text.php:835
msgid "November" msgid "November"
msgstr "November" msgstr "November"
#: ../../include/text.php:832 #: ../../include/text.php:835
msgid "December" msgid "December"
msgstr "Dezember" msgstr "Dezember"
#: ../../include/text.php:916 #: ../../include/text.php:919
msgid "bytes" msgid "bytes"
msgstr "Byte" msgstr "Byte"
#: ../../include/text.php:933 #: ../../include/text.php:936
msgid "Categories:" msgid "Categories:"
msgstr "Kategorien:" msgstr "Kategorien:"
#: ../../include/text.php:945 #: ../../include/text.php:948
msgid "remove" msgid "remove"
msgstr "löschen" msgstr "löschen"
#: ../../include/text.php:945 #: ../../include/text.php:948
msgid "[remove]" msgid "[remove]"
msgstr "[löschen]" msgstr "[löschen]"
#: ../../include/text.php:948 #: ../../include/text.php:951
msgid "Filed under:" msgid "Filed under:"
msgstr "Abgelegt unter:" msgstr "Abgelegt unter:"
#: ../../include/text.php:964 ../../include/text.php:976 #: ../../include/text.php:967 ../../include/text.php:979
msgid "Click to open/close" msgid "Click to open/close"
msgstr "Zum öffnen/schließen klicken" msgstr "Zum öffnen/schließen klicken"
#: ../../include/text.php:1068 #: ../../include/text.php:1071
msgid "Select an alternate language" msgid "Select an alternate language"
msgstr "Alternative Sprache auswählen" msgstr "Alternative Sprache auswählen"
#: ../../include/text.php:1080 #: ../../include/text.php:1083
msgid "default" msgid "default"
msgstr "standard" msgstr "standard"
#: ../../include/text.php:1296 #: ../../include/text.php:1299
msgid "activity" msgid "activity"
msgstr "Aktivität" msgstr "Aktivität"
#: ../../include/text.php:1298 #: ../../include/text.php:1301
msgid "comment" msgid "comment"
msgstr "Kommentar" msgstr "Kommentar"
#: ../../include/text.php:1299 #: ../../include/text.php:1302
msgid "post" msgid "post"
msgstr "Beitrag" msgstr "Beitrag"
#: ../../include/text.php:1454 #: ../../include/text.php:1457
msgid "Item filed" msgid "Item filed"
msgstr "Beitrag abgelegt" msgstr "Beitrag abgelegt"
@ -6220,7 +6220,7 @@ msgstr "%s hat dir eine neue private Nachricht auf %s geschrieben."
#: ../../include/enotify.php:42 #: ../../include/enotify.php:42
#, php-format #, php-format
msgid "%s sent you %s." msgid "%s sent you %s."
msgstr "%s hat Dir geschickt %s" msgstr "%s hat Dir %s geschickt"
#: ../../include/enotify.php:42 #: ../../include/enotify.php:42
msgid "a private message" msgid "a private message"
@ -6316,7 +6316,7 @@ msgstr "%s markierte %s"
#: ../../include/enotify.php:121 #: ../../include/enotify.php:121
msgid "your post" msgid "your post"
msgstr "Dein Beitrag" msgstr "Deinen Beitrag"
#: ../../include/enotify.php:130 #: ../../include/enotify.php:130
msgid "[Friendica:Notify] Introduction received" msgid "[Friendica:Notify] Introduction received"

10
view/de/strings.php
View file

@ -1159,9 +1159,9 @@ $a->strings["Invite Friends"] = "Freunde einladen";
$a->strings["Community Pages"] = "Foren"; $a->strings["Community Pages"] = "Foren";
$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["PostIt to Friendica"] = "PostIt nach Friendica"; $a->strings["PostIt to Friendica"] = "Bei Friendica posten";
$a->strings["Post to Friendica"] = "Bei Friendica veröffentlichen"; $a->strings["Post to Friendica"] = "Wenn du diesen Link";
$a->strings[" from anywhere by bookmarking this Link."] = " von überall her indem du diesen Link zu deinen Lesezeichen hinzufügst."; $a->strings[" from anywhere by bookmarking this Link."] = "zu deinen Lesezeichen hinzufügst, kannst du von überallher Links bei Friendica veröffentlichen.";
$a->strings["Your posts and conversations"] = "Deine Beiträge und Unterhaltungen"; $a->strings["Your posts and conversations"] = "Deine Beiträge und Unterhaltungen";
$a->strings["Your profile page"] = "Deine Profilseite"; $a->strings["Your profile page"] = "Deine Profilseite";
$a->strings["Your contacts"] = "Deine Kontakte"; $a->strings["Your contacts"] = "Deine Kontakte";
@ -1401,7 +1401,7 @@ $a->strings["%s Administrator"] = "der Administrator von %s";
$a->strings["%s <!item_type!>"] = "%s <!item_type!>"; $a->strings["%s <!item_type!>"] = "%s <!item_type!>";
$a->strings["[Friendica:Notify] New mail received at %s"] = "[Friendica Meldung] Neue Nachricht erhalten von %s"; $a->strings["[Friendica:Notify] New mail received at %s"] = "[Friendica Meldung] Neue Nachricht erhalten von %s";
$a->strings["%s sent you a new private message at %s."] = "%s hat dir eine neue private Nachricht auf %s geschrieben."; $a->strings["%s sent you a new private message at %s."] = "%s hat dir eine neue private Nachricht auf %s geschrieben.";
$a->strings["%s sent you %s."] = "%s hat Dir geschickt %s"; $a->strings["%s sent you %s."] = "%s hat Dir %s geschickt";
$a->strings["a private message"] = "eine private Nachricht"; $a->strings["a private message"] = "eine private Nachricht";
$a->strings["Please visit %s to view and/or reply to your private messages."] = "Bitte besuche %s, um deine privaten Nachrichten anzusehen und/oder zu beantworten."; $a->strings["Please visit %s to view and/or reply to your private messages."] = "Bitte besuche %s, um deine privaten Nachrichten anzusehen und/oder zu beantworten.";
$a->strings["%s's"] = "%s's"; $a->strings["%s's"] = "%s's";
@ -1421,7 +1421,7 @@ $a->strings["tagged you"] = "erwähnte Dich";
$a->strings["[Friendica:Notify] %s tagged your post"] = "[Friendica Meldung] %s markierte Deinen Beitrag"; $a->strings["[Friendica:Notify] %s tagged your post"] = "[Friendica Meldung] %s markierte Deinen Beitrag";
$a->strings["%s tagged your post at %s"] = "%s hat deinen Beitrag auf %s getaggt"; $a->strings["%s tagged your post at %s"] = "%s hat deinen Beitrag auf %s getaggt";
$a->strings["%s tagged %s"] = "%s markierte %s"; $a->strings["%s tagged %s"] = "%s markierte %s";
$a->strings["your post"] = "Dein Beitrag"; $a->strings["your post"] = "Deinen Beitrag";
$a->strings["[Friendica:Notify] Introduction received"] = "[Friendica Meldung] Kontaktanfrage erhalten"; $a->strings["[Friendica:Notify] Introduction received"] = "[Friendica Meldung] Kontaktanfrage erhalten";
$a->strings["You've received an introduction from '%s' at %s"] = "Du hast eine Kontaktanfrage von '%s' auf %s erhalten"; $a->strings["You've received an introduction from '%s' at %s"] = "Du hast eine Kontaktanfrage von '%s' auf %s erhalten";
$a->strings["You've received %s from %s."] = "Du hast %s von %s erhalten."; $a->strings["You've received %s from %s."] = "Du hast %s von %s erhalten.";

4
view/theme/diabook-aerith/oembed_video.tpl Normal file
View file

@ -0,0 +1,4 @@
<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); yt_iframe(); return false;' style='float:left; margin: 1em; position: relative;'>
<img width='$tw' height='$th' src='$turl' >
<div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url(images/icons/48/play.png) no-repeat center center;'></div>
</a>

2
view/theme/diabook-aerith/style-network.css
View file

@ -2173,7 +2173,7 @@ blockquote {
color: #777; color: #777;
} }
.oembed { .oembed {
font-size: large;
font-weight: bold; font-weight: bold;
} }
.aprofile dt{ .aprofile dt{

2
view/theme/diabook-aerith/style-profile.css
View file

@ -2162,7 +2162,7 @@ blockquote {
color: #777; color: #777;
} }
.oembed { .oembed {
font-size: large;
font-weight: bold; font-weight: bold;
} }
.aprofile dt{ .aprofile dt{

4
view/theme/diabook-aerith/style.css
View file

@ -1276,7 +1276,7 @@ body .pageheader{
font-size: 20px; font-size: 20px;
margin-bottom: 20px; margin-bottom: 20px;
margin-top: 0px; margin-top: 0px;
max-width: 575px; max-width: 775px;
} }
.qcomment{ .qcomment{
max-width: 122px; max-width: 122px;
@ -2324,7 +2324,7 @@ blockquote {
color: #777; color: #777;
} }
.oembed { .oembed {
font-size: large;
font-weight: bold; font-weight: bold;
} }
.aprofile dt{ .aprofile dt{

45
view/theme/diabook-aerith/theme.php
View file

@ -3,13 +3,13 @@
/* /*
* Name: Diabook-aerith * Name: Diabook-aerith
* Description: Diabook-aerith : report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu * Description: Diabook-aerith : report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
* Version: (Version: 1.014) * Version: (Version: 1.015)
* Author: * Author:
*/ */
//print diabook-version for debugging //print diabook-version for debugging
$diabook_version = "Diabook-aerith (Version: 1.014)"; $diabook_version = "Diabook-aerith (Version: 1.015)";
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version); $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
@ -366,6 +366,35 @@ $a->page['htmlhead'] .= '
</script>'; </script>';
$a->page['htmlhead'] .= '
<script>
$(document).ready(function() {
$("iframe").each(function(){
var ifr_source = $(this).attr("src");
var wmode = "wmode=transparent";
if(ifr_source.indexOf("?") != -1) {
var getQString = ifr_source.split("?");
var oldString = getQString[1];
var newString = getQString[0];
$(this).attr("src",newString+"?"+wmode+"&"+oldString);
}
else $(this).attr("src",ifr_source+"?"+wmode);
});
});
function yt_iframe() {
$("iframe").load(function() {
var ifr_src = $(this).contents().find("body iframe").attr("src");
$("iframe").contents().find("body iframe").attr("src", ifr_src+"&wmode=transparent");
});
};
</script>';
if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
$a->page['htmlhead'] .= ' $a->page['htmlhead'] .= '
@ -374,7 +403,12 @@ $a->page['htmlhead'] .= '
$(function() { $(function() {
$(".oembed.photo img").aeImageResize({height: 400, width: 400}); $(".oembed.photo img").aeImageResize({height: 400, width: 400});
}); });
</script>';
if($ccCookie != "8") {
$a->page['htmlhead'] .= '
<script>
$("right_aside").ready(function(){ $("right_aside").ready(function(){
if($.cookie("close_pages") == "1") if($.cookie("close_pages") == "1")
@ -458,9 +492,10 @@ function close_lastlikes(){
document.getElementById( "close_lastlikes" ).style.display = "none"; document.getElementById( "close_lastlikes" ).style.display = "none";
$.cookie("close_lastlikes","1", { expires: 365, path: "/" }); $.cookie("close_lastlikes","1", { expires: 365, path: "/" });
}; };
</script>';}
$a->page['htmlhead'] .= '
<script>
function restore_boxes(){ function restore_boxes(){
$.cookie("close_pages","2", { expires: 365, path: "/" }); $.cookie("close_pages","2", { expires: 365, path: "/" });
$.cookie("close_helpers","2", { expires: 365, path: "/" }); $.cookie("close_helpers","2", { expires: 365, path: "/" });
@ -471,5 +506,5 @@ function restore_boxes(){
$.cookie("close_lastphotos","2", { expires: 365, path: "/" }); $.cookie("close_lastphotos","2", { expires: 365, path: "/" });
$.cookie("close_lastlikes","2", { expires: 365, path: "/" }); $.cookie("close_lastlikes","2", { expires: 365, path: "/" });
alert("Right-hand column was restored. Please refresh your browser"); alert("Right-hand column was restored. Please refresh your browser");
}; }
</script>';} </script>';}

4
view/theme/diabook-blue/oembed_video.tpl Normal file
View file

@ -0,0 +1,4 @@
<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); yt_iframe(); return false;' style='float:left; margin: 1em; position: relative;'>
<img width='$tw' height='$th' src='$turl' >
<div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url(images/icons/48/play.png) no-repeat center center;'></div>
</a>

2
view/theme/diabook-blue/style-network.css
View file

@ -2134,7 +2134,7 @@ blockquote {
color: #777; color: #777;
} }
.oembed { .oembed {
font-size: large;
font-weight: bold; font-weight: bold;
} }
.aprofile dt{ .aprofile dt{

2
view/theme/diabook-blue/style-profile.css
View file

@ -2129,7 +2129,7 @@ blockquote {
color: #777; color: #777;
} }
.oembed { .oembed {
font-size: large;
font-weight: bold; font-weight: bold;
} }
.aprofile dt{ .aprofile dt{

4
view/theme/diabook-blue/style.css
View file

@ -1236,7 +1236,7 @@ body .pageheader{
font-size: 20px; font-size: 20px;
margin-bottom: 20px; margin-bottom: 20px;
margin-top: 0px; margin-top: 0px;
max-width: 575px; max-width: 775px;
} }
.qcomment{ .qcomment{
max-width: 122px; max-width: 122px;
@ -2281,7 +2281,7 @@ blockquote {
color: #777; color: #777;
} }
.oembed { .oembed {
font-size: large;
font-weight: bold; font-weight: bold;
} }
.aprofile dt{ .aprofile dt{

48
view/theme/diabook-blue/theme.php
View file

@ -3,13 +3,13 @@
/* /*
* Name: Diabook-blue * Name: Diabook-blue
* Description: Diabook-blue: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu * Description: Diabook-blue: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
* Version: (Version: 1.014) * Version: (Version: 1.015)
* Author: * Author:
*/ */
//print diabook-version for debugging //print diabook-version for debugging
$diabook_version = "Diabook-blue (Version: 1.014)"; $diabook_version = "Diabook-blue (Version: 1.015)";
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version); $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
//change css on network and profilepages //change css on network and profilepages
@ -366,15 +366,50 @@ $a->page['htmlhead'] .= '
</script>'; </script>';
$a->page['htmlhead'] .= '
<script>
$(document).ready(function() {
$("iframe").each(function(){
var ifr_source = $(this).attr("src");
var wmode = "wmode=transparent";
if(ifr_source.indexOf("?") != -1) {
var getQString = ifr_source.split("?");
var oldString = getQString[1];
var newString = getQString[0];
$(this).attr("src",newString+"?"+wmode+"&"+oldString);
}
else $(this).attr("src",ifr_source+"?"+wmode);
});
});
function yt_iframe() {
$("iframe").load(function() {
var ifr_src = $(this).contents().find("body iframe").attr("src");
$("iframe").contents().find("body iframe").attr("src", ifr_src+"&wmode=transparent");
});
};
</script>';
if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
$a->page['htmlhead'] .= ' $a->page['htmlhead'] .= '
<script> <script>
$(function() { $(function() {
$(".oembed.photo img").aeImageResize({height: 400, width: 400}); $(".oembed.photo img").aeImageResize({height: 400, width: 400});
}); });
</script>';
if($ccCookie != "8") {
$a->page['htmlhead'] .= '
<script>
$("right_aside").ready(function(){ $("right_aside").ready(function(){
if($.cookie("close_pages") == "1") if($.cookie("close_pages") == "1")
@ -458,9 +493,10 @@ function close_lastlikes(){
document.getElementById( "close_lastlikes" ).style.display = "none"; document.getElementById( "close_lastlikes" ).style.display = "none";
$.cookie("close_lastlikes","1", { expires: 365, path: "/" }); $.cookie("close_lastlikes","1", { expires: 365, path: "/" });
}; };
</script>';}
$a->page['htmlhead'] .= '
<script>
function restore_boxes(){ function restore_boxes(){
$.cookie("close_pages","2", { expires: 365, path: "/" }); $.cookie("close_pages","2", { expires: 365, path: "/" });
$.cookie("close_helpers","2", { expires: 365, path: "/" }); $.cookie("close_helpers","2", { expires: 365, path: "/" });
@ -471,5 +507,5 @@ function restore_boxes(){
$.cookie("close_lastphotos","2", { expires: 365, path: "/" }); $.cookie("close_lastphotos","2", { expires: 365, path: "/" });
$.cookie("close_lastlikes","2", { expires: 365, path: "/" }); $.cookie("close_lastlikes","2", { expires: 365, path: "/" });
alert("Right-hand column was restored. Please refresh your browser"); alert("Right-hand column was restored. Please refresh your browser");
}; }
</script>';} </script>';}

4
view/theme/diabook-red/oembed_video.tpl Normal file
View file

@ -0,0 +1,4 @@
<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); yt_iframe(); return false;' style='float:left; margin: 1em; position: relative;'>
<img width='$tw' height='$th' src='$turl' >
<div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url(images/icons/48/play.png) no-repeat center center;'></div>
</a>

2
view/theme/diabook-red/style-network.css
View file

@ -2171,7 +2171,7 @@ blockquote {
color: #777; color: #777;
} }
.oembed { .oembed {
font-size: large;
font-weight: bold; font-weight: bold;
} }
.aprofile dt{ .aprofile dt{

2
view/theme/diabook-red/style-profile.css
View file

@ -2143,7 +2143,7 @@ blockquote {
color: #777; color: #777;
} }
.oembed { .oembed {
font-size: large;
font-weight: bold; font-weight: bold;
} }
.aprofile dt{ .aprofile dt{

4
view/theme/diabook-red/style.css
View file

@ -1266,7 +1266,7 @@ body .pageheader{
font-size: 20px; font-size: 20px;
margin-bottom: 20px; margin-bottom: 20px;
margin-top: 0px; margin-top: 0px;
max-width: 575px; max-width: 775px;
} }
.qcomment{ .qcomment{
max-width: 122px; max-width: 122px;
@ -2310,7 +2310,7 @@ blockquote {
color: #777; color: #777;
} }
.oembed { .oembed {
font-size: large;
font-weight: bold; font-weight: bold;
} }
.aprofile dt{ .aprofile dt{

48
view/theme/diabook-red/theme.php
View file

@ -3,13 +3,13 @@
/* /*
* Name: Diabook-red * Name: Diabook-red
* Description: Diabook-red: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu * Description: Diabook-red: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
* Version: (Version: 1.014) * Version: (Version: 1.015)
* Author: * Author:
*/ */
//print diabook-version for debugging //print diabook-version for debugging
$diabook_version = "Diabook-red (Version: 1.014)"; $diabook_version = "Diabook-red (Version: 1.015)";
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version); $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
//change css on network and profilepages //change css on network and profilepages
@ -367,15 +367,50 @@ $a->page['htmlhead'] .= '
</script>'; </script>';
$a->page['htmlhead'] .= '
<script>
$(document).ready(function() {
$("iframe").each(function(){
var ifr_source = $(this).attr("src");
var wmode = "wmode=transparent";
if(ifr_source.indexOf("?") != -1) {
var getQString = ifr_source.split("?");
var oldString = getQString[1];
var newString = getQString[0];
$(this).attr("src",newString+"?"+wmode+"&"+oldString);
}
else $(this).attr("src",ifr_source+"?"+wmode);
});
});
function yt_iframe() {
$("iframe").load(function() {
var ifr_src = $(this).contents().find("body iframe").attr("src");
$("iframe").contents().find("body iframe").attr("src", ifr_src+"&wmode=transparent");
});
};
</script>';
if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
$a->page['htmlhead'] .= ' $a->page['htmlhead'] .= '
<script> <script>
$(function() { $(function() {
$(".oembed.photo img").aeImageResize({height: 400, width: 400}); $(".oembed.photo img").aeImageResize({height: 400, width: 400});
}); });
</script>';
if($ccCookie != "8") {
$a->page['htmlhead'] .= '
<script>
$("right_aside").ready(function(){ $("right_aside").ready(function(){
if($.cookie("close_pages") == "1") if($.cookie("close_pages") == "1")
@ -459,9 +494,10 @@ function close_lastlikes(){
document.getElementById( "close_lastlikes" ).style.display = "none"; document.getElementById( "close_lastlikes" ).style.display = "none";
$.cookie("close_lastlikes","1", { expires: 365, path: "/" }); $.cookie("close_lastlikes","1", { expires: 365, path: "/" });
}; };
</script>';}
$a->page['htmlhead'] .= '
<script>
function restore_boxes(){ function restore_boxes(){
$.cookie("close_pages","2", { expires: 365, path: "/" }); $.cookie("close_pages","2", { expires: 365, path: "/" });
$.cookie("close_helpers","2", { expires: 365, path: "/" }); $.cookie("close_helpers","2", { expires: 365, path: "/" });
@ -472,5 +508,5 @@ function restore_boxes(){
$.cookie("close_lastphotos","2", { expires: 365, path: "/" }); $.cookie("close_lastphotos","2", { expires: 365, path: "/" });
$.cookie("close_lastlikes","2", { expires: 365, path: "/" }); $.cookie("close_lastlikes","2", { expires: 365, path: "/" });
alert("Right-hand column was restored. Please refresh your browser"); alert("Right-hand column was restored. Please refresh your browser");
}; }
</script>';} </script>';}

2
view/theme/diabook/oembed_video.tpl
View file

@ -1,4 +1,4 @@
<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); return false;' style='float:left; margin: 1em; position: relative;'> <a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); yt_iframe(); return false;' style='float:left; margin: 1em; position: relative;'>
<img width='$tw' height='$th' src='$turl' > <img width='$tw' height='$th' src='$turl' >
<div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url(images/icons/48/play.png) no-repeat center center;'></div> <div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url(images/icons/48/play.png) no-repeat center center;'></div>
</a> </a>

1
view/theme/diabook/style-network.css
View file

@ -2103,7 +2103,6 @@ blockquote {
color: #777; color: #777;
} }
.oembed { .oembed {
font-size: large;
font-weight: bold; font-weight: bold;
} }
.aprofile dt{ .aprofile dt{

1
view/theme/diabook/style-profile.css
View file

@ -2100,7 +2100,6 @@ blockquote {
color: #777; color: #777;
} }
.oembed { .oembed {
font-size: large;
font-weight: bold; font-weight: bold;
} }
.aprofile dt{ .aprofile dt{

3
view/theme/diabook/style.css
View file

@ -1219,7 +1219,7 @@ body .pageheader{
font-size: 20px; font-size: 20px;
margin-bottom: 20px; margin-bottom: 20px;
margin-top: 0px; margin-top: 0px;
max-width: 575px; max-width: 775px;
} }
.qcomment{ .qcomment{
max-width: 122px; max-width: 122px;
@ -2246,7 +2246,6 @@ blockquote {
color: #777; color: #777;
} }
.oembed { .oembed {
font-size: large;
font-weight: bold; font-weight: bold;
} }
.aprofile dt{ .aprofile dt{

30
view/theme/diabook/theme.php
View file

@ -3,13 +3,13 @@
/* /*
* Name: Diabook * Name: Diabook
* Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
* Version: (Version: 1.014) * Version: (Version: 1.015)
* Author: * Author:
*/ */
//print diabook-version for debugging //print diabook-version for debugging
$diabook_version = "Diabook (Version: 1.014)"; $diabook_version = "Diabook (Version: 1.015)";
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version); $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
//change css on network and profilepages //change css on network and profilepages
@ -376,11 +376,12 @@ $a->page['htmlhead'] .= '
</script>'; </script>';
$a->page['htmlhead'] .= ' $a->page['htmlhead'] .= '
<script> <script>
$(document).ready(function() { $(document).ready(function() {
$(".embed_yt iframe").each(function(){ $("iframe").each(function(){
var ifr_source = $(this).attr("src"); var ifr_source = $(this).attr("src");
var wmode = "wmode=transparent"; var wmode = "wmode=transparent";
if(ifr_source.indexOf("?") != -1) { if(ifr_source.indexOf("?") != -1) {
@ -391,8 +392,19 @@ $(document).ready(function() {
} }
else $(this).attr("src",ifr_source+"?"+wmode); else $(this).attr("src",ifr_source+"?"+wmode);
}); });
}); });
function yt_iframe() {
$("iframe").load(function() {
var ifr_src = $(this).contents().find("body iframe").attr("src");
$("iframe").contents().find("body iframe").attr("src", ifr_src+"&wmode=transparent");
});
};
</script>'; </script>';
@ -403,7 +415,12 @@ $a->page['htmlhead'] .= '
$(function() { $(function() {
$(".oembed.photo img").aeImageResize({height: 400, width: 400}); $(".oembed.photo img").aeImageResize({height: 400, width: 400});
}); });
</script>';
if($ccCookie != "8") {
$a->page['htmlhead'] .= '
<script>
$("right_aside").ready(function(){ $("right_aside").ready(function(){
if($.cookie("close_pages") == "1") if($.cookie("close_pages") == "1")
@ -487,9 +504,10 @@ function close_lastlikes(){
document.getElementById( "close_lastlikes" ).style.display = "none"; document.getElementById( "close_lastlikes" ).style.display = "none";
$.cookie("close_lastlikes","1", { expires: 365, path: "/" }); $.cookie("close_lastlikes","1", { expires: 365, path: "/" });
}; };
</script>';}
$a->page['htmlhead'] .= '
<script>
function restore_boxes(){ function restore_boxes(){
$.cookie("close_pages","2", { expires: 365, path: "/" }); $.cookie("close_pages","2", { expires: 365, path: "/" });
$.cookie("close_helpers","2", { expires: 365, path: "/" }); $.cookie("close_helpers","2", { expires: 365, path: "/" });
@ -500,5 +518,5 @@ function restore_boxes(){
$.cookie("close_lastphotos","2", { expires: 365, path: "/" }); $.cookie("close_lastphotos","2", { expires: 365, path: "/" });
$.cookie("close_lastlikes","2", { expires: 365, path: "/" }); $.cookie("close_lastlikes","2", { expires: 365, path: "/" });
alert("Right-hand column was restored. Please refresh your browser"); alert("Right-hand column was restored. Please refresh your browser");
}; }
</script>';} </script>';}