From 7d018f651d5f5b21a650d81ab5ea16a224585da6 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Mon, 9 Apr 2012 00:02:48 +0200 Subject: [PATCH 1/7] fixed z-index of youtube-vids fixed bug to hide right_side --- view/theme/diabook-aerith/oembed_video.tpl | 4 ++ view/theme/diabook-aerith/style-network.css | 2 +- view/theme/diabook-aerith/style-profile.css | 2 +- view/theme/diabook-aerith/style.css | 4 +- view/theme/diabook-aerith/theme.php | 45 ++++++++++++++++--- view/theme/diabook-blue/oembed_video.tpl | 4 ++ view/theme/diabook-blue/style-network.css | 2 +- view/theme/diabook-blue/style-profile.css | 2 +- view/theme/diabook-blue/style.css | 4 +- view/theme/diabook-blue/theme.php | 48 +++++++++++++++++--- view/theme/diabook-red/oembed_video.tpl | 4 ++ view/theme/diabook-red/style-network.css | 2 +- view/theme/diabook-red/style-profile.css | 2 +- view/theme/diabook-red/style.css | 4 +- view/theme/diabook-red/theme.php | 50 ++++++++++++++++++--- view/theme/diabook/oembed_video.tpl | 2 +- view/theme/diabook/style-network.css | 3 +- view/theme/diabook/style-profile.css | 3 +- view/theme/diabook/style-settings.css | 2 +- view/theme/diabook/style.css | 5 +-- view/theme/diabook/theme.php | 30 ++++++++++--- 21 files changed, 179 insertions(+), 45 deletions(-) create mode 100644 view/theme/diabook-aerith/oembed_video.tpl create mode 100644 view/theme/diabook-blue/oembed_video.tpl create mode 100644 view/theme/diabook-red/oembed_video.tpl diff --git a/view/theme/diabook-aerith/oembed_video.tpl b/view/theme/diabook-aerith/oembed_video.tpl new file mode 100644 index 00000000..d6d29f72 --- /dev/null +++ b/view/theme/diabook-aerith/oembed_video.tpl @@ -0,0 +1,4 @@ + + +
+ diff --git a/view/theme/diabook-aerith/style-network.css b/view/theme/diabook-aerith/style-network.css index 3b461e6d..07bda6a2 100644 --- a/view/theme/diabook-aerith/style-network.css +++ b/view/theme/diabook-aerith/style-network.css @@ -2173,7 +2173,7 @@ blockquote { color: #777; } .oembed { - font-size: large; + font-weight: bold; } .aprofile dt{ diff --git a/view/theme/diabook-aerith/style-profile.css b/view/theme/diabook-aerith/style-profile.css index 73f46e9e..8909f087 100644 --- a/view/theme/diabook-aerith/style-profile.css +++ b/view/theme/diabook-aerith/style-profile.css @@ -2162,7 +2162,7 @@ blockquote { color: #777; } .oembed { - font-size: large; + font-weight: bold; } .aprofile dt{ diff --git a/view/theme/diabook-aerith/style.css b/view/theme/diabook-aerith/style.css index f8265215..23ae0594 100644 --- a/view/theme/diabook-aerith/style.css +++ b/view/theme/diabook-aerith/style.css @@ -1276,7 +1276,7 @@ body .pageheader{ font-size: 20px; margin-bottom: 20px; margin-top: 0px; - max-width: 575px; + max-width: 775px; } .qcomment{ max-width: 122px; @@ -2324,7 +2324,7 @@ blockquote { color: #777; } .oembed { - font-size: large; + font-weight: bold; } .aprofile dt{ diff --git a/view/theme/diabook-aerith/theme.php b/view/theme/diabook-aerith/theme.php index a1ea51e8..40093e54 100755 --- a/view/theme/diabook-aerith/theme.php +++ b/view/theme/diabook-aerith/theme.php @@ -3,13 +3,13 @@ /* * Name: Diabook-aerith * 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: */ //print diabook-version for debugging -$diabook_version = "Diabook-aerith (Version: 1.014)"; +$diabook_version = "Diabook-aerith (Version: 1.015)"; $a->page['htmlhead'] .= sprintf('', $diabook_version); @@ -366,6 +366,35 @@ $a->page['htmlhead'] .= ' '; +$a->page['htmlhead'] .= ' + '; if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){ $a->page['htmlhead'] .= ' @@ -374,7 +403,12 @@ $a->page['htmlhead'] .= ' $(function() { $(".oembed.photo img").aeImageResize({height: 400, width: 400}); }); +'; + + if($ccCookie != "8") { +$a->page['htmlhead'] .= ' +';} +$a->page['htmlhead'] .= ' +';} \ No newline at end of file diff --git a/view/theme/diabook-blue/oembed_video.tpl b/view/theme/diabook-blue/oembed_video.tpl new file mode 100644 index 00000000..d6d29f72 --- /dev/null +++ b/view/theme/diabook-blue/oembed_video.tpl @@ -0,0 +1,4 @@ + + +
+ diff --git a/view/theme/diabook-blue/style-network.css b/view/theme/diabook-blue/style-network.css index bd1cb249..9baa83e8 100644 --- a/view/theme/diabook-blue/style-network.css +++ b/view/theme/diabook-blue/style-network.css @@ -2134,7 +2134,7 @@ blockquote { color: #777; } .oembed { - font-size: large; + font-weight: bold; } .aprofile dt{ diff --git a/view/theme/diabook-blue/style-profile.css b/view/theme/diabook-blue/style-profile.css index da826d74..1a067477 100644 --- a/view/theme/diabook-blue/style-profile.css +++ b/view/theme/diabook-blue/style-profile.css @@ -2129,7 +2129,7 @@ blockquote { color: #777; } .oembed { - font-size: large; + font-weight: bold; } .aprofile dt{ diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css index ebf68470..a0202856 100644 --- a/view/theme/diabook-blue/style.css +++ b/view/theme/diabook-blue/style.css @@ -1236,7 +1236,7 @@ body .pageheader{ font-size: 20px; margin-bottom: 20px; margin-top: 0px; - max-width: 575px; + max-width: 775px; } .qcomment{ max-width: 122px; @@ -2281,7 +2281,7 @@ blockquote { color: #777; } .oembed { - font-size: large; + font-weight: bold; } .aprofile dt{ diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php index a8b4fcd6..190533d1 100755 --- a/view/theme/diabook-blue/theme.php +++ b/view/theme/diabook-blue/theme.php @@ -3,13 +3,13 @@ /* * Name: Diabook-blue * 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: */ //print diabook-version for debugging -$diabook_version = "Diabook-blue (Version: 1.014)"; +$diabook_version = "Diabook-blue (Version: 1.015)"; $a->page['htmlhead'] .= sprintf('', $diabook_version); //change css on network and profilepages @@ -366,15 +366,50 @@ $a->page['htmlhead'] .= ' '; +$a->page['htmlhead'] .= ' + '; + if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){ $a->page['htmlhead'] .= ' '; + + if($ccCookie != "8") { +$a->page['htmlhead'] .= ' +';} +$a->page['htmlhead'] .= ' +';} diff --git a/view/theme/diabook-red/oembed_video.tpl b/view/theme/diabook-red/oembed_video.tpl new file mode 100644 index 00000000..d6d29f72 --- /dev/null +++ b/view/theme/diabook-red/oembed_video.tpl @@ -0,0 +1,4 @@ + + +
+ diff --git a/view/theme/diabook-red/style-network.css b/view/theme/diabook-red/style-network.css index efbec090..8d5e3fec 100644 --- a/view/theme/diabook-red/style-network.css +++ b/view/theme/diabook-red/style-network.css @@ -2171,7 +2171,7 @@ blockquote { color: #777; } .oembed { - font-size: large; + font-weight: bold; } .aprofile dt{ diff --git a/view/theme/diabook-red/style-profile.css b/view/theme/diabook-red/style-profile.css index ef6fd860..570057b4 100644 --- a/view/theme/diabook-red/style-profile.css +++ b/view/theme/diabook-red/style-profile.css @@ -2143,7 +2143,7 @@ blockquote { color: #777; } .oembed { - font-size: large; + font-weight: bold; } .aprofile dt{ diff --git a/view/theme/diabook-red/style.css b/view/theme/diabook-red/style.css index ef06ef5c..883f1137 100644 --- a/view/theme/diabook-red/style.css +++ b/view/theme/diabook-red/style.css @@ -1266,7 +1266,7 @@ body .pageheader{ font-size: 20px; margin-bottom: 20px; margin-top: 0px; - max-width: 575px; + max-width: 775px; } .qcomment{ max-width: 122px; @@ -2310,7 +2310,7 @@ blockquote { color: #777; } .oembed { - font-size: large; + font-weight: bold; } .aprofile dt{ diff --git a/view/theme/diabook-red/theme.php b/view/theme/diabook-red/theme.php index fae26ae7..85206bae 100755 --- a/view/theme/diabook-red/theme.php +++ b/view/theme/diabook-red/theme.php @@ -3,13 +3,13 @@ /* * Name: Diabook-red * 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: */ //print diabook-version for debugging -$diabook_version = "Diabook-red (Version: 1.014)"; +$diabook_version = "Diabook-red (Version: 1.015)"; $a->page['htmlhead'] .= sprintf('', $diabook_version); //change css on network and profilepages @@ -367,15 +367,50 @@ $a->page['htmlhead'] .= ' '; +$a->page['htmlhead'] .= ' + '; + if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){ $a->page['htmlhead'] .= ' '; + + if($ccCookie != "8") { +$a->page['htmlhead'] .= ' +';} +$a->page['htmlhead'] .= ' +';} + } +';} \ No newline at end of file diff --git a/view/theme/diabook/oembed_video.tpl b/view/theme/diabook/oembed_video.tpl index 02600727..d6d29f72 100644 --- a/view/theme/diabook/oembed_video.tpl +++ b/view/theme/diabook/oembed_video.tpl @@ -1,4 +1,4 @@ - +
diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css index af6e4027..9e57c17d 100644 --- a/view/theme/diabook/style-network.css +++ b/view/theme/diabook/style-network.css @@ -2103,7 +2103,6 @@ blockquote { color: #777; } .oembed { - font-size: large; font-weight: bold; } .aprofile dt{ @@ -2549,4 +2548,4 @@ list-style-type: disc; #photos-upload-newalbum-div { float: left; width: 175px; -} +} \ No newline at end of file diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css index 6b05903d..95e9061b 100644 --- a/view/theme/diabook/style-profile.css +++ b/view/theme/diabook/style-profile.css @@ -2100,7 +2100,6 @@ blockquote { color: #777; } .oembed { - font-size: large; font-weight: bold; } .aprofile dt{ @@ -2546,4 +2545,4 @@ list-style-type: disc; #photos-upload-newalbum-div { float: left; width: 175px; -} +} \ No newline at end of file diff --git a/view/theme/diabook/style-settings.css b/view/theme/diabook/style-settings.css index 60e2f336..fdb4f24c 100644 --- a/view/theme/diabook/style-settings.css +++ b/view/theme/diabook/style-settings.css @@ -2526,4 +2526,4 @@ list-style-type: disc; #photos-upload-newalbum-div { float: left; width: 175px; -} +} \ No newline at end of file diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index e99aa564..d11e3191 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -1219,7 +1219,7 @@ body .pageheader{ font-size: 20px; margin-bottom: 20px; margin-top: 0px; - max-width: 575px; + max-width: 775px; } .qcomment{ max-width: 122px; @@ -2246,7 +2246,6 @@ blockquote { color: #777; } .oembed { - font-size: large; font-weight: bold; } .aprofile dt{ @@ -2687,4 +2686,4 @@ list-style-type: disc; #photos-upload-newalbum-div { float: left; width: 175px; -} +} \ No newline at end of file diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index fbe42a30..92463962 100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -3,13 +3,13 @@ /* * Name: Diabook * 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: */ //print diabook-version for debugging -$diabook_version = "Diabook (Version: 1.014)"; +$diabook_version = "Diabook (Version: 1.015)"; $a->page['htmlhead'] .= sprintf('', $diabook_version); //change css on network and profilepages @@ -376,11 +376,12 @@ $a->page['htmlhead'] .= ' '; + $a->page['htmlhead'] .= ' '; @@ -403,7 +415,12 @@ $a->page['htmlhead'] .= ' $(function() { $(".oembed.photo img").aeImageResize({height: 400, width: 400}); }); +'; + + if($ccCookie != "8") { +$a->page['htmlhead'] .= ' +';} +$a->page['htmlhead'] .= ' +';} \ No newline at end of file From 977625a53b77c4944fc294fa670aae15c068b94b Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 8 Apr 2012 16:19:45 -0700 Subject: [PATCH 2/7] fix to wall_upload photos default permissions to use cid rather than uid. --- boot.php | 2 +- mod/item.php | 2 +- mod/wall_attach.php | 5 +- mod/wall_upload.php | 8 +- util/messages.po | 628 +++++++++++++++++++++++--------------------- 5 files changed, 338 insertions(+), 307 deletions(-) diff --git a/boot.php b/boot.php index b1c378d3..1815d37e 100644 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1305' ); +define ( 'FRIENDICA_VERSION', '2.3.1306' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1137 ); diff --git a/mod/item.php b/mod/item.php index 72e63865..82fb0bf7 100644 --- a/mod/item.php +++ b/mod/item.php @@ -351,7 +351,7 @@ function item_post(&$a) { $image_uri = substr($image_uri,0, strpos($image_uri,'-')); if(! strlen($image_uri)) 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` = '' AND `resource-id` = '%s' AND `uid` = %d LIMIT 1", dbesc($srch), diff --git a/mod/wall_attach.php b/mod/wall_attach.php index ecf47529..bee7c29d 100644 --- a/mod/wall_attach.php +++ b/mod/wall_attach.php @@ -7,7 +7,7 @@ function wall_attach_post(&$a) { if($a->argc > 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) ); if(! count($r)) @@ -21,6 +21,7 @@ function wall_attach_post(&$a) { $visitor = 0; $page_owner_uid = $r[0]['uid']; + $page_owner_cid = $r[0]['id']; $page_owner_nick = $r[0]['nickname']; $community_page = (($r[0]['page-flags'] == PAGE_COMMUNITY) ? true : false); @@ -73,7 +74,7 @@ function wall_attach_post(&$a) { dbesc($filedata), dbesc($created), dbesc($created), - dbesc('<' . $page_owner_uid . '>'), + dbesc('<' . $page_owner_cid . '>'), dbesc(''), dbesc(''), dbesc('') diff --git a/mod/wall_upload.php b/mod/wall_upload.php index 64f174a7..f341cc9c 100644 --- a/mod/wall_upload.php +++ b/mod/wall_upload.php @@ -6,7 +6,7 @@ function wall_upload_post(&$a) { if($a->argc > 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) ); if(! count($r)) @@ -16,10 +16,13 @@ function wall_upload_post(&$a) { else return; + + $can_post = false; $visitor = 0; $page_owner_uid = $r[0]['uid']; + $default_cid = $r[0]['id']; $page_owner_nick = $r[0]['nickname']; $community_page = (($r[0]['page-flags'] == PAGE_COMMUNITY) ? true : false); @@ -34,6 +37,7 @@ function wall_upload_post(&$a) { if(count($r)) { $can_post = true; $visitor = remote_user(); + $default_cid = $visitor; } } } @@ -76,7 +80,7 @@ function wall_upload_post(&$a) { $smallest = 0; - $defperm = '<' . $page_owner_uid . '>'; + $defperm = '<' . $default_cid . '>'; $r = $ph->store($page_owner_uid, $visitor, $hash, $filename, t('Wall Photos'), 0, 0, $defperm); diff --git a/util/messages.po b/util/messages.po index f68d1541..2749281a 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2.3.1305\n" +"Project-Id-Version: 2.3.1306\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" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -54,8 +54,8 @@ msgstr "" #: ../../mod/display.php:138 ../../mod/profiles.php:7 #: ../../mod/profiles.php:232 ../../mod/delegate.php:6 #: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81 -#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:456 -#: ../../include/items.php:3118 ../../index.php:294 +#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:460 +#: ../../include/items.php:3118 ../../index.php:306 msgid "Permission denied." msgstr "" @@ -132,12 +132,12 @@ msgstr "" #: ../../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: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/uhremotestorage/uhremotestorage.php:89 #: ../../addon/randplace/randplace.php:179 ../../addon/dwpost/dwpost.php:93 #: ../../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/openstreetmap/openstreetmap.php:70 #: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:94 @@ -147,11 +147,11 @@ msgstr "" #: ../../addon/statusnet/statusnet.php:318 #: ../../addon/statusnet/statusnet.php:325 #: ../../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/wppost/wppost.php:102 ../../addon/showmore/showmore.php:48 #: ../../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 #: ../../view/theme/quattro/config.php:21 ../../include/conversation.php:555 msgid "Submit" @@ -211,11 +211,11 @@ msgstr "" msgid "link to source" msgstr "" -#: ../../mod/events.php:296 ../../view/theme/diabook-red/theme.php:240 -#: ../../view/theme/diabook-blue/theme.php:240 -#: ../../view/theme/diabook/theme.php:248 -#: ../../view/theme/diabook-aerith/theme.php:240 ../../include/nav.php:52 -#: ../../boot.php:1421 +#: ../../mod/events.php:296 ../../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 +#: ../../boot.php:1422 msgid "Events" msgstr "" @@ -265,7 +265,7 @@ msgid "Description:" msgstr "" #: ../../mod/events.php:395 ../../include/event.php:37 -#: ../../include/bb2diaspora.php:260 ../../boot.php:1042 +#: ../../include/bb2diaspora.php:260 ../../boot.php:1043 msgid "Location:" msgstr "" @@ -347,10 +347,10 @@ msgstr "" #: ../../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:1395 ../../addon/communityhome/communityhome.php:110 -#: ../../view/theme/diabook-red/theme.php:110 -#: ../../view/theme/diabook-blue/theme.php:110 -#: ../../view/theme/diabook/theme.php:114 -#: ../../view/theme/diabook-aerith/theme.php:110 +#: ../../view/theme/diabook-red/theme.php:114 +#: ../../view/theme/diabook-blue/theme.php:114 +#: ../../view/theme/diabook/theme.php:117 +#: ../../view/theme/diabook-aerith/theme.php:115 msgid "Contact Photos" msgstr "" @@ -373,10 +373,10 @@ msgstr "" #: ../../mod/profile_photo.php:74 ../../mod/profile_photo.php:174 #: ../../mod/profile_photo.php:252 ../../mod/profile_photo.php:261 #: ../../addon/communityhome/communityhome.php:111 -#: ../../view/theme/diabook-red/theme.php:111 -#: ../../view/theme/diabook-blue/theme.php:111 -#: ../../view/theme/diabook/theme.php:115 -#: ../../view/theme/diabook-aerith/theme.php:111 +#: ../../view/theme/diabook-red/theme.php:115 +#: ../../view/theme/diabook-blue/theme.php:115 +#: ../../view/theme/diabook/theme.php:118 +#: ../../view/theme/diabook-aerith/theme.php:116 msgid "Profile Photos" msgstr "" @@ -398,10 +398,10 @@ msgstr "" #: ../../mod/photos.php:529 ../../mod/like.php:127 ../../mod/tagger.php:70 #: ../../addon/communityhome/communityhome.php:163 -#: ../../view/theme/diabook-red/theme.php:82 -#: ../../view/theme/diabook-blue/theme.php:82 -#: ../../view/theme/diabook/theme.php:86 -#: ../../view/theme/diabook-aerith/theme.php:82 ../../include/text.php:1297 +#: ../../view/theme/diabook-red/theme.php:86 +#: ../../view/theme/diabook-blue/theme.php:86 +#: ../../view/theme/diabook/theme.php:89 +#: ../../view/theme/diabook-aerith/theme.php:87 ../../include/text.php:1297 #: ../../include/diaspora.php:1654 ../../include/conversation.php:53 #: ../../include/conversation.php:126 msgid "photo" @@ -576,11 +576,10 @@ msgstr "" msgid "Not available." msgstr "" -#: ../../mod/community.php:30 ../../addon/pages/pages.php:75 -#: ../../view/theme/diabook-red/theme.php:242 -#: ../../view/theme/diabook-blue/theme.php:242 -#: ../../view/theme/diabook/theme.php:250 -#: ../../view/theme/diabook-aerith/theme.php:242 ../../include/nav.php:101 +#: ../../mod/community.php:30 ../../view/theme/diabook-red/theme.php:246 +#: ../../view/theme/diabook-blue/theme.php:246 +#: ../../view/theme/diabook/theme.php:253 +#: ../../view/theme/diabook-aerith/theme.php:247 ../../include/nav.php:101 msgid "Community" msgstr "" @@ -1165,7 +1164,7 @@ msgid "is interested in:" msgstr "" #: ../../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" msgstr "" @@ -1213,10 +1212,10 @@ msgstr "" msgid "Personal" msgstr "" -#: ../../mod/notifications.php:90 ../../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:77 +#: ../../mod/notifications.php:90 ../../view/theme/diabook-red/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:77 #: ../../include/nav.php:115 msgid "Home" msgstr "" @@ -1594,10 +1593,10 @@ msgstr "" msgid "Edit contact" msgstr "" -#: ../../mod/contacts.php:523 ../../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 ../../include/nav.php:139 +#: ../../mod/contacts.php:523 ../../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 ../../include/nav.php:139 msgid "Contacts" msgstr "" @@ -1630,8 +1629,8 @@ msgstr "" #: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107 #: ../../mod/register.php:392 ../../mod/register.php:446 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:732 -#: ../../addon/facebook/facebook.php:617 -#: ../../addon/facebook/facebook.php:1069 ../../include/items.php:2658 +#: ../../addon/facebook/facebook.php:621 +#: ../../addon/facebook/facebook.php:1073 ../../include/items.php:2658 msgid "Administrator" msgstr "" @@ -1733,52 +1732,52 @@ msgstr "" msgid " Cannot change to that email." msgstr "" -#: ../../mod/settings.php:420 ../../addon/facebook/facebook.php:445 -#: ../../addon/impressum/impressum.php:64 +#: ../../mod/settings.php:420 ../../addon/facebook/facebook.php:449 +#: ../../addon/impressum/impressum.php:75 #: ../../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." msgstr "" -#: ../../mod/settings.php:484 ../../view/theme/diabook-red/theme.php:284 -#: ../../view/theme/diabook-blue/theme.php:283 -#: ../../view/theme/diabook/theme.php:293 -#: ../../view/theme/diabook-aerith/theme.php:283 ../../include/nav.php:137 +#: ../../mod/settings.php:484 ../../view/theme/diabook-red/theme.php:288 +#: ../../view/theme/diabook-blue/theme.php:287 +#: ../../view/theme/diabook/theme.php:298 +#: ../../view/theme/diabook-aerith/theme.php:288 ../../include/nav.php:137 msgid "Account settings" msgstr "" -#: ../../mod/settings.php:489 ../../view/theme/diabook-red/theme.php:289 -#: ../../view/theme/diabook-blue/theme.php:288 -#: ../../view/theme/diabook/theme.php:298 -#: ../../view/theme/diabook-aerith/theme.php:288 +#: ../../mod/settings.php:489 ../../view/theme/diabook-red/theme.php:293 +#: ../../view/theme/diabook-blue/theme.php:292 +#: ../../view/theme/diabook/theme.php:303 +#: ../../view/theme/diabook-aerith/theme.php:293 msgid "Display settings" msgstr "" -#: ../../mod/settings.php:495 ../../view/theme/diabook-red/theme.php:298 -#: ../../view/theme/diabook-blue/theme.php:297 -#: ../../view/theme/diabook/theme.php:307 -#: ../../view/theme/diabook-aerith/theme.php:297 +#: ../../mod/settings.php:495 ../../view/theme/diabook-red/theme.php:302 +#: ../../view/theme/diabook-blue/theme.php:301 +#: ../../view/theme/diabook/theme.php:312 +#: ../../view/theme/diabook-aerith/theme.php:302 msgid "Connector settings" msgstr "" -#: ../../mod/settings.php:500 ../../view/theme/diabook-red/theme.php:303 -#: ../../view/theme/diabook-blue/theme.php:302 -#: ../../view/theme/diabook/theme.php:312 -#: ../../view/theme/diabook-aerith/theme.php:302 +#: ../../mod/settings.php:500 ../../view/theme/diabook-red/theme.php:307 +#: ../../view/theme/diabook-blue/theme.php:306 +#: ../../view/theme/diabook/theme.php:317 +#: ../../view/theme/diabook-aerith/theme.php:307 msgid "Plugin settings" msgstr "" -#: ../../mod/settings.php:505 ../../view/theme/diabook-red/theme.php:308 -#: ../../view/theme/diabook-blue/theme.php:307 -#: ../../view/theme/diabook/theme.php:317 -#: ../../view/theme/diabook-aerith/theme.php:307 +#: ../../mod/settings.php:505 ../../view/theme/diabook-red/theme.php:312 +#: ../../view/theme/diabook-blue/theme.php:311 +#: ../../view/theme/diabook/theme.php:322 +#: ../../view/theme/diabook-aerith/theme.php:312 msgid "Connections" msgstr "" -#: ../../mod/settings.php:510 ../../view/theme/diabook-red/theme.php:313 -#: ../../view/theme/diabook-blue/theme.php:312 -#: ../../view/theme/diabook/theme.php:322 -#: ../../view/theme/diabook-aerith/theme.php:312 +#: ../../mod/settings.php:510 ../../view/theme/diabook-red/theme.php:317 +#: ../../view/theme/diabook-blue/theme.php:316 +#: ../../view/theme/diabook/theme.php:327 +#: ../../view/theme/diabook-aerith/theme.php:317 msgid "Export personal data" msgstr "" @@ -1788,12 +1787,12 @@ msgid "Add application" msgstr "" #: ../../mod/settings.php:532 ../../mod/settings.php:559 -#: ../../addon/statusnet/statusnet.php:541 +#: ../../addon/statusnet/statusnet.php:547 msgid "Consumer Key" msgstr "" #: ../../mod/settings.php:533 ../../mod/settings.php:560 -#: ../../addon/statusnet/statusnet.php:540 +#: ../../addon/statusnet/statusnet.php:546 msgid "Consumer Secret" msgstr "" @@ -2258,12 +2257,12 @@ msgstr "" msgid "Invalid contact." msgstr "" -#: ../../mod/notes.php:44 ../../boot.php:1426 +#: ../../mod/notes.php:44 ../../boot.php:1427 msgid "Personal Notes" msgstr "" #: ../../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" msgstr "" @@ -2465,7 +2464,7 @@ msgstr "" msgid "Group name changed." 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" msgstr "" @@ -2505,12 +2504,12 @@ msgstr "" msgid "Profile Visibility Editor" msgstr "" -#: ../../mod/profperm.php:103 ../../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 +#: ../../mod/profperm.php:103 ../../view/theme/diabook-red/theme.php:241 +#: ../../view/theme/diabook-blue/theme.php:241 +#: ../../view/theme/diabook/theme.php:248 +#: ../../view/theme/diabook-aerith/theme.php:242 #: ../../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" msgstr "" @@ -2691,28 +2690,28 @@ msgid "People Search" msgstr "" #: ../../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:167 -#: ../../view/theme/diabook-red/theme.php:77 -#: ../../view/theme/diabook-red/theme.php:86 -#: ../../view/theme/diabook-blue/theme.php:77 -#: ../../view/theme/diabook-blue/theme.php:86 -#: ../../view/theme/diabook/theme.php:81 ../../view/theme/diabook/theme.php:90 -#: ../../view/theme/diabook-aerith/theme.php:77 -#: ../../view/theme/diabook-aerith/theme.php:86 +#: ../../view/theme/diabook-red/theme.php:81 +#: ../../view/theme/diabook-red/theme.php:90 +#: ../../view/theme/diabook-blue/theme.php:81 +#: ../../view/theme/diabook-blue/theme.php:90 +#: ../../view/theme/diabook/theme.php:84 ../../view/theme/diabook/theme.php:93 +#: ../../view/theme/diabook-aerith/theme.php:82 +#: ../../view/theme/diabook-aerith/theme.php:91 #: ../../include/diaspora.php:1654 ../../include/conversation.php:48 #: ../../include/conversation.php:57 ../../include/conversation.php:121 #: ../../include/conversation.php:130 msgid "status" msgstr "" -#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1444 +#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1550 #: ../../addon/communityhome/communityhome.php:172 -#: ../../view/theme/diabook-red/theme.php:91 -#: ../../view/theme/diabook-blue/theme.php:91 -#: ../../view/theme/diabook/theme.php:95 -#: ../../view/theme/diabook-aerith/theme.php:91 +#: ../../view/theme/diabook-red/theme.php:95 +#: ../../view/theme/diabook-blue/theme.php:95 +#: ../../view/theme/diabook/theme.php:98 +#: ../../view/theme/diabook-aerith/theme.php:96 #: ../../include/diaspora.php:1670 ../../include/conversation.php:65 #, php-format msgid "%1$s likes %2$s's %3$s" @@ -3032,7 +3031,7 @@ msgstr "" msgid "Advanced" msgstr "" -#: ../../mod/admin.php:365 ../../addon/statusnet/statusnet.php:538 +#: ../../mod/admin.php:365 ../../addon/statusnet/statusnet.php:544 msgid "Site name" msgstr "" @@ -3758,30 +3757,30 @@ msgstr "" msgid "Age: " msgstr "" -#: ../../mod/profiles.php:476 ../../view/theme/diabook-red/theme.php:294 -#: ../../view/theme/diabook-blue/theme.php:293 -#: ../../view/theme/diabook/theme.php:303 -#: ../../view/theme/diabook-aerith/theme.php:293 +#: ../../mod/profiles.php:476 ../../view/theme/diabook-red/theme.php:298 +#: ../../view/theme/diabook-blue/theme.php:297 +#: ../../view/theme/diabook/theme.php:308 +#: ../../view/theme/diabook-aerith/theme.php:298 msgid "Edit/Manage Profiles" msgstr "" -#: ../../mod/profiles.php:477 ../../boot.php:1008 +#: ../../mod/profiles.php:477 ../../boot.php:1009 msgid "Change profile photo" msgstr "" -#: ../../mod/profiles.php:478 ../../boot.php:1009 +#: ../../mod/profiles.php:478 ../../boot.php:1010 msgid "Create New Profile" msgstr "" -#: ../../mod/profiles.php:489 ../../boot.php:1019 +#: ../../mod/profiles.php:489 ../../boot.php:1020 msgid "Profile Image" msgstr "" -#: ../../mod/profiles.php:491 ../../boot.php:1022 +#: ../../mod/profiles.php:491 ../../boot.php:1023 msgid "visible to everybody" msgstr "" -#: ../../mod/profiles.php:492 ../../boot.php:1023 +#: ../../mod/profiles.php:492 ../../boot.php:1024 msgid "Edit visibility" msgstr "" @@ -3833,10 +3832,10 @@ msgstr "" msgid "No entries." msgstr "" -#: ../../mod/suggest.php:38 ../../view/theme/diabook-red/theme.php:146 -#: ../../view/theme/diabook-blue/theme.php:146 -#: ../../view/theme/diabook/theme.php:150 -#: ../../view/theme/diabook-aerith/theme.php:146 +#: ../../mod/suggest.php:38 ../../view/theme/diabook-red/theme.php:150 +#: ../../view/theme/diabook-blue/theme.php:150 +#: ../../view/theme/diabook/theme.php:153 +#: ../../view/theme/diabook-aerith/theme.php:151 #: ../../include/contact_widgets.php:33 msgid "Friend Suggestions" msgstr "" @@ -3851,10 +3850,10 @@ msgstr "" msgid "Ignore/Hide" msgstr "" -#: ../../mod/directory.php:47 ../../view/theme/diabook-red/theme.php:144 -#: ../../view/theme/diabook-blue/theme.php:144 -#: ../../view/theme/diabook/theme.php:148 -#: ../../view/theme/diabook-aerith/theme.php:144 +#: ../../mod/directory.php:47 ../../view/theme/diabook-red/theme.php:148 +#: ../../view/theme/diabook-blue/theme.php:148 +#: ../../view/theme/diabook/theme.php:151 +#: ../../view/theme/diabook-aerith/theme.php:149 msgid "Global Directory" msgstr "" @@ -4040,71 +4039,71 @@ msgstr "" msgid "Connection accepted at %s" msgstr "" -#: ../../addon/facebook/facebook.php:462 +#: ../../addon/facebook/facebook.php:466 msgid "Facebook disabled" msgstr "" -#: ../../addon/facebook/facebook.php:467 +#: ../../addon/facebook/facebook.php:471 msgid "Updating contacts" msgstr "" -#: ../../addon/facebook/facebook.php:488 +#: ../../addon/facebook/facebook.php:492 msgid "Facebook API key is missing." msgstr "" -#: ../../addon/facebook/facebook.php:495 +#: ../../addon/facebook/facebook.php:499 msgid "Facebook Connect" msgstr "" -#: ../../addon/facebook/facebook.php:501 +#: ../../addon/facebook/facebook.php:505 msgid "Install Facebook connector for this account." msgstr "" -#: ../../addon/facebook/facebook.php:508 +#: ../../addon/facebook/facebook.php:512 msgid "Remove Facebook connector" msgstr "" -#: ../../addon/facebook/facebook.php:513 +#: ../../addon/facebook/facebook.php:517 msgid "" "Re-authenticate [This is necessary whenever your Facebook password is " "changed.]" msgstr "" -#: ../../addon/facebook/facebook.php:520 +#: ../../addon/facebook/facebook.php:524 msgid "Post to Facebook by default" msgstr "" -#: ../../addon/facebook/facebook.php:524 +#: ../../addon/facebook/facebook.php:528 msgid "Link all your Facebook friends and conversations on this website" msgstr "" -#: ../../addon/facebook/facebook.php:526 +#: ../../addon/facebook/facebook.php:530 msgid "" "Facebook conversations consist of your profile wall and your friend " "stream." msgstr "" -#: ../../addon/facebook/facebook.php:527 +#: ../../addon/facebook/facebook.php:531 msgid "On this website, your Facebook friend stream is only visible to you." msgstr "" -#: ../../addon/facebook/facebook.php:528 +#: ../../addon/facebook/facebook.php:532 msgid "" "The following settings determine the privacy of your Facebook profile wall " "on this website." msgstr "" -#: ../../addon/facebook/facebook.php:532 +#: ../../addon/facebook/facebook.php:536 msgid "" "On this website your Facebook profile wall conversations will only be " "visible to you" msgstr "" -#: ../../addon/facebook/facebook.php:537 +#: ../../addon/facebook/facebook.php:541 msgid "Do not import your Facebook profile wall conversations" msgstr "" -#: ../../addon/facebook/facebook.php:539 +#: ../../addon/facebook/facebook.php:543 msgid "" "If you choose to link conversations and leave both of these boxes unchecked, " "your Facebook profile wall will be merged with your profile wall on this " @@ -4112,114 +4111,114 @@ msgid "" "who may see the conversations." msgstr "" -#: ../../addon/facebook/facebook.php:544 +#: ../../addon/facebook/facebook.php:548 msgid "Comma separated applications to ignore" msgstr "" -#: ../../addon/facebook/facebook.php:615 +#: ../../addon/facebook/facebook.php:619 msgid "Problems with Facebook Real-Time Updates" msgstr "" -#: ../../addon/facebook/facebook.php:639 +#: ../../addon/facebook/facebook.php:643 #: ../../include/contact_selectors.php:81 msgid "Facebook" msgstr "" -#: ../../addon/facebook/facebook.php:640 +#: ../../addon/facebook/facebook.php:644 msgid "Facebook Connector Settings" msgstr "" -#: ../../addon/facebook/facebook.php:649 +#: ../../addon/facebook/facebook.php:653 msgid "Facebook API Key" msgstr "" -#: ../../addon/facebook/facebook.php:658 +#: ../../addon/facebook/facebook.php:662 msgid "" "Error: it appears that you have specified the App-ID and -Secret in your ." "htconfig.php file. As long as they are specified there, they cannot be set " "using this form.

" msgstr "" -#: ../../addon/facebook/facebook.php:663 +#: ../../addon/facebook/facebook.php:667 msgid "" "Error: the given API Key seems to be incorrect (the application access token " "could not be retrieved)." msgstr "" -#: ../../addon/facebook/facebook.php:665 +#: ../../addon/facebook/facebook.php:669 msgid "The given API Key seems to work correctly." msgstr "" -#: ../../addon/facebook/facebook.php:667 +#: ../../addon/facebook/facebook.php:671 msgid "" "The correctness of the API Key could not be detected. Somthing strange's " "going on." msgstr "" -#: ../../addon/facebook/facebook.php:670 +#: ../../addon/facebook/facebook.php:674 msgid "App-ID / API-Key" msgstr "" -#: ../../addon/facebook/facebook.php:671 +#: ../../addon/facebook/facebook.php:675 msgid "Application secret" msgstr "" -#: ../../addon/facebook/facebook.php:672 +#: ../../addon/facebook/facebook.php:676 #, php-format msgid "Polling Interval (min. %1$s minutes)" msgstr "" -#: ../../addon/facebook/facebook.php:676 +#: ../../addon/facebook/facebook.php:680 msgid "Real-Time Updates" msgstr "" -#: ../../addon/facebook/facebook.php:680 +#: ../../addon/facebook/facebook.php:684 msgid "Real-Time Updates are activated." msgstr "" -#: ../../addon/facebook/facebook.php:681 +#: ../../addon/facebook/facebook.php:685 msgid "Deactivate Real-Time Updates" msgstr "" -#: ../../addon/facebook/facebook.php:683 +#: ../../addon/facebook/facebook.php:687 msgid "Real-Time Updates not activated." msgstr "" -#: ../../addon/facebook/facebook.php:683 +#: ../../addon/facebook/facebook.php:687 msgid "Activate Real-Time Updates" msgstr "" -#: ../../addon/facebook/facebook.php:697 +#: ../../addon/facebook/facebook.php:701 msgid "The new values have been saved." msgstr "" -#: ../../addon/facebook/facebook.php:716 +#: ../../addon/facebook/facebook.php:720 msgid "Post to Facebook" msgstr "" -#: ../../addon/facebook/facebook.php:808 +#: ../../addon/facebook/facebook.php:812 msgid "" "Post to Facebook cancelled because of multi-network access permission " "conflict." msgstr "" -#: ../../addon/facebook/facebook.php:1026 +#: ../../addon/facebook/facebook.php:1030 msgid "View on Friendica" msgstr "" -#: ../../addon/facebook/facebook.php:1051 +#: ../../addon/facebook/facebook.php:1055 msgid "Facebook post failed. Queued for retry." msgstr "" -#: ../../addon/facebook/facebook.php:1087 +#: ../../addon/facebook/facebook.php:1091 msgid "Your Facebook connection became invalid. Please Re-authenticate." msgstr "" -#: ../../addon/facebook/facebook.php:1088 +#: ../../addon/facebook/facebook.php:1092 msgid "Facebook connection became invalid" msgstr "" -#: ../../addon/facebook/facebook.php:1089 +#: ../../addon/facebook/facebook.php:1093 #, php-format msgid "" "Hi %1$s,\n" @@ -4229,11 +4228,6 @@ msgid "" "connection again, you have to %3$sre-authenticate the Facebook-connector%4$s." msgstr "" -#: ../../addon/facebook/facebook.php:1214 -#: ../../addon/facebook/facebook.php:1223 ../../include/bb2diaspora.php:102 -msgid "link" -msgstr "" - #: ../../addon/widgets/widget_like.php:58 #, php-format msgid "%d person likes this" @@ -4383,10 +4377,10 @@ msgid "Latest likes" msgstr "" #: ../../addon/communityhome/communityhome.php:155 -#: ../../view/theme/diabook-red/theme.php:74 -#: ../../view/theme/diabook-blue/theme.php:74 -#: ../../view/theme/diabook/theme.php:78 -#: ../../view/theme/diabook-aerith/theme.php:74 ../../include/text.php:1295 +#: ../../view/theme/diabook-red/theme.php:78 +#: ../../view/theme/diabook-blue/theme.php:78 +#: ../../view/theme/diabook/theme.php:81 +#: ../../view/theme/diabook-aerith/theme.php:79 ../../include/text.php:1295 #: ../../include/conversation.php:45 ../../include/conversation.php:118 msgid "event" msgstr "" @@ -4594,41 +4588,69 @@ msgstr "" msgid "URL to embed:" msgstr "" -#: ../../addon/impressum/impressum.php:25 +#: ../../addon/impressum/impressum.php:34 msgid "Impressum" msgstr "" -#: ../../addon/impressum/impressum.php:38 -#: ../../addon/impressum/impressum.php:40 -#: ../../addon/impressum/impressum.php:70 +#: ../../addon/impressum/impressum.php:47 +#: ../../addon/impressum/impressum.php:49 +#: ../../addon/impressum/impressum.php:81 msgid "Site Owner" msgstr "" -#: ../../addon/impressum/impressum.php:38 -#: ../../addon/impressum/impressum.php:74 +#: ../../addon/impressum/impressum.php:47 +#: ../../addon/impressum/impressum.php:85 msgid "Email Address" msgstr "" -#: ../../addon/impressum/impressum.php:43 -#: ../../addon/impressum/impressum.php:72 +#: ../../addon/impressum/impressum.php:52 +#: ../../addon/impressum/impressum.php:83 msgid "Postal Address" msgstr "" -#: ../../addon/impressum/impressum.php:49 +#: ../../addon/impressum/impressum.php:58 msgid "" "The impressum addon needs to be configured!
Please add at least the " "owner variable to your config file. For other variables please " "refer to the README file of the addon." 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" 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" 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 msgid "Report Bug" msgstr "" @@ -4879,7 +4901,7 @@ msgstr "" msgid "Clear OAuth configuration" msgstr "" -#: ../../addon/statusnet/statusnet.php:539 +#: ../../addon/statusnet/statusnet.php:545 msgid "API URL" msgstr "" @@ -4982,11 +5004,11 @@ msgstr "" msgid "Cutting posts after how much characters" msgstr "" -#: ../../addon/showmore/showmore.php:64 +#: ../../addon/showmore/showmore.php:65 msgid "Show More Settings saved." msgstr "" -#: ../../addon/showmore/showmore.php:86 ../../include/conversation.php:466 +#: ../../addon/showmore/showmore.php:87 ../../include/conversation.php:466 #: ../../boot.php:495 msgid "show more" msgstr "" @@ -5089,11 +5111,11 @@ msgstr "" msgid "Send #tag links to Twitter" msgstr "" -#: ../../addon/twitter/twitter.php:371 +#: ../../addon/twitter/twitter.php:377 msgid "Consumer key" msgstr "" -#: ../../addon/twitter/twitter.php:372 +#: ../../addon/twitter/twitter.php:378 msgid "Consumer secret" msgstr "" @@ -5129,159 +5151,159 @@ msgstr "" msgid "Post to Posterous by default" msgstr "" -#: ../../view/theme/diabook-red/theme.php:23 -#: ../../view/theme/diabook-blue/theme.php:23 -#: ../../view/theme/diabook/theme.php:27 -#: ../../view/theme/dispy-dark/theme.php:116 -#: ../../view/theme/diabook-aerith/theme.php:23 +#: ../../view/theme/diabook-red/theme.php:27 +#: ../../view/theme/diabook-blue/theme.php:27 +#: ../../view/theme/diabook/theme.php:30 +#: ../../view/theme/dispy-dark/theme.php:120 +#: ../../view/theme/diabook-aerith/theme.php:28 msgid "Last users" msgstr "" -#: ../../view/theme/diabook-red/theme.php:52 -#: ../../view/theme/diabook-blue/theme.php:52 -#: ../../view/theme/diabook/theme.php:56 -#: ../../view/theme/diabook-aerith/theme.php:52 +#: ../../view/theme/diabook-red/theme.php:56 +#: ../../view/theme/diabook-blue/theme.php:56 +#: ../../view/theme/diabook/theme.php:59 +#: ../../view/theme/diabook-aerith/theme.php:57 msgid "Last likes" msgstr "" -#: ../../view/theme/diabook-red/theme.php:97 -#: ../../view/theme/diabook-blue/theme.php:97 -#: ../../view/theme/diabook/theme.php:101 -#: ../../view/theme/diabook-aerith/theme.php:97 +#: ../../view/theme/diabook-red/theme.php:101 +#: ../../view/theme/diabook-blue/theme.php:101 +#: ../../view/theme/diabook/theme.php:104 +#: ../../view/theme/diabook-aerith/theme.php:102 msgid "Last photos" msgstr "" -#: ../../view/theme/diabook-red/theme.php:142 -#: ../../view/theme/diabook-blue/theme.php:142 -#: ../../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-red/theme.php:146 +#: ../../view/theme/diabook-blue/theme.php:146 #: ../../view/theme/diabook/theme.php:149 -#: ../../view/theme/diabook-aerith/theme.php:145 -#: ../../include/contact_widgets.php:34 -msgid "Similar Interests" +#: ../../view/theme/diabook-aerith/theme.php:147 +msgid "Find Friends" msgstr "" #: ../../view/theme/diabook-red/theme.php:147 #: ../../view/theme/diabook-blue/theme.php:147 -#: ../../view/theme/diabook/theme.php:151 -#: ../../view/theme/diabook-aerith/theme.php:147 +#: ../../view/theme/diabook/theme.php:150 +#: ../../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 msgid "Invite Friends" msgstr "" -#: ../../view/theme/diabook-red/theme.php:162 -#: ../../view/theme/diabook-red/theme.php:243 -#: ../../view/theme/diabook-blue/theme.php:162 -#: ../../view/theme/diabook-blue/theme.php:243 -#: ../../view/theme/diabook/theme.php:167 -#: ../../view/theme/diabook/theme.php:251 -#: ../../view/theme/diabook-aerith/theme.php:162 -#: ../../view/theme/diabook-aerith/theme.php:243 +#: ../../view/theme/diabook-red/theme.php:166 +#: ../../view/theme/diabook-red/theme.php:247 +#: ../../view/theme/diabook-blue/theme.php:166 +#: ../../view/theme/diabook-blue/theme.php:247 +#: ../../view/theme/diabook/theme.php:170 +#: ../../view/theme/diabook/theme.php:254 +#: ../../view/theme/diabook-aerith/theme.php:167 +#: ../../view/theme/diabook-aerith/theme.php:248 msgid "Community Pages" msgstr "" -#: ../../view/theme/diabook-red/theme.php:195 -#: ../../view/theme/diabook-blue/theme.php:195 -#: ../../view/theme/diabook/theme.php:200 -#: ../../view/theme/diabook-aerith/theme.php:195 +#: ../../view/theme/diabook-red/theme.php:199 +#: ../../view/theme/diabook-blue/theme.php:199 +#: ../../view/theme/diabook/theme.php:203 +#: ../../view/theme/diabook-aerith/theme.php:200 msgid "Help or @NewHere ?" msgstr "" -#: ../../view/theme/diabook-red/theme.php:201 -#: ../../view/theme/diabook-blue/theme.php:201 -#: ../../view/theme/diabook/theme.php:206 -#: ../../view/theme/diabook-aerith/theme.php:201 +#: ../../view/theme/diabook-red/theme.php:205 +#: ../../view/theme/diabook-blue/theme.php:205 +#: ../../view/theme/diabook/theme.php:209 +#: ../../view/theme/diabook-aerith/theme.php:206 msgid "Connect Services" msgstr "" -#: ../../view/theme/diabook-red/theme.php:207 -#: ../../view/theme/diabook-blue/theme.php:207 -#: ../../view/theme/diabook/theme.php:212 -#: ../../view/theme/diabook-aerith/theme.php:207 +#: ../../view/theme/diabook-red/theme.php:211 +#: ../../view/theme/diabook-blue/theme.php:211 +#: ../../view/theme/diabook/theme.php:215 +#: ../../view/theme/diabook-aerith/theme.php:212 msgid "PostIt to Friendica" msgstr "" -#: ../../view/theme/diabook-red/theme.php:207 -#: ../../view/theme/diabook-blue/theme.php:207 -#: ../../view/theme/diabook/theme.php:212 -#: ../../view/theme/diabook-aerith/theme.php:207 +#: ../../view/theme/diabook-red/theme.php:211 +#: ../../view/theme/diabook-blue/theme.php:211 +#: ../../view/theme/diabook/theme.php:215 +#: ../../view/theme/diabook-aerith/theme.php:212 msgid "Post to Friendica" msgstr "" -#: ../../view/theme/diabook-red/theme.php:208 -#: ../../view/theme/diabook-blue/theme.php:208 -#: ../../view/theme/diabook/theme.php:213 -#: ../../view/theme/diabook-aerith/theme.php:208 +#: ../../view/theme/diabook-red/theme.php:212 +#: ../../view/theme/diabook-blue/theme.php:212 +#: ../../view/theme/diabook/theme.php:216 +#: ../../view/theme/diabook-aerith/theme.php:213 msgid " from anywhere by bookmarking this Link." 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-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-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" msgstr "" -#: ../../view/theme/diabook-red/theme.php:241 -#: ../../view/theme/diabook-blue/theme.php:241 -#: ../../view/theme/diabook/theme.php:249 -#: ../../view/theme/diabook-aerith/theme.php:241 ../../include/nav.php:53 +#: ../../view/theme/diabook-red/theme.php:245 +#: ../../view/theme/diabook-blue/theme.php:245 +#: ../../view/theme/diabook/theme.php:252 +#: ../../view/theme/diabook-aerith/theme.php:246 ../../include/nav.php:53 msgid "Personal notes" msgstr "" -#: ../../view/theme/diabook-red/theme.php:241 -#: ../../view/theme/diabook-blue/theme.php:241 -#: ../../view/theme/diabook/theme.php:249 -#: ../../view/theme/diabook-aerith/theme.php:241 ../../include/nav.php:53 +#: ../../view/theme/diabook-red/theme.php:245 +#: ../../view/theme/diabook-blue/theme.php:245 +#: ../../view/theme/diabook/theme.php:252 +#: ../../view/theme/diabook-aerith/theme.php:246 ../../include/nav.php:53 msgid "Your personal photos" msgstr "" @@ -5305,7 +5327,7 @@ msgstr "" msgid "Color scheme" msgstr "" -#: ../../include/profile_advanced.php:17 ../../boot.php:1044 +#: ../../include/profile_advanced.php:17 ../../boot.php:1045 msgid "Gender:" msgstr "" @@ -5326,11 +5348,11 @@ msgstr "" msgid "Age:" msgstr "" -#: ../../include/profile_advanced.php:37 ../../boot.php:1047 +#: ../../include/profile_advanced.php:37 ../../boot.php:1048 msgid "Status:" msgstr "" -#: ../../include/profile_advanced.php:45 ../../boot.php:1049 +#: ../../include/profile_advanced.php:45 ../../boot.php:1050 msgid "Homepage:" msgstr "" @@ -5898,7 +5920,7 @@ msgstr "" msgid "End this session" msgstr "" -#: ../../include/nav.php:49 ../../boot.php:1403 +#: ../../include/nav.php:49 ../../boot.php:1404 msgid "Status" msgstr "" @@ -5978,11 +6000,11 @@ msgstr "" msgid "Manage other pages" msgstr "" -#: ../../include/nav.php:138 ../../boot.php:1002 +#: ../../include/nav.php:138 ../../boot.php:1003 msgid "Profiles" msgstr "" -#: ../../include/nav.php:138 ../../boot.php:1002 +#: ../../include/nav.php:138 ../../boot.php:1003 msgid "Manage/edit profiles" msgstr "" @@ -6144,7 +6166,7 @@ msgstr "" msgid "%1$d %2$s ago" msgstr "" -#: ../../include/poller.php:533 +#: ../../include/poller.php:543 msgid "From: " msgstr "" @@ -6152,7 +6174,7 @@ msgstr "" msgid "$1 wrote:" msgstr "" -#: ../../include/bbcode.php:237 ../../include/bbcode.php:303 +#: ../../include/bbcode.php:238 ../../include/bbcode.php:304 msgid "Image/photo" msgstr "" @@ -6378,6 +6400,10 @@ msgstr "" msgid "image/photo" msgstr "" +#: ../../include/bb2diaspora.php:102 +msgid "link" +msgstr "" + #: ../../include/security.php:21 msgid "Welcome " msgstr "" @@ -6636,42 +6662,42 @@ msgstr "" msgid "Forgot your password?" msgstr "" -#: ../../boot.php:935 +#: ../../boot.php:936 msgid "Edit profile" msgstr "" -#: ../../boot.php:994 +#: ../../boot.php:995 msgid "Message" msgstr "" -#: ../../boot.php:1109 ../../boot.php:1180 +#: ../../boot.php:1110 ../../boot.php:1181 msgid "g A l F d" msgstr "" -#: ../../boot.php:1110 ../../boot.php:1181 +#: ../../boot.php:1111 ../../boot.php:1182 msgid "F d" msgstr "" -#: ../../boot.php:1135 +#: ../../boot.php:1136 msgid "Birthday Reminders" msgstr "" -#: ../../boot.php:1136 +#: ../../boot.php:1137 msgid "Birthdays this week:" msgstr "" -#: ../../boot.php:1159 ../../boot.php:1223 +#: ../../boot.php:1160 ../../boot.php:1224 msgid "[today]" msgstr "" -#: ../../boot.php:1204 +#: ../../boot.php:1205 msgid "Event Reminders" msgstr "" -#: ../../boot.php:1205 +#: ../../boot.php:1206 msgid "Events this week:" msgstr "" -#: ../../boot.php:1217 +#: ../../boot.php:1218 msgid "[No description]" msgstr "" From de3b9e95847640a0cc8119ac0bcc0141cc0403d4 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 8 Apr 2012 17:28:36 -0700 Subject: [PATCH 3/7] send zrl after dfrn_request homecoming for manual entries --- mod/dfrn_request.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index 5881b7b5..80d27ac3 100644 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -180,7 +180,7 @@ function dfrn_request_post(&$a) { // (ignore reply, nothing we can do it failed) - goaway($dfrn_url); + goaway(zrl($dfrn_url)); return; // NOTREACHED } From 5183d4f77d59b80964d6d1fab1696815eb7235a3 Mon Sep 17 00:00:00 2001 From: zottel Date: Mon, 9 Apr 2012 02:30:18 +0200 Subject: [PATCH 4/7] Some new German translations --- view/de/messages.po | 118 ++++++++++++++++++++++---------------------- view/de/strings.php | 10 ++-- 2 files changed, 64 insertions(+), 64 deletions(-) diff --git a/view/de/messages.po b/view/de/messages.po index 1036e7b7..c67aebb7 100644 --- a/view/de/messages.po +++ b/view/de/messages.po @@ -16,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n" -"POT-Creation-Date: 2012-04-05 10:00-0700\n" -"PO-Revision-Date: 2012-04-06 10:40+0000\n" -"Last-Translator: bavatar \n" +"POT-Creation-Date: 2012-04-06 10:00-0700\n" +"PO-Revision-Date: 2012-04-08 23:57+0000\n" +"Last-Translator: zottel \n" "Language-Team: German (http://www.transifex.net/projects/p/friendica/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -216,7 +216,7 @@ msgstr "l, F j" msgid "Edit event" msgstr "Veranstaltung bearbeiten" -#: ../../mod/events.php:272 ../../include/text.php:1050 +#: ../../mod/events.php:272 ../../include/text.php:1053 msgid "link to source" msgstr "Link zum Originalbeitrag" @@ -410,7 +410,7 @@ msgstr "wurde getaggt in einem" #: ../../view/theme/diabook-red/theme.php:82 #: ../../view/theme/diabook-blue/theme.php:82 #: ../../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/conversation.php:126 msgid "photo" @@ -2234,7 +2234,7 @@ msgstr "Markierte" msgid "Shared Links" msgstr "Geteilte Links" -#: ../../mod/network.php:270 +#: ../../mod/network.php:274 #, php-format msgid "Warning: This group contains %s member from an insecure network." msgid_plural "" @@ -2242,31 +2242,31 @@ msgid_plural "" msgstr[0] "Warnung: Diese Gruppe beinhaltet %s Person aus einem unsicheren Netzwerk." 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." msgstr "Private Nachrichten an diese Gruppe könnten an die Öffentlichkeit geraten." -#: ../../mod/network.php:318 +#: ../../mod/network.php:322 msgid "No such group" msgstr "Es gibt keine solche Gruppe" -#: ../../mod/network.php:329 +#: ../../mod/network.php:333 msgid "Group is empty" msgstr "Gruppe ist leer" -#: ../../mod/network.php:333 +#: ../../mod/network.php:337 msgid "Group: " msgstr "Gruppe: " -#: ../../mod/network.php:343 +#: ../../mod/network.php:347 msgid "Contact: " msgstr "Kontakt: " -#: ../../mod/network.php:345 +#: ../../mod/network.php:349 msgid "Private messages to this person are at risk of public disclosure." msgstr "Private Nachrichten an diese Person könnten an die Öffentlichkeit gelangen." -#: ../../mod/network.php:350 +#: ../../mod/network.php:354 msgid "Invalid contact." msgstr "Ungültiger Kontakt." @@ -2275,7 +2275,7 @@ msgid "Personal Notes" msgstr "Persönliche Notizen" #: ../../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" msgstr "Speichern" @@ -2538,7 +2538,7 @@ msgstr "Alle Kontakte (mit gesichertem Profilzugriff)" msgid "No contacts." msgstr "Keine Kontakte." -#: ../../mod/viewcontacts.php:76 ../../include/text.php:586 +#: ../../mod/viewcontacts.php:76 ../../include/text.php:589 msgid "View Contacts" msgstr "Kontakte anzeigen" @@ -4397,7 +4397,7 @@ msgstr "Neueste Favoriten" #: ../../view/theme/diabook-red/theme.php:74 #: ../../view/theme/diabook-blue/theme.php:74 #: ../../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 msgid "event" msgstr "Veranstaltung" @@ -5223,21 +5223,21 @@ msgstr "Verbinde Dienste" #: ../../view/theme/diabook/theme.php:212 #: ../../view/theme/diabook-aerith/theme.php:207 msgid "PostIt to Friendica" -msgstr "PostIt nach Friendica" +msgstr "Bei Friendica posten" #: ../../view/theme/diabook-red/theme.php:207 #: ../../view/theme/diabook-blue/theme.php:207 #: ../../view/theme/diabook/theme.php:212 #: ../../view/theme/diabook-aerith/theme.php:207 msgid "Post to Friendica" -msgstr "Bei Friendica veröffentlichen" +msgstr "Wenn du diesen Link" #: ../../view/theme/diabook-red/theme.php:208 #: ../../view/theme/diabook-blue/theme.php:208 #: ../../view/theme/diabook/theme.php:213 #: ../../view/theme/diabook-aerith/theme.php:208 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-blue/theme.php:236 @@ -5695,158 +5695,158 @@ msgstr "(kein Betreff)" msgid "noreply" msgstr "noreply" -#: ../../include/text.php:240 +#: ../../include/text.php:243 msgid "prev" msgstr "vorige" -#: ../../include/text.php:242 +#: ../../include/text.php:245 msgid "first" msgstr "erste" -#: ../../include/text.php:271 +#: ../../include/text.php:274 msgid "last" msgstr "letzte" -#: ../../include/text.php:274 +#: ../../include/text.php:277 msgid "next" msgstr "nächste" -#: ../../include/text.php:565 +#: ../../include/text.php:568 msgid "No contacts" msgstr "Keine Kontakte" -#: ../../include/text.php:574 +#: ../../include/text.php:577 #, php-format msgid "%d Contact" msgid_plural "%d Contacts" msgstr[0] "%d Kontakt" msgstr[1] "%d Kontakte" -#: ../../include/text.php:647 ../../include/nav.php:91 +#: ../../include/text.php:650 ../../include/nav.php:91 msgid "Search" msgstr "Suche" -#: ../../include/text.php:828 +#: ../../include/text.php:831 msgid "Monday" msgstr "Montag" -#: ../../include/text.php:828 +#: ../../include/text.php:831 msgid "Tuesday" msgstr "Dienstag" -#: ../../include/text.php:828 +#: ../../include/text.php:831 msgid "Wednesday" msgstr "Mittwoch" -#: ../../include/text.php:828 +#: ../../include/text.php:831 msgid "Thursday" msgstr "Donnerstag" -#: ../../include/text.php:828 +#: ../../include/text.php:831 msgid "Friday" msgstr "Freitag" -#: ../../include/text.php:828 +#: ../../include/text.php:831 msgid "Saturday" msgstr "Samstag" -#: ../../include/text.php:828 +#: ../../include/text.php:831 msgid "Sunday" msgstr "Sonntag" -#: ../../include/text.php:832 +#: ../../include/text.php:835 msgid "January" msgstr "Januar" -#: ../../include/text.php:832 +#: ../../include/text.php:835 msgid "February" msgstr "Februar" -#: ../../include/text.php:832 +#: ../../include/text.php:835 msgid "March" msgstr "März" -#: ../../include/text.php:832 +#: ../../include/text.php:835 msgid "April" msgstr "April" -#: ../../include/text.php:832 +#: ../../include/text.php:835 msgid "May" msgstr "Mai" -#: ../../include/text.php:832 +#: ../../include/text.php:835 msgid "June" msgstr "Juni" -#: ../../include/text.php:832 +#: ../../include/text.php:835 msgid "July" msgstr "Juli" -#: ../../include/text.php:832 +#: ../../include/text.php:835 msgid "August" msgstr "August" -#: ../../include/text.php:832 +#: ../../include/text.php:835 msgid "September" msgstr "September" -#: ../../include/text.php:832 +#: ../../include/text.php:835 msgid "October" msgstr "Oktober" -#: ../../include/text.php:832 +#: ../../include/text.php:835 msgid "November" msgstr "November" -#: ../../include/text.php:832 +#: ../../include/text.php:835 msgid "December" msgstr "Dezember" -#: ../../include/text.php:916 +#: ../../include/text.php:919 msgid "bytes" msgstr "Byte" -#: ../../include/text.php:933 +#: ../../include/text.php:936 msgid "Categories:" msgstr "Kategorien:" -#: ../../include/text.php:945 +#: ../../include/text.php:948 msgid "remove" msgstr "löschen" -#: ../../include/text.php:945 +#: ../../include/text.php:948 msgid "[remove]" msgstr "[löschen]" -#: ../../include/text.php:948 +#: ../../include/text.php:951 msgid "Filed under:" msgstr "Abgelegt unter:" -#: ../../include/text.php:964 ../../include/text.php:976 +#: ../../include/text.php:967 ../../include/text.php:979 msgid "Click to open/close" msgstr "Zum öffnen/schließen klicken" -#: ../../include/text.php:1068 +#: ../../include/text.php:1071 msgid "Select an alternate language" msgstr "Alternative Sprache auswählen" -#: ../../include/text.php:1080 +#: ../../include/text.php:1083 msgid "default" msgstr "standard" -#: ../../include/text.php:1296 +#: ../../include/text.php:1299 msgid "activity" msgstr "Aktivität" -#: ../../include/text.php:1298 +#: ../../include/text.php:1301 msgid "comment" msgstr "Kommentar" -#: ../../include/text.php:1299 +#: ../../include/text.php:1302 msgid "post" msgstr "Beitrag" -#: ../../include/text.php:1454 +#: ../../include/text.php:1457 msgid "Item filed" msgstr "Beitrag abgelegt" @@ -6220,7 +6220,7 @@ msgstr "%s hat dir eine neue private Nachricht auf %s geschrieben." #: ../../include/enotify.php:42 #, php-format msgid "%s sent you %s." -msgstr "%s hat Dir geschickt %s" +msgstr "%s hat Dir %s geschickt" #: ../../include/enotify.php:42 msgid "a private message" @@ -6316,7 +6316,7 @@ msgstr "%s markierte %s" #: ../../include/enotify.php:121 msgid "your post" -msgstr "Dein Beitrag" +msgstr "Deinen Beitrag" #: ../../include/enotify.php:130 msgid "[Friendica:Notify] Introduction received" diff --git a/view/de/strings.php b/view/de/strings.php index 28567396..3b9601ac 100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -1159,9 +1159,9 @@ $a->strings["Invite Friends"] = "Freunde einladen"; $a->strings["Community Pages"] = "Foren"; $a->strings["Help or @NewHere ?"] = "Hilfe oder @NewHere"; $a->strings["Connect Services"] = "Verbinde Dienste"; -$a->strings["PostIt to Friendica"] = "PostIt nach Friendica"; -$a->strings["Post to Friendica"] = "Bei Friendica veröffentlichen"; -$a->strings[" from anywhere by bookmarking this Link."] = " von überall her indem du diesen Link zu deinen Lesezeichen hinzufügst."; +$a->strings["PostIt to Friendica"] = "Bei Friendica posten"; +$a->strings["Post to Friendica"] = "Wenn du diesen Link"; +$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 profile page"] = "Deine Profilseite"; $a->strings["Your contacts"] = "Deine Kontakte"; @@ -1401,7 +1401,7 @@ $a->strings["%s Administrator"] = "der Administrator von %s"; $a->strings["%s "] = "%s "; $a->strings["[Friendica:Notify] New mail received at %s"] = "[Friendica Meldung] Neue Nachricht erhalten von %s"; $a->strings["%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["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"; @@ -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["%s tagged your post at %s"] = "%s hat deinen Beitrag auf %s getaggt"; $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["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."; From 129130b0f7b7a10d8c2178842792193251be8c4e Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 8 Apr 2012 18:01:49 -0700 Subject: [PATCH 5/7] fix empty string timezone --- include/datetime.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/datetime.php b/include/datetime.php index 6d395fe3..1c43813d 100644 --- a/include/datetime.php +++ b/include/datetime.php @@ -80,6 +80,13 @@ function field_timezone($name='timezone', $label='', $current = 'America/Los_Ang if(! function_exists('datetime_convert')) { function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d H:i:s") { + // Defaults to UTC if nothing is set, but not if set to empty string. + + if($from == '') + $from = 'UTC'; + if($to == '') + $to = 'UTC'; + // Slight hackish adjustment so that 'zero' datetime actually returns what is intended // 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 From c1e25968071f01a9b4f4b69541818a0fc3d7eebf Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 8 Apr 2012 18:09:21 -0700 Subject: [PATCH 6/7] more sane defaults datetime_convert --- include/datetime.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/include/datetime.php b/include/datetime.php index 1c43813d..f4dcfce6 100644 --- a/include/datetime.php +++ b/include/datetime.php @@ -80,12 +80,15 @@ function field_timezone($name='timezone', $label='', $current = 'America/Los_Ang if(! function_exists('datetime_convert')) { function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d H:i:s") { - // Defaults to UTC if nothing is set, but not if set to empty string. + // Defaults to UTC if nothing is set, but throws an exception if set to empty string. + // Provide some sane defaults regardless. - if($from == '') + if($from === '') $from = 'UTC'; - if($to == '') + if($to === '') $to = 'UTC'; + if($s === '') + $s = 'now'; // Slight hackish adjustment so that 'zero' datetime actually returns what is intended // otherwise we end up with -0001-11-30 ... From 92c20895e0e0c94e17793f91f84faedfc8de938c Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 9 Apr 2012 04:55:52 -0700 Subject: [PATCH 7/7] use local_user for tag completion if available. See bug #368 --- mod/item.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/item.php b/mod/item.php index 82fb0bf7..c30b1745 100644 --- a/mod/item.php +++ b/mod/item.php @@ -447,7 +447,7 @@ function item_post(&$a) { if(count($tags)) { 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); } }