From 6621de63d99b65cc748992f84f8145a93adcce57 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Mon, 9 Jul 2012 19:07:33 +0100 Subject: [PATCH 01/41] Better (well, different) reshares. --- mod/share.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/mod/share.php b/mod/share.php index 761220ad7..4ec27d6bf 100644 --- a/mod/share.php +++ b/mod/share.php @@ -22,11 +22,12 @@ function share_init(&$a) { $o .= "\xE2\x99\xb2" . ' [url=' . $r[0]['author-link'] . ']' . $r[0]['author-name'] . '[/url]' . "\n"; if($r[0]['title']) - $o .= '[b]' . $r[0]['title'] . '[/b]' . "\n"; - $o .= $r[0]['body'] . "\n" ; + $o .= '[b]' . ' [url=' . $r[0]['plink'] . ']' . $r[0]['title'] . '[/url]' . '[/b]' . "\n"; + else + $o .= '[b]' . ' [url=' . $r[0]['plink'] . ']' . 'View Source' . '[/url]' . '[/b]' . "\n"; + $o .= $r[0]['body'] . "\n"; + + echo $o; - $o .= (($r[0]['plink']) ? '[url=' . $r[0]['plink'] . ']' . t('link') . '[/url]' . "\n" : ''); - - echo $o; killme(); -} +} \ No newline at end of file From 81a21257c3f825d7977aeecdb54c4b3bdcef3e4d Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 27 Oct 2012 15:42:23 -0700 Subject: [PATCH 02/41] rev update --- boot.php | 2 +- util/messages.po | 113 +++++++++++++++++++++++------------------------ 2 files changed, 56 insertions(+), 59 deletions(-) diff --git a/boot.php b/boot.php index ad6c29b82..49074135f 100644 --- a/boot.php +++ b/boot.php @@ -11,7 +11,7 @@ require_once('include/cache.php'); require_once('library/Mobile_Detect/Mobile_Detect.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.0.1508' ); +define ( 'FRIENDICA_VERSION', '3.0.1509' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1156 ); diff --git a/util/messages.po b/util/messages.po index 6ce63c20d..1da291fdf 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.0.1508\n" +"Project-Id-Version: 3.0.1509\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-10-26 10:00-0700\n" +"POT-Creation-Date: 2012-10-27 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -178,7 +178,7 @@ msgstr "" #: ../../addon/irc/irc.php:55 ../../addon/fromapp/fromapp.php:77 #: ../../addon/blogger/blogger.php:102 ../../addon/posterous/posterous.php:103 #: ../../view/theme/cleanzero/config.php:80 -#: ../../view/theme/diabook/theme.php:642 +#: ../../view/theme/diabook/theme.php:599 #: ../../view/theme/diabook/config.php:152 #: ../../view/theme/quattro/config.php:64 ../../view/theme/dispy/config.php:70 #: ../../object/Item.php:558 ../../addon.old/fromgplus/fromgplus.php:40 @@ -285,7 +285,7 @@ msgstr "" msgid "link to source" msgstr "" -#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:91 +#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:90 #: ../../include/nav.php:52 ../../boot.php:1701 msgid "Events" msgstr "" @@ -437,7 +437,7 @@ msgstr "" #: ../../mod/photos.php:1095 ../../mod/photos.php:1110 #: ../../mod/photos.php:1562 ../../mod/photos.php:1574 #: ../../addon/communityhome/communityhome.php:110 -#: ../../view/theme/diabook/theme.php:492 +#: ../../view/theme/diabook/theme.php:485 #: ../../addon.old/communityhome/communityhome.php:110 msgid "Contact Photos" msgstr "" @@ -460,7 +460,7 @@ msgstr "" #: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296 #: ../../mod/profile_photo.php:305 #: ../../addon/communityhome/communityhome.php:111 -#: ../../view/theme/diabook/theme.php:493 ../../include/user.php:324 +#: ../../view/theme/diabook/theme.php:486 ../../include/user.php:324 #: ../../include/user.php:331 ../../include/user.php:338 #: ../../addon.old/communityhome/communityhome.php:111 msgid "Profile Photos" @@ -484,7 +484,7 @@ msgstr "" #: ../../mod/photos.php:606 ../../mod/like.php:145 ../../mod/subthread.php:87 #: ../../mod/tagger.php:62 ../../addon/communityhome/communityhome.php:163 -#: ../../view/theme/diabook/theme.php:464 ../../include/text.php:1437 +#: ../../view/theme/diabook/theme.php:457 ../../include/text.php:1437 #: ../../include/diaspora.php:1835 ../../include/conversation.php:125 #: ../../include/conversation.php:253 #: ../../addon.old/communityhome/communityhome.php:163 @@ -695,7 +695,7 @@ msgstr "" msgid "Not available." msgstr "" -#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:93 +#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:92 #: ../../include/nav.php:101 msgid "Community" msgstr "" @@ -1537,7 +1537,7 @@ msgstr "" msgid "Personal" msgstr "" -#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:87 +#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:86 #: ../../include/nav.php:77 ../../include/nav.php:115 msgid "Home" msgstr "" @@ -1982,7 +1982,7 @@ msgstr "" msgid "Edit contact" msgstr "" -#: ../../mod/contacts.php:571 ../../view/theme/diabook/theme.php:89 +#: ../../mod/contacts.php:571 ../../view/theme/diabook/theme.php:88 #: ../../include/nav.php:139 msgid "Contacts" msgstr "" @@ -2109,9 +2109,8 @@ msgstr "" #: ../../mod/settings.php:69 ../../mod/newmember.php:22 #: ../../mod/admin.php:785 ../../mod/admin.php:990 #: ../../addon/dav/friendica/layout.fnk.php:225 -#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:537 -#: ../../view/theme/diabook/theme.php:658 ../../include/nav.php:137 -#: ../../addon.old/dav/friendica/layout.fnk.php:225 +#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:614 +#: ../../include/nav.php:137 ../../addon.old/dav/friendica/layout.fnk.php:225 #: ../../addon.old/mathjax/mathjax.php:36 msgid "Settings" msgstr "" @@ -2855,7 +2854,7 @@ msgid "" msgstr "" #: ../../mod/newmember.php:32 ../../mod/profperm.php:103 -#: ../../view/theme/diabook/theme.php:88 ../../include/profile_advanced.php:7 +#: ../../view/theme/diabook/theme.php:87 ../../include/profile_advanced.php:7 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50 #: ../../boot.php:1684 msgid "Profile" @@ -3180,8 +3179,8 @@ msgstr "" #: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1598 #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 -#: ../../view/theme/diabook/theme.php:459 -#: ../../view/theme/diabook/theme.php:468 ../../include/diaspora.php:1835 +#: ../../view/theme/diabook/theme.php:452 +#: ../../view/theme/diabook/theme.php:461 ../../include/diaspora.php:1835 #: ../../include/conversation.php:120 ../../include/conversation.php:129 #: ../../include/conversation.php:248 ../../include/conversation.php:257 #: ../../addon.old/facebook/facebook.php:1598 @@ -3192,7 +3191,7 @@ msgstr "" #: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602 #: ../../addon/communityhome/communityhome.php:172 -#: ../../view/theme/diabook/theme.php:473 ../../include/diaspora.php:1851 +#: ../../view/theme/diabook/theme.php:466 ../../include/diaspora.php:1851 #: ../../include/conversation.php:136 #: ../../addon.old/facebook/facebook.php:1602 #: ../../addon.old/communityhome/communityhome.php:172 @@ -3215,7 +3214,7 @@ msgstr "" msgid "Access denied." msgstr "" -#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:90 +#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:89 #: ../../include/nav.php:51 ../../boot.php:1691 msgid "Photos" msgstr "" @@ -4607,7 +4606,7 @@ msgstr "" msgid "diaspora2bb: " msgstr "" -#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:520 +#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:513 #: ../../include/contact_widgets.php:34 msgid "Friend Suggestions" msgstr "" @@ -4622,7 +4621,7 @@ msgstr "" msgid "Ignore/Hide" msgstr "" -#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:518 +#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:511 msgid "Global Directory" msgstr "" @@ -5560,7 +5559,7 @@ msgid "Latest likes" msgstr "" #: ../../addon/communityhome/communityhome.php:155 -#: ../../view/theme/diabook/theme.php:456 ../../include/text.php:1435 +#: ../../view/theme/diabook/theme.php:449 ../../include/text.php:1435 #: ../../include/conversation.php:117 ../../include/conversation.php:245 #: ../../addon.old/communityhome/communityhome.php:155 msgid "event" @@ -7578,137 +7577,135 @@ msgstr "" msgid "Color scheme" msgstr "" -#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:49 +#: ../../view/theme/diabook/theme.php:86 ../../include/nav.php:49 #: ../../include/nav.php:115 msgid "Your posts and conversations" msgstr "" -#: ../../view/theme/diabook/theme.php:88 ../../include/nav.php:50 +#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:50 msgid "Your profile page" msgstr "" -#: ../../view/theme/diabook/theme.php:89 +#: ../../view/theme/diabook/theme.php:88 msgid "Your contacts" msgstr "" -#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:51 +#: ../../view/theme/diabook/theme.php:89 ../../include/nav.php:51 msgid "Your photos" msgstr "" -#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:52 +#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:52 msgid "Your events" msgstr "" -#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53 +#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:53 msgid "Personal notes" msgstr "" -#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53 +#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:53 msgid "Your personal photos" msgstr "" -#: ../../view/theme/diabook/theme.php:94 -#: ../../view/theme/diabook/theme.php:537 -#: ../../view/theme/diabook/theme.php:632 +#: ../../view/theme/diabook/theme.php:93 #: ../../view/theme/diabook/config.php:163 msgid "Community Pages" msgstr "" -#: ../../view/theme/diabook/theme.php:384 -#: ../../view/theme/diabook/theme.php:634 +#: ../../view/theme/diabook/theme.php:377 +#: ../../view/theme/diabook/theme.php:591 #: ../../view/theme/diabook/config.php:165 msgid "Community Profiles" msgstr "" -#: ../../view/theme/diabook/theme.php:405 -#: ../../view/theme/diabook/theme.php:639 +#: ../../view/theme/diabook/theme.php:398 +#: ../../view/theme/diabook/theme.php:596 #: ../../view/theme/diabook/config.php:170 msgid "Last users" msgstr "" -#: ../../view/theme/diabook/theme.php:434 -#: ../../view/theme/diabook/theme.php:641 +#: ../../view/theme/diabook/theme.php:427 +#: ../../view/theme/diabook/theme.php:598 #: ../../view/theme/diabook/config.php:172 msgid "Last likes" msgstr "" -#: ../../view/theme/diabook/theme.php:479 -#: ../../view/theme/diabook/theme.php:640 +#: ../../view/theme/diabook/theme.php:472 +#: ../../view/theme/diabook/theme.php:597 #: ../../view/theme/diabook/config.php:171 msgid "Last photos" msgstr "" -#: ../../view/theme/diabook/theme.php:516 -#: ../../view/theme/diabook/theme.php:637 +#: ../../view/theme/diabook/theme.php:509 +#: ../../view/theme/diabook/theme.php:594 #: ../../view/theme/diabook/config.php:168 msgid "Find Friends" msgstr "" -#: ../../view/theme/diabook/theme.php:517 +#: ../../view/theme/diabook/theme.php:510 msgid "Local Directory" msgstr "" -#: ../../view/theme/diabook/theme.php:519 ../../include/contact_widgets.php:35 +#: ../../view/theme/diabook/theme.php:512 ../../include/contact_widgets.php:35 msgid "Similar Interests" msgstr "" -#: ../../view/theme/diabook/theme.php:521 ../../include/contact_widgets.php:37 +#: ../../view/theme/diabook/theme.php:514 ../../include/contact_widgets.php:37 msgid "Invite Friends" msgstr "" -#: ../../view/theme/diabook/theme.php:572 -#: ../../view/theme/diabook/theme.php:633 +#: ../../view/theme/diabook/theme.php:531 +#: ../../view/theme/diabook/theme.php:590 #: ../../view/theme/diabook/config.php:164 msgid "Earth Layers" msgstr "" -#: ../../view/theme/diabook/theme.php:577 +#: ../../view/theme/diabook/theme.php:536 msgid "Set zoomfactor for Earth Layers" msgstr "" -#: ../../view/theme/diabook/theme.php:578 +#: ../../view/theme/diabook/theme.php:537 #: ../../view/theme/diabook/config.php:161 msgid "Set longitude (X) for Earth Layers" msgstr "" -#: ../../view/theme/diabook/theme.php:579 +#: ../../view/theme/diabook/theme.php:538 #: ../../view/theme/diabook/config.php:162 msgid "Set latitude (Y) for Earth Layers" msgstr "" +#: ../../view/theme/diabook/theme.php:551 #: ../../view/theme/diabook/theme.php:592 -#: ../../view/theme/diabook/theme.php:635 #: ../../view/theme/diabook/config.php:166 msgid "Help or @NewHere ?" msgstr "" -#: ../../view/theme/diabook/theme.php:599 -#: ../../view/theme/diabook/theme.php:636 +#: ../../view/theme/diabook/theme.php:558 +#: ../../view/theme/diabook/theme.php:593 #: ../../view/theme/diabook/config.php:167 msgid "Connect Services" msgstr "" -#: ../../view/theme/diabook/theme.php:606 -#: ../../view/theme/diabook/theme.php:638 +#: ../../view/theme/diabook/theme.php:565 +#: ../../view/theme/diabook/theme.php:595 msgid "Last Tweets" msgstr "" -#: ../../view/theme/diabook/theme.php:609 +#: ../../view/theme/diabook/theme.php:568 #: ../../view/theme/diabook/config.php:159 msgid "Set twitter search term" msgstr "" -#: ../../view/theme/diabook/theme.php:629 +#: ../../view/theme/diabook/theme.php:587 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:288 msgid "don't show" msgstr "" -#: ../../view/theme/diabook/theme.php:629 +#: ../../view/theme/diabook/theme.php:587 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:287 msgid "show" msgstr "" -#: ../../view/theme/diabook/theme.php:630 +#: ../../view/theme/diabook/theme.php:588 msgid "Show/hide boxes at right-hand column:" msgstr "" From 4990f64927e2ddd65e1a1f4b1ef85fec12fb98a9 Mon Sep 17 00:00:00 2001 From: Zach Prezkuta Date: Mon, 29 Oct 2012 12:03:48 -0600 Subject: [PATCH 03/41] make sure that the contact is local for auto redir --- include/redir.php | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/include/redir.php b/include/redir.php index 42008ddd6..7a4403613 100644 --- a/include/redir.php +++ b/include/redir.php @@ -7,10 +7,23 @@ function auto_redir(&$a, $contact_nick) { if(local_user()) { - $r = q("SELECT id FROM contact WHERE uid = ( SELECT uid FROM user WHERE nickname = '%s' LIMIT 1 ) AND nick = '%s' AND network = '%s' and self = 0 LIMIT 1", + // We need to find out if $contact_nick is a user on this hub, and if so, if I + // am a contact of that user. However, that user may have other contacts with the + // same nickname as me on other hubs or other networks. Exclude these by requiring + // that the contact have a local URL. I will be the only person with my nickname at + // this URL, so if a result is found, then I am a contact of the $contact_nick user. + + $baseurl = $a->get_baseurl(); + $domain_st = strpos($baseurl, "://"); + if($domain_st === false) + return; + $baseurl = substr($baseurl, $domain_st + 3); + + $r = q("SELECT id FROM contact WHERE uid = ( SELECT uid FROM user WHERE nickname = '%s' LIMIT 1 ) + AND nick = '%s' AND self = 0 AND url LIKE '%%%s%%' LIMIT 1", dbesc($contact_nick), dbesc($a->user['nickname']), - dbesc(NETWORK_DFRN) + dbesc($baseurl) ); if((!$r) || (! count($r)) || $r[0]['id'] == remote_user()) @@ -52,7 +65,7 @@ function auto_redir(&$a, $contact_nick) { $url = curPageURL(); - logger('check_redir: ' . $r[0]['name'] . ' ' . $sec, LOGGER_DEBUG); + logger('auto_redir: ' . $r[0]['name'] . ' ' . $sec, LOGGER_DEBUG); $dest = (($url) ? '&destination_url=' . $url : ''); goaway ($r[0]['poll'] . '?dfrn_id=' . $dfrn_id . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile&sec=' . $sec . $dest ); From 4fd339b216981c104e77455731974b1816355aca Mon Sep 17 00:00:00 2001 From: Zach Prezkuta Date: Mon, 29 Oct 2012 12:43:52 -0600 Subject: [PATCH 04/41] add live div to wall page --- include/conversation.php | 1 + 1 file changed, 1 insertion(+) diff --git a/include/conversation.php b/include/conversation.php index 6b7c3afb0..7f4c5bc3d 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -413,6 +413,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { if(!$update) { $tab = notags(trim($_GET['tab'])); + $tab = ( $tab ? $tab : 'posts' ); if($tab === 'posts') { // This is ugly, but we can't pass the profile_uid through the session to the ajax updater, // because browser prefetching might change it on us. We have to deliver it with the page. From 200d2030d512eab41fa018ae3dd0776ab68fba7f Mon Sep 17 00:00:00 2001 From: Zach Prezkuta Date: Mon, 29 Oct 2012 12:47:51 -0600 Subject: [PATCH 05/41] don't combine msg and meta arrays unless they're the same size --- include/onepoll.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/include/onepoll.php b/include/onepoll.php index 17588d183..9fbef168c 100644 --- a/include/onepoll.php +++ b/include/onepoll.php @@ -292,7 +292,12 @@ function onepoll_run($argv, $argc){ logger("Mail: Parsing ".count($msgs)." mails for ".$mailconf[0]['user'], LOGGER_DEBUG); $metas = email_msg_meta($mbox,implode(',',$msgs)); + if(count($metas) != count($msgs)) { + logger("onepoll: for " . $mailconf[0]['user'] . " there are ". count($msgs) . " messages but received " . count($metas) . " metas", LOGGER_DEBUG); + break; + } $msgs = array_combine($msgs, $metas); + foreach($msgs as $msg_uid => $meta) { logger("Mail: Parsing mail ".$msg_uid, LOGGER_DATA); @@ -309,7 +314,7 @@ function onepoll_run($argv, $argc){ ); if(count($r)) { - logger("Mail: Seen before ".$msg_uid." for ".$mailconf[0]['user']); + logger("Mail: Seen before ".$msg_uid." for ".$mailconf[0]['user'],LOGGER_DEBUG); if($meta->deleted && ! $r[0]['deleted']) { q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `id` = %d LIMIT 1", dbesc(datetime_convert()), From 4fa5b761673918396b06b011cedcfe79ecfd4fcc Mon Sep 17 00:00:00 2001 From: Zach Prezkuta Date: Mon, 29 Oct 2012 12:56:17 -0600 Subject: [PATCH 06/41] delete template files that are identical to the defaults --- view/theme/facepark/contact_template.tpl | 25 ----- view/theme/facepark/conversation.tpl | 29 ------ view/theme/facepark/nets.tpl | 10 -- view/theme/facepark/saved_searches_aside.tpl | 14 --- view/theme/frost-mobile/oembed_video.tpl | 4 - view/theme/frost/oembed_video.tpl | 4 - view/theme/quattro/msg-header.tpl | 97 -------------------- view/theme/testbubble/contact_template.tpl | 25 ----- view/theme/testbubble/mail_head.tpl | 3 - view/theme/testbubble/nets.tpl | 10 -- view/theme/vier/contact_template.tpl | 25 ----- 11 files changed, 246 deletions(-) delete mode 100644 view/theme/facepark/contact_template.tpl delete mode 100644 view/theme/facepark/conversation.tpl delete mode 100644 view/theme/facepark/nets.tpl delete mode 100644 view/theme/facepark/saved_searches_aside.tpl delete mode 100755 view/theme/frost-mobile/oembed_video.tpl delete mode 100755 view/theme/frost/oembed_video.tpl delete mode 100644 view/theme/quattro/msg-header.tpl delete mode 100644 view/theme/testbubble/contact_template.tpl delete mode 100644 view/theme/testbubble/mail_head.tpl delete mode 100644 view/theme/testbubble/nets.tpl delete mode 100644 view/theme/vier/contact_template.tpl diff --git a/view/theme/facepark/contact_template.tpl b/view/theme/facepark/contact_template.tpl deleted file mode 100644 index 48930b48a..000000000 --- a/view/theme/facepark/contact_template.tpl +++ /dev/null @@ -1,25 +0,0 @@ - -
-
-
- - $contact.name - - {{ if $contact.photo_menu }} - menu -
-
    - $contact.photo_menu -
-
- {{ endif }} -
- -
-
-
$contact.name
- -
-
diff --git a/view/theme/facepark/conversation.tpl b/view/theme/facepark/conversation.tpl deleted file mode 100644 index 0e1464621..000000000 --- a/view/theme/facepark/conversation.tpl +++ /dev/null @@ -1,29 +0,0 @@ -$live_update - -{{ for $threads as $thread }} -
- {{ for $thread.items as $item }} - {{if $item.comment_firstcollapsed}} -
- $thread.num_comments $thread.hide_text -
- {{endif}} - - {{ inc $item.template }}{{ endinc }} - - - {{ endfor }} -
-{{ endfor }} - -
- -{{ if $dropping }} - -
-{{ endif }} diff --git a/view/theme/facepark/nets.tpl b/view/theme/facepark/nets.tpl deleted file mode 100644 index 920c2332b..000000000 --- a/view/theme/facepark/nets.tpl +++ /dev/null @@ -1,10 +0,0 @@ -
-

$title

-
$desc
- $all -
    - {{ for $nets as $net }} -
  • $net.name
    • - {{ endfor }} -
-
diff --git a/view/theme/facepark/saved_searches_aside.tpl b/view/theme/facepark/saved_searches_aside.tpl deleted file mode 100644 index e6a0d6278..000000000 --- a/view/theme/facepark/saved_searches_aside.tpl +++ /dev/null @@ -1,14 +0,0 @@ -
- - $searchbox - -
    - {{ for $saved as $search }} -
  • - - $search.term -
    • - {{ endfor }} -
-
-
diff --git a/view/theme/frost-mobile/oembed_video.tpl b/view/theme/frost-mobile/oembed_video.tpl deleted file mode 100755 index d3a9a9311..000000000 --- a/view/theme/frost-mobile/oembed_video.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - -
- diff --git a/view/theme/frost/oembed_video.tpl b/view/theme/frost/oembed_video.tpl deleted file mode 100755 index d3a9a9311..000000000 --- a/view/theme/frost/oembed_video.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - -
- diff --git a/view/theme/quattro/msg-header.tpl b/view/theme/quattro/msg-header.tpl deleted file mode 100644 index 2d1ea7a61..000000000 --- a/view/theme/quattro/msg-header.tpl +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - diff --git a/view/theme/testbubble/contact_template.tpl b/view/theme/testbubble/contact_template.tpl deleted file mode 100644 index 48930b48a..000000000 --- a/view/theme/testbubble/contact_template.tpl +++ /dev/null @@ -1,25 +0,0 @@ - -
-
-
- - $contact.name - - {{ if $contact.photo_menu }} - menu -
-
    - $contact.photo_menu -
-
- {{ endif }} -
- -
-
-
$contact.name
- -
-
diff --git a/view/theme/testbubble/mail_head.tpl b/view/theme/testbubble/mail_head.tpl deleted file mode 100644 index afb65f537..000000000 --- a/view/theme/testbubble/mail_head.tpl +++ /dev/null @@ -1,3 +0,0 @@ -

$messages

- -$tab_content diff --git a/view/theme/testbubble/nets.tpl b/view/theme/testbubble/nets.tpl deleted file mode 100644 index 920c2332b..000000000 --- a/view/theme/testbubble/nets.tpl +++ /dev/null @@ -1,10 +0,0 @@ -
-

$title

-
$desc
- $all -
    - {{ for $nets as $net }} -
  • $net.name
    • - {{ endfor }} -
-
diff --git a/view/theme/vier/contact_template.tpl b/view/theme/vier/contact_template.tpl deleted file mode 100644 index 48930b48a..000000000 --- a/view/theme/vier/contact_template.tpl +++ /dev/null @@ -1,25 +0,0 @@ - -
-
-
- - $contact.name - - {{ if $contact.photo_menu }} - menu -
-
    - $contact.photo_menu -
-
- {{ endif }} -
- -
-
-
$contact.name
- -
-
From 2bfacda2df043f4b1ab2df7e40c5beb2f7203a9e Mon Sep 17 00:00:00 2001 From: Zach Prezkuta Date: Mon, 29 Oct 2012 13:04:59 -0600 Subject: [PATCH 07/41] missed quattro threaded_conversation live update field --- view/theme/quattro/threaded_conversation.tpl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/view/theme/quattro/threaded_conversation.tpl b/view/theme/quattro/threaded_conversation.tpl index 94be86417..7eadf7e9f 100644 --- a/view/theme/quattro/threaded_conversation.tpl +++ b/view/theme/quattro/threaded_conversation.tpl @@ -1,3 +1,5 @@ +$live_update + {{ for $threads as $item }}
From 0fe9019c082467119ded58086c3892b3490ea451 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 29 Oct 2012 21:01:15 -0700 Subject: [PATCH 08/41] rev update --- boot.php | 2 +- util/messages.po | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot.php b/boot.php index 49074135f..04e4f81f1 100644 --- a/boot.php +++ b/boot.php @@ -11,7 +11,7 @@ require_once('include/cache.php'); require_once('library/Mobile_Detect/Mobile_Detect.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.0.1509' ); +define ( 'FRIENDICA_VERSION', '3.0.1511' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1156 ); diff --git a/util/messages.po b/util/messages.po index 1da291fdf..940b209c6 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.0.1509\n" +"Project-Id-Version: 3.0.1511\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-10-27 10:00-0700\n" +"POT-Creation-Date: 2012-10-29 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" From 68da185cce0593516ec58b3a4f621ad47af51731 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 30 Oct 2012 14:23:11 -0700 Subject: [PATCH 09/41] rev update --- boot.php | 2 +- util/messages.po | 126 +++++++++++++++++++++++------------------------ 2 files changed, 64 insertions(+), 64 deletions(-) diff --git a/boot.php b/boot.php index 04e4f81f1..a96d223a0 100644 --- a/boot.php +++ b/boot.php @@ -11,7 +11,7 @@ require_once('include/cache.php'); require_once('library/Mobile_Detect/Mobile_Detect.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.0.1511' ); +define ( 'FRIENDICA_VERSION', '3.0.1512' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1156 ); diff --git a/util/messages.po b/util/messages.po index 940b209c6..fc2aeb127 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.0.1511\n" +"Project-Id-Version: 3.0.1512\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-10-29 10:00-0700\n" +"POT-Creation-Date: 2012-10-30 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -359,7 +359,7 @@ msgstr "" #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:142 #: ../../mod/dfrn_request.php:847 ../../mod/settings.php:544 #: ../../mod/settings.php:570 ../../addon/js_upload/js_upload.php:45 -#: ../../include/conversation.php:995 +#: ../../include/conversation.php:996 #: ../../addon.old/js_upload/js_upload.php:45 msgid "Cancel" msgstr "" @@ -645,15 +645,15 @@ msgstr "" msgid "I don't like this (toggle)" msgstr "" -#: ../../mod/photos.php:1386 ../../include/conversation.php:956 +#: ../../mod/photos.php:1386 ../../include/conversation.php:957 msgid "Share" msgstr "" #: ../../mod/photos.php:1387 ../../mod/editpost.php:118 #: ../../mod/content.php:482 ../../mod/content.php:845 #: ../../mod/wallmessage.php:152 ../../mod/message.php:293 -#: ../../mod/message.php:481 ../../include/conversation.php:619 -#: ../../include/conversation.php:975 ../../object/Item.php:258 +#: ../../mod/message.php:481 ../../include/conversation.php:620 +#: ../../include/conversation.php:976 ../../object/Item.php:258 msgid "Please wait" msgstr "" @@ -671,7 +671,7 @@ msgstr "" #: ../../mod/photos.php:1407 ../../mod/photos.php:1450 #: ../../mod/photos.php:1521 ../../mod/editpost.php:139 -#: ../../mod/content.php:702 ../../include/conversation.php:993 +#: ../../mod/content.php:702 ../../include/conversation.php:994 #: ../../object/Item.php:567 msgid "Preview" msgstr "" @@ -679,7 +679,7 @@ msgstr "" #: ../../mod/photos.php:1489 ../../mod/content.php:439 #: ../../mod/content.php:723 ../../mod/settings.php:606 #: ../../mod/group.php:168 ../../mod/admin.php:696 -#: ../../include/conversation.php:564 ../../object/Item.php:117 +#: ../../include/conversation.php:565 ../../object/Item.php:117 msgid "Delete" msgstr "" @@ -745,7 +745,7 @@ msgstr "" msgid "Edit post" msgstr "" -#: ../../mod/editpost.php:88 ../../include/conversation.php:942 +#: ../../mod/editpost.php:88 ../../include/conversation.php:943 msgid "Post to Email" msgstr "" @@ -756,85 +756,85 @@ msgstr "" #: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150 #: ../../mod/message.php:291 ../../mod/message.php:478 -#: ../../include/conversation.php:957 +#: ../../include/conversation.php:958 msgid "Upload photo" msgstr "" -#: ../../mod/editpost.php:105 ../../include/conversation.php:958 +#: ../../mod/editpost.php:105 ../../include/conversation.php:959 msgid "upload photo" msgstr "" -#: ../../mod/editpost.php:106 ../../include/conversation.php:959 +#: ../../mod/editpost.php:106 ../../include/conversation.php:960 msgid "Attach file" msgstr "" -#: ../../mod/editpost.php:107 ../../include/conversation.php:960 +#: ../../mod/editpost.php:107 ../../include/conversation.php:961 msgid "attach file" msgstr "" #: ../../mod/editpost.php:108 ../../mod/wallmessage.php:151 #: ../../mod/message.php:292 ../../mod/message.php:479 -#: ../../include/conversation.php:961 +#: ../../include/conversation.php:962 msgid "Insert web link" msgstr "" -#: ../../mod/editpost.php:109 ../../include/conversation.php:962 +#: ../../mod/editpost.php:109 ../../include/conversation.php:963 msgid "web link" msgstr "" -#: ../../mod/editpost.php:110 ../../include/conversation.php:963 +#: ../../mod/editpost.php:110 ../../include/conversation.php:964 msgid "Insert video link" msgstr "" -#: ../../mod/editpost.php:111 ../../include/conversation.php:964 +#: ../../mod/editpost.php:111 ../../include/conversation.php:965 msgid "video link" msgstr "" -#: ../../mod/editpost.php:112 ../../include/conversation.php:965 +#: ../../mod/editpost.php:112 ../../include/conversation.php:966 msgid "Insert audio link" msgstr "" -#: ../../mod/editpost.php:113 ../../include/conversation.php:966 +#: ../../mod/editpost.php:113 ../../include/conversation.php:967 msgid "audio link" msgstr "" -#: ../../mod/editpost.php:114 ../../include/conversation.php:967 +#: ../../mod/editpost.php:114 ../../include/conversation.php:968 msgid "Set your location" msgstr "" -#: ../../mod/editpost.php:115 ../../include/conversation.php:968 +#: ../../mod/editpost.php:115 ../../include/conversation.php:969 msgid "set location" msgstr "" -#: ../../mod/editpost.php:116 ../../include/conversation.php:969 +#: ../../mod/editpost.php:116 ../../include/conversation.php:970 msgid "Clear browser location" msgstr "" -#: ../../mod/editpost.php:117 ../../include/conversation.php:970 +#: ../../mod/editpost.php:117 ../../include/conversation.php:971 msgid "clear location" msgstr "" -#: ../../mod/editpost.php:119 ../../include/conversation.php:976 +#: ../../mod/editpost.php:119 ../../include/conversation.php:977 msgid "Permission settings" msgstr "" -#: ../../mod/editpost.php:127 ../../include/conversation.php:985 +#: ../../mod/editpost.php:127 ../../include/conversation.php:986 msgid "CC: email addresses" msgstr "" -#: ../../mod/editpost.php:128 ../../include/conversation.php:986 +#: ../../mod/editpost.php:128 ../../include/conversation.php:987 msgid "Public post" msgstr "" -#: ../../mod/editpost.php:131 ../../include/conversation.php:972 +#: ../../mod/editpost.php:131 ../../include/conversation.php:973 msgid "Set title" msgstr "" -#: ../../mod/editpost.php:133 ../../include/conversation.php:974 +#: ../../mod/editpost.php:133 ../../include/conversation.php:975 msgid "Categories (comma-separated list)" msgstr "" -#: ../../mod/editpost.php:134 ../../include/conversation.php:988 +#: ../../mod/editpost.php:134 ../../include/conversation.php:989 msgid "Example: bob@example.com, mary@example.com" msgstr "" @@ -1377,24 +1377,24 @@ msgid "Group: " msgstr "" #: ../../mod/content.php:438 ../../mod/content.php:722 -#: ../../include/conversation.php:563 ../../object/Item.php:116 +#: ../../include/conversation.php:564 ../../object/Item.php:116 msgid "Select" msgstr "" #: ../../mod/content.php:455 ../../mod/content.php:815 -#: ../../mod/content.php:816 ../../include/conversation.php:582 +#: ../../mod/content.php:816 ../../include/conversation.php:583 #: ../../object/Item.php:227 ../../object/Item.php:228 #, php-format msgid "View %s's profile @ %s" msgstr "" #: ../../mod/content.php:465 ../../mod/content.php:827 -#: ../../include/conversation.php:602 ../../object/Item.php:240 +#: ../../include/conversation.php:603 ../../object/Item.php:240 #, php-format msgid "%s from %s" msgstr "" -#: ../../mod/content.php:480 ../../include/conversation.php:617 +#: ../../mod/content.php:480 ../../include/conversation.php:618 msgid "View in context" msgstr "" @@ -2773,7 +2773,7 @@ msgstr "" #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131 #: ../../mod/message.php:242 ../../mod/message.php:250 -#: ../../include/conversation.php:893 ../../include/conversation.php:910 +#: ../../include/conversation.php:894 ../../include/conversation.php:911 msgid "Please enter a link URL:" msgstr "" @@ -4513,8 +4513,8 @@ msgstr "" msgid "Edit visibility" msgstr "" -#: ../../mod/filer.php:29 ../../include/conversation.php:897 -#: ../../include/conversation.php:914 +#: ../../mod/filer.php:29 ../../include/conversation.php:898 +#: ../../include/conversation.php:915 msgid "Save to Folder:" msgstr "" @@ -8666,7 +8666,7 @@ msgstr "" msgid "Happy Birthday %s" msgstr "" -#: ../../include/onepoll.php:409 +#: ../../include/onepoll.php:414 msgid "From: " msgstr "" @@ -9037,34 +9037,34 @@ msgstr "" msgid "stopped following" msgstr "" -#: ../../include/Contact.php:220 ../../include/conversation.php:790 +#: ../../include/Contact.php:220 ../../include/conversation.php:791 msgid "Poke" msgstr "" -#: ../../include/Contact.php:221 ../../include/conversation.php:784 +#: ../../include/Contact.php:221 ../../include/conversation.php:785 msgid "View Status" msgstr "" -#: ../../include/Contact.php:222 ../../include/conversation.php:785 +#: ../../include/Contact.php:222 ../../include/conversation.php:786 msgid "View Profile" msgstr "" -#: ../../include/Contact.php:223 ../../include/conversation.php:786 +#: ../../include/Contact.php:223 ../../include/conversation.php:787 msgid "View Photos" msgstr "" #: ../../include/Contact.php:224 ../../include/Contact.php:237 -#: ../../include/conversation.php:787 +#: ../../include/conversation.php:788 msgid "Network Posts" msgstr "" #: ../../include/Contact.php:225 ../../include/Contact.php:237 -#: ../../include/conversation.php:788 +#: ../../include/conversation.php:789 msgid "Edit Contact" msgstr "" #: ../../include/Contact.php:226 ../../include/Contact.php:237 -#: ../../include/conversation.php:789 +#: ../../include/conversation.php:790 msgid "Send PM" msgstr "" @@ -9082,86 +9082,86 @@ msgstr "" msgid "%1$s marked %2$s's %3$s as favorite" msgstr "" -#: ../../include/conversation.php:594 ../../object/Item.php:218 +#: ../../include/conversation.php:595 ../../object/Item.php:218 msgid "Categories:" msgstr "" -#: ../../include/conversation.php:595 ../../object/Item.php:219 +#: ../../include/conversation.php:596 ../../object/Item.php:219 msgid "Filed under:" msgstr "" -#: ../../include/conversation.php:680 +#: ../../include/conversation.php:681 msgid "remove" msgstr "" -#: ../../include/conversation.php:684 +#: ../../include/conversation.php:685 msgid "Delete Selected Items" msgstr "" -#: ../../include/conversation.php:783 +#: ../../include/conversation.php:784 msgid "Follow Thread" msgstr "" -#: ../../include/conversation.php:852 +#: ../../include/conversation.php:853 #, php-format msgid "%s likes this." msgstr "" -#: ../../include/conversation.php:852 +#: ../../include/conversation.php:853 #, php-format msgid "%s doesn't like this." msgstr "" -#: ../../include/conversation.php:856 +#: ../../include/conversation.php:857 #, php-format msgid "%2$d people like this." msgstr "" -#: ../../include/conversation.php:858 +#: ../../include/conversation.php:859 #, php-format msgid "%2$d people don't like this." msgstr "" -#: ../../include/conversation.php:864 +#: ../../include/conversation.php:865 msgid "and" msgstr "" -#: ../../include/conversation.php:867 +#: ../../include/conversation.php:868 #, php-format msgid ", and %d other people" msgstr "" -#: ../../include/conversation.php:868 +#: ../../include/conversation.php:869 #, php-format msgid "%s like this." msgstr "" -#: ../../include/conversation.php:868 +#: ../../include/conversation.php:869 #, php-format msgid "%s don't like this." msgstr "" -#: ../../include/conversation.php:892 ../../include/conversation.php:909 +#: ../../include/conversation.php:893 ../../include/conversation.php:910 msgid "Visible to everybody" msgstr "" -#: ../../include/conversation.php:894 ../../include/conversation.php:911 +#: ../../include/conversation.php:895 ../../include/conversation.php:912 msgid "Please enter a video link/URL:" msgstr "" -#: ../../include/conversation.php:895 ../../include/conversation.php:912 +#: ../../include/conversation.php:896 ../../include/conversation.php:913 msgid "Please enter an audio link/URL:" msgstr "" -#: ../../include/conversation.php:896 ../../include/conversation.php:913 +#: ../../include/conversation.php:897 ../../include/conversation.php:914 msgid "Tag term:" msgstr "" -#: ../../include/conversation.php:898 ../../include/conversation.php:915 +#: ../../include/conversation.php:899 ../../include/conversation.php:916 msgid "Where are you right now?" msgstr "" -#: ../../include/conversation.php:977 +#: ../../include/conversation.php:978 msgid "permissions" msgstr "" From e2ca9e9db55fef4c3b7e87dcbf884b9f7c0d8b61 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 30 Oct 2012 14:25:33 -0700 Subject: [PATCH 10/41] poco - ignore archived contacts --- mod/poco.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mod/poco.php b/mod/poco.php index acfa3ffaa..cb9abb340 100644 --- a/mod/poco.php +++ b/mod/poco.php @@ -56,7 +56,7 @@ function poco_init(&$a) { and uid in (select uid from pconfig where cat = 'system' and k = 'suggestme' and v = 1) "); } else { - $r = q("SELECT count(*) as `total` from `contact` where `uid` = %d and blocked = 0 and pending = 0 and hidden = 0 + $r = q("SELECT count(*) as `total` from `contact` where `uid` = %d and blocked = 0 and pending = 0 and hidden = 0 and archive = 0 $sql_extra ", intval($user['uid']) ); @@ -81,7 +81,7 @@ function poco_init(&$a) { } else { - $r = q("SELECT * from `contact` where `uid` = %d and blocked = 0 and pending = 0 and hidden = 0 + $r = q("SELECT * from `contact` where `uid` = %d and blocked = 0 and pending = 0 and hidden = 0 and archive = 0 $sql_extra LIMIT %d, %d", intval($user['uid']), intval($startIndex), From 70f8a69ef3648f74d977d6a7aa77ce0367a3d151 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Wed, 31 Oct 2012 07:42:23 +0100 Subject: [PATCH 11/41] IT: update to the strings --- view/it/messages.po | 133 ++++++++++++++++++++++---------------------- view/it/strings.php | 2 +- 2 files changed, 66 insertions(+), 69 deletions(-) diff --git a/view/it/messages.po b/view/it/messages.po index 657799695..304d80f0d 100644 --- a/view/it/messages.po +++ b/view/it/messages.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n" -"POT-Creation-Date: 2012-10-21 10:00-0700\n" -"PO-Revision-Date: 2012-10-22 12:47+0000\n" +"POT-Creation-Date: 2012-10-29 10:00-0700\n" +"PO-Revision-Date: 2012-10-25 07:03+0000\n" "Last-Translator: fabrixxm \n" "Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\n" "MIME-Version: 1.0\n" @@ -63,7 +63,7 @@ msgstr "Le modifiche al contatto non sono state salvate." #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510 #: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:159 #: ../../addon/fbpost/fbpost.php:165 -#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3913 +#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3914 #: ../../index.php:319 ../../addon.old/facebook/facebook.php:510 #: ../../addon.old/facebook/facebook.php:516 #: ../../addon.old/fbpost/fbpost.php:159 ../../addon.old/fbpost/fbpost.php:165 @@ -183,7 +183,7 @@ msgstr "Nuova foto da questo URL" #: ../../addon/irc/irc.php:55 ../../addon/fromapp/fromapp.php:77 #: ../../addon/blogger/blogger.php:102 ../../addon/posterous/posterous.php:103 #: ../../view/theme/cleanzero/config.php:80 -#: ../../view/theme/diabook/theme.php:642 +#: ../../view/theme/diabook/theme.php:599 #: ../../view/theme/diabook/config.php:152 #: ../../view/theme/quattro/config.php:64 ../../view/theme/dispy/config.php:70 #: ../../object/Item.php:558 ../../addon.old/fromgplus/fromgplus.php:40 @@ -290,7 +290,7 @@ msgstr "Modifca l'evento" msgid "link to source" msgstr "Collegamento all'originale" -#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:91 +#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:90 #: ../../include/nav.php:52 ../../boot.php:1701 msgid "Events" msgstr "Eventi" @@ -442,7 +442,7 @@ msgstr "Album foto" #: ../../mod/photos.php:1095 ../../mod/photos.php:1110 #: ../../mod/photos.php:1562 ../../mod/photos.php:1574 #: ../../addon/communityhome/communityhome.php:110 -#: ../../view/theme/diabook/theme.php:492 +#: ../../view/theme/diabook/theme.php:485 #: ../../addon.old/communityhome/communityhome.php:110 msgid "Contact Photos" msgstr "Foto dei contatti" @@ -465,7 +465,7 @@ msgstr "I dati di questo contatto non sono disponibili" #: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296 #: ../../mod/profile_photo.php:305 #: ../../addon/communityhome/communityhome.php:111 -#: ../../view/theme/diabook/theme.php:493 ../../include/user.php:324 +#: ../../view/theme/diabook/theme.php:486 ../../include/user.php:324 #: ../../include/user.php:331 ../../include/user.php:338 #: ../../addon.old/communityhome/communityhome.php:111 msgid "Profile Photos" @@ -489,7 +489,7 @@ msgstr "è stato taggato in una" #: ../../mod/photos.php:606 ../../mod/like.php:145 ../../mod/subthread.php:87 #: ../../mod/tagger.php:62 ../../addon/communityhome/communityhome.php:163 -#: ../../view/theme/diabook/theme.php:464 ../../include/text.php:1437 +#: ../../view/theme/diabook/theme.php:457 ../../include/text.php:1437 #: ../../include/diaspora.php:1835 ../../include/conversation.php:125 #: ../../include/conversation.php:253 #: ../../addon.old/communityhome/communityhome.php:163 @@ -701,7 +701,7 @@ msgstr "Foto recenti" msgid "Not available." msgstr "Non disponibile." -#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:93 +#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:92 #: ../../include/nav.php:101 msgid "Community" msgstr "Comunità" @@ -961,7 +961,7 @@ msgstr "Conferma la tua richiesta di connessione con %s." msgid "Confirm" msgstr "Conferma" -#: ../../mod/dfrn_request.php:715 ../../include/items.php:3292 +#: ../../mod/dfrn_request.php:715 ../../include/items.php:3293 msgid "[Name Withheld]" msgstr "[Nome Nascosto]" @@ -1544,7 +1544,7 @@ msgstr "Rete" msgid "Personal" msgstr "Personale" -#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:87 +#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:86 #: ../../include/nav.php:77 ../../include/nav.php:115 msgid "Home" msgstr "Home" @@ -1989,7 +1989,7 @@ msgstr "sei un fan di" msgid "Edit contact" msgstr "Modifca contatto" -#: ../../mod/contacts.php:571 ../../view/theme/diabook/theme.php:89 +#: ../../mod/contacts.php:571 ../../view/theme/diabook/theme.php:88 #: ../../include/nav.php:139 msgid "Contacts" msgstr "Contatti" @@ -2026,7 +2026,7 @@ msgstr "Richiesta reimpostazione password su %s" #: ../../addon/facebook/facebook.php:702 #: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661 #: ../../addon/public_server/public_server.php:62 -#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3301 +#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3302 #: ../../boot.php:799 ../../addon.old/facebook/facebook.php:702 #: ../../addon.old/facebook/facebook.php:1200 #: ../../addon.old/fbpost/fbpost.php:661 @@ -2116,9 +2116,8 @@ msgstr "" #: ../../mod/settings.php:69 ../../mod/newmember.php:22 #: ../../mod/admin.php:785 ../../mod/admin.php:990 #: ../../addon/dav/friendica/layout.fnk.php:225 -#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:537 -#: ../../view/theme/diabook/theme.php:658 ../../include/nav.php:137 -#: ../../addon.old/dav/friendica/layout.fnk.php:225 +#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:614 +#: ../../include/nav.php:137 ../../addon.old/dav/friendica/layout.fnk.php:225 #: ../../addon.old/mathjax/mathjax.php:36 msgid "Settings" msgstr "Impostazioni" @@ -2863,7 +2862,7 @@ msgid "" msgstr "Guarda le altre impostazioni, in particolare le impostazioni della privacy. Un profilo non pubblicato è come un numero di telefono non in elenco. In genere, dovresti pubblicare il tuo profilo - a meno che tutti i tuoi amici e potenziali tali sappiano esattamente come trovarti." #: ../../mod/newmember.php:32 ../../mod/profperm.php:103 -#: ../../view/theme/diabook/theme.php:88 ../../include/profile_advanced.php:7 +#: ../../view/theme/diabook/theme.php:87 ../../include/profile_advanced.php:7 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50 #: ../../boot.php:1684 msgid "Profile" @@ -2974,7 +2973,7 @@ msgstr "Nel pannello laterale nella pagina \"Contatti\", ci sono diversi strumen #: ../../mod/newmember.php:66 ../../include/group.php:270 msgid "Groups" -msgstr "Grouppi" +msgstr "Gruppi" #: ../../mod/newmember.php:70 msgid "Group Your Contacts" @@ -3188,8 +3187,8 @@ msgstr "Cerca persone" #: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1598 #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 -#: ../../view/theme/diabook/theme.php:459 -#: ../../view/theme/diabook/theme.php:468 ../../include/diaspora.php:1835 +#: ../../view/theme/diabook/theme.php:452 +#: ../../view/theme/diabook/theme.php:461 ../../include/diaspora.php:1835 #: ../../include/conversation.php:120 ../../include/conversation.php:129 #: ../../include/conversation.php:248 ../../include/conversation.php:257 #: ../../addon.old/facebook/facebook.php:1598 @@ -3200,7 +3199,7 @@ msgstr "stato" #: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602 #: ../../addon/communityhome/communityhome.php:172 -#: ../../view/theme/diabook/theme.php:473 ../../include/diaspora.php:1851 +#: ../../view/theme/diabook/theme.php:466 ../../include/diaspora.php:1851 #: ../../include/conversation.php:136 #: ../../addon.old/facebook/facebook.php:1602 #: ../../addon.old/communityhome/communityhome.php:172 @@ -3215,7 +3214,7 @@ msgstr "A %1$s non piace %3$s di %2$s" #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159 #: ../../mod/admin.php:734 ../../mod/admin.php:933 ../../mod/display.php:29 -#: ../../mod/display.php:145 ../../include/items.php:3779 +#: ../../mod/display.php:145 ../../include/items.php:3780 msgid "Item not found." msgstr "Elemento non trovato." @@ -3223,7 +3222,7 @@ msgstr "Elemento non trovato." msgid "Access denied." msgstr "Accesso negato." -#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:90 +#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:89 #: ../../include/nav.php:51 ../../boot.php:1691 msgid "Photos" msgstr "Foto" @@ -4616,7 +4615,7 @@ msgstr "" msgid "diaspora2bb: " msgstr "" -#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:520 +#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:513 #: ../../include/contact_widgets.php:34 msgid "Friend Suggestions" msgstr "Contatti suggeriti" @@ -4631,7 +4630,7 @@ msgstr "Nessun suggerimento disponibile. Se questo è un sito nuovo, riprova tra msgid "Ignore/Hide" msgstr "Ignora / Nascondi" -#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:518 +#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:511 msgid "Global Directory" msgstr "Elenco globale" @@ -5568,7 +5567,7 @@ msgid "Latest likes" msgstr "Ultimi \"mi piace\"" #: ../../addon/communityhome/communityhome.php:155 -#: ../../view/theme/diabook/theme.php:456 ../../include/text.php:1435 +#: ../../view/theme/diabook/theme.php:449 ../../include/text.php:1435 #: ../../include/conversation.php:117 ../../include/conversation.php:245 #: ../../addon.old/communityhome/communityhome.php:155 msgid "event" @@ -7582,137 +7581,135 @@ msgstr "" msgid "Color scheme" msgstr "Schema colori" -#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:49 +#: ../../view/theme/diabook/theme.php:86 ../../include/nav.php:49 #: ../../include/nav.php:115 msgid "Your posts and conversations" msgstr "I tuoi messaggi e le tue conversazioni" -#: ../../view/theme/diabook/theme.php:88 ../../include/nav.php:50 +#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:50 msgid "Your profile page" msgstr "Pagina del tuo profilo" -#: ../../view/theme/diabook/theme.php:89 +#: ../../view/theme/diabook/theme.php:88 msgid "Your contacts" msgstr "" -#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:51 +#: ../../view/theme/diabook/theme.php:89 ../../include/nav.php:51 msgid "Your photos" msgstr "Le tue foto" -#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:52 +#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:52 msgid "Your events" msgstr "I tuoi eventi" -#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53 +#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:53 msgid "Personal notes" msgstr "Note personali" -#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53 +#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:53 msgid "Your personal photos" msgstr "Le tue foto personali" -#: ../../view/theme/diabook/theme.php:94 -#: ../../view/theme/diabook/theme.php:537 -#: ../../view/theme/diabook/theme.php:632 +#: ../../view/theme/diabook/theme.php:93 #: ../../view/theme/diabook/config.php:163 msgid "Community Pages" msgstr "" -#: ../../view/theme/diabook/theme.php:384 -#: ../../view/theme/diabook/theme.php:634 +#: ../../view/theme/diabook/theme.php:377 +#: ../../view/theme/diabook/theme.php:591 #: ../../view/theme/diabook/config.php:165 msgid "Community Profiles" msgstr "" -#: ../../view/theme/diabook/theme.php:405 -#: ../../view/theme/diabook/theme.php:639 +#: ../../view/theme/diabook/theme.php:398 +#: ../../view/theme/diabook/theme.php:596 #: ../../view/theme/diabook/config.php:170 msgid "Last users" msgstr "Ultimi utenti" -#: ../../view/theme/diabook/theme.php:434 -#: ../../view/theme/diabook/theme.php:641 +#: ../../view/theme/diabook/theme.php:427 +#: ../../view/theme/diabook/theme.php:598 #: ../../view/theme/diabook/config.php:172 msgid "Last likes" msgstr "Ultimi \"mi piace\"" -#: ../../view/theme/diabook/theme.php:479 -#: ../../view/theme/diabook/theme.php:640 +#: ../../view/theme/diabook/theme.php:472 +#: ../../view/theme/diabook/theme.php:597 #: ../../view/theme/diabook/config.php:171 msgid "Last photos" msgstr "Ultime foto" -#: ../../view/theme/diabook/theme.php:516 -#: ../../view/theme/diabook/theme.php:637 +#: ../../view/theme/diabook/theme.php:509 +#: ../../view/theme/diabook/theme.php:594 #: ../../view/theme/diabook/config.php:168 msgid "Find Friends" msgstr "Trova Amici" -#: ../../view/theme/diabook/theme.php:517 +#: ../../view/theme/diabook/theme.php:510 msgid "Local Directory" msgstr "Elenco Locale" -#: ../../view/theme/diabook/theme.php:519 ../../include/contact_widgets.php:35 +#: ../../view/theme/diabook/theme.php:512 ../../include/contact_widgets.php:35 msgid "Similar Interests" msgstr "Interessi simili" -#: ../../view/theme/diabook/theme.php:521 ../../include/contact_widgets.php:37 +#: ../../view/theme/diabook/theme.php:514 ../../include/contact_widgets.php:37 msgid "Invite Friends" msgstr "Invita amici" -#: ../../view/theme/diabook/theme.php:572 -#: ../../view/theme/diabook/theme.php:633 +#: ../../view/theme/diabook/theme.php:531 +#: ../../view/theme/diabook/theme.php:590 #: ../../view/theme/diabook/config.php:164 msgid "Earth Layers" msgstr "" -#: ../../view/theme/diabook/theme.php:577 +#: ../../view/theme/diabook/theme.php:536 msgid "Set zoomfactor for Earth Layers" msgstr "" -#: ../../view/theme/diabook/theme.php:578 +#: ../../view/theme/diabook/theme.php:537 #: ../../view/theme/diabook/config.php:161 msgid "Set longitude (X) for Earth Layers" msgstr "" -#: ../../view/theme/diabook/theme.php:579 +#: ../../view/theme/diabook/theme.php:538 #: ../../view/theme/diabook/config.php:162 msgid "Set latitude (Y) for Earth Layers" msgstr "" +#: ../../view/theme/diabook/theme.php:551 #: ../../view/theme/diabook/theme.php:592 -#: ../../view/theme/diabook/theme.php:635 #: ../../view/theme/diabook/config.php:166 msgid "Help or @NewHere ?" msgstr "Serve aiuto? Sei nuovo?" -#: ../../view/theme/diabook/theme.php:599 -#: ../../view/theme/diabook/theme.php:636 +#: ../../view/theme/diabook/theme.php:558 +#: ../../view/theme/diabook/theme.php:593 #: ../../view/theme/diabook/config.php:167 msgid "Connect Services" msgstr "Servizi di conessione" -#: ../../view/theme/diabook/theme.php:606 -#: ../../view/theme/diabook/theme.php:638 +#: ../../view/theme/diabook/theme.php:565 +#: ../../view/theme/diabook/theme.php:595 msgid "Last Tweets" msgstr "" -#: ../../view/theme/diabook/theme.php:609 +#: ../../view/theme/diabook/theme.php:568 #: ../../view/theme/diabook/config.php:159 msgid "Set twitter search term" msgstr "" -#: ../../view/theme/diabook/theme.php:629 +#: ../../view/theme/diabook/theme.php:587 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:288 msgid "don't show" msgstr "non mostrare" -#: ../../view/theme/diabook/theme.php:629 +#: ../../view/theme/diabook/theme.php:587 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:287 msgid "show" msgstr "mostra" -#: ../../view/theme/diabook/theme.php:630 +#: ../../view/theme/diabook/theme.php:588 msgid "Show/hide boxes at right-hand column:" msgstr "" @@ -8663,12 +8660,12 @@ msgstr "secondi" msgid "%1$d %2$s ago" msgstr "%1$d %2$s fa" -#: ../../include/datetime.php:472 ../../include/items.php:1688 +#: ../../include/datetime.php:472 ../../include/items.php:1689 #, php-format msgid "%s's birthday" msgstr "" -#: ../../include/datetime.php:473 ../../include/items.php:1689 +#: ../../include/datetime.php:473 ../../include/items.php:1690 #, php-format msgid "Happy Birthday %s" msgstr "" @@ -8943,15 +8940,15 @@ msgstr "Impossibile recuperare informazioni sul contatto." msgid "following" msgstr "segue" -#: ../../include/items.php:3299 +#: ../../include/items.php:3300 msgid "A new person is sharing with you at " msgstr "Una nuova persona sta condividendo con te da " -#: ../../include/items.php:3299 +#: ../../include/items.php:3300 msgid "You have a new follower at " msgstr "Una nuova persona ti segue su " -#: ../../include/items.php:3980 +#: ../../include/items.php:3981 msgid "Archives" msgstr "" diff --git a/view/it/strings.php b/view/it/strings.php index a3e0df43a..70544ced0 100644 --- a/view/it/strings.php +++ b/view/it/strings.php @@ -641,7 +641,7 @@ $a->strings["Go to Your Site's Directory"] = ""; $a->strings["The Directory page lets you find other people in this network or other federated sites. Look for a Connect or Follow link on their profile page. Provide your own Identity Address if requested."] = "La pagina Elenco ti permette di trovare altre persone in questa rete o in altri siti. Cerca un link Connetti o Segui nella loro pagina del profilo. Inserisci il tuo Indirizzo Identità, se richiesto."; $a->strings["Finding New People"] = ""; $a->strings["On the side panel of the Contacts page are several tools to find new friends. We can match people by interest, look up people by name or interest, and provide suggestions based on network relationships. On a brand new site, friend suggestions will usually begin to be populated within 24 hours."] = "Nel pannello laterale nella pagina \"Contatti\", ci sono diversi strumenti per trovare nuovi amici. Possiamo confrontare le persone per interessi, cercare le persone per nome e fornire suggerimenti basati sui tuoi contatti esistenti. Su un sito nuovo, i suggerimenti sono di solito presenti dopo 24 ore."; -$a->strings["Groups"] = "Grouppi"; +$a->strings["Groups"] = "Gruppi"; $a->strings["Group Your Contacts"] = ""; $a->strings["Once you have made some friends, organize them into private conversation groups from the sidebar of your Contacts page and then you can interact with each group privately on your Network page."] = "Quando avrai alcuni amici, organizzali in gruppi di conversazioni private dalla barra laterale della tua pagina Contatti. Potrai interagire privatamente con ogni gruppo nella tua pagina Rete"; $a->strings["Why Aren't My Posts Public?"] = ""; From 4832bc74f55e7d3e6f66d281f5de3a071fe1e071 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Thu, 1 Nov 2012 13:03:25 +0100 Subject: [PATCH 12/41] FR: update to the strings --- view/fr/messages.po | 326 ++++++++++++++++++++++---------------------- view/fr/strings.php | 14 +- 2 files changed, 169 insertions(+), 171 deletions(-) diff --git a/view/fr/messages.po b/view/fr/messages.po index f617e1466..92da96a7f 100644 --- a/view/fr/messages.po +++ b/view/fr/messages.po @@ -3,15 +3,16 @@ # This file is distributed under the same license as the Friendica package. # # Translators: +# , 2012. # , 2012. # Olivier , 2011-2012. msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n" -"POT-Creation-Date: 2012-10-18 10:00-0700\n" -"PO-Revision-Date: 2012-10-18 08:00+0000\n" -"Last-Translator: Olivier \n" +"POT-Creation-Date: 2012-10-30 10:00-0700\n" +"PO-Revision-Date: 2012-10-31 14:33+0000\n" +"Last-Translator: Domovoy \n" "Language-Team: French (http://www.transifex.com/projects/p/friendica/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -60,7 +61,7 @@ msgstr "Impossible d'appliquer les réglages." #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510 #: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:159 #: ../../addon/fbpost/fbpost.php:165 -#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3913 +#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3914 #: ../../index.php:319 ../../addon.old/facebook/facebook.php:510 #: ../../addon.old/facebook/facebook.php:516 #: ../../addon.old/fbpost/fbpost.php:159 ../../addon.old/fbpost/fbpost.php:165 @@ -180,7 +181,7 @@ msgstr "Nouvelle photo depuis cette URL" #: ../../addon/irc/irc.php:55 ../../addon/fromapp/fromapp.php:77 #: ../../addon/blogger/blogger.php:102 ../../addon/posterous/posterous.php:103 #: ../../view/theme/cleanzero/config.php:80 -#: ../../view/theme/diabook/theme.php:642 +#: ../../view/theme/diabook/theme.php:599 #: ../../view/theme/diabook/config.php:152 #: ../../view/theme/quattro/config.php:64 ../../view/theme/dispy/config.php:70 #: ../../object/Item.php:558 ../../addon.old/fromgplus/fromgplus.php:40 @@ -283,11 +284,11 @@ msgstr "l, F j" msgid "Edit event" msgstr "Editer l'événement" -#: ../../mod/events.php:323 ../../include/text.php:1187 +#: ../../mod/events.php:323 ../../include/text.php:1185 msgid "link to source" msgstr "lien original" -#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:91 +#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:90 #: ../../include/nav.php:52 ../../boot.php:1701 msgid "Events" msgstr "Événements" @@ -361,7 +362,7 @@ msgstr "Partager cet événement" #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:142 #: ../../mod/dfrn_request.php:847 ../../mod/settings.php:544 #: ../../mod/settings.php:570 ../../addon/js_upload/js_upload.php:45 -#: ../../include/conversation.php:995 +#: ../../include/conversation.php:996 #: ../../addon.old/js_upload/js_upload.php:45 msgid "Cancel" msgstr "Annuler" @@ -439,7 +440,7 @@ msgstr "Albums photo" #: ../../mod/photos.php:1095 ../../mod/photos.php:1110 #: ../../mod/photos.php:1562 ../../mod/photos.php:1574 #: ../../addon/communityhome/communityhome.php:110 -#: ../../view/theme/diabook/theme.php:492 +#: ../../view/theme/diabook/theme.php:485 #: ../../addon.old/communityhome/communityhome.php:110 msgid "Contact Photos" msgstr "Photos du contact" @@ -462,7 +463,7 @@ msgstr "Informations de contact indisponibles" #: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296 #: ../../mod/profile_photo.php:305 #: ../../addon/communityhome/communityhome.php:111 -#: ../../view/theme/diabook/theme.php:493 ../../include/user.php:324 +#: ../../view/theme/diabook/theme.php:486 ../../include/user.php:324 #: ../../include/user.php:331 ../../include/user.php:338 #: ../../addon.old/communityhome/communityhome.php:111 msgid "Profile Photos" @@ -486,7 +487,7 @@ msgstr "a été identifié dans" #: ../../mod/photos.php:606 ../../mod/like.php:145 ../../mod/subthread.php:87 #: ../../mod/tagger.php:62 ../../addon/communityhome/communityhome.php:163 -#: ../../view/theme/diabook/theme.php:464 ../../include/text.php:1439 +#: ../../view/theme/diabook/theme.php:457 ../../include/text.php:1437 #: ../../include/diaspora.php:1835 ../../include/conversation.php:125 #: ../../include/conversation.php:253 #: ../../addon.old/communityhome/communityhome.php:163 @@ -648,15 +649,15 @@ msgstr "J'aime (bascule)" msgid "I don't like this (toggle)" msgstr "Je n'aime pas (bascule)" -#: ../../mod/photos.php:1386 ../../include/conversation.php:956 +#: ../../mod/photos.php:1386 ../../include/conversation.php:957 msgid "Share" msgstr "Partager" #: ../../mod/photos.php:1387 ../../mod/editpost.php:118 #: ../../mod/content.php:482 ../../mod/content.php:845 #: ../../mod/wallmessage.php:152 ../../mod/message.php:293 -#: ../../mod/message.php:481 ../../include/conversation.php:619 -#: ../../include/conversation.php:975 ../../object/Item.php:258 +#: ../../mod/message.php:481 ../../include/conversation.php:620 +#: ../../include/conversation.php:976 ../../object/Item.php:258 msgid "Please wait" msgstr "Patientez" @@ -674,7 +675,7 @@ msgstr "Commenter" #: ../../mod/photos.php:1407 ../../mod/photos.php:1450 #: ../../mod/photos.php:1521 ../../mod/editpost.php:139 -#: ../../mod/content.php:702 ../../include/conversation.php:993 +#: ../../mod/content.php:702 ../../include/conversation.php:994 #: ../../object/Item.php:567 msgid "Preview" msgstr "Aperçu" @@ -682,7 +683,7 @@ msgstr "Aperçu" #: ../../mod/photos.php:1489 ../../mod/content.php:439 #: ../../mod/content.php:723 ../../mod/settings.php:606 #: ../../mod/group.php:168 ../../mod/admin.php:696 -#: ../../include/conversation.php:564 ../../object/Item.php:117 +#: ../../include/conversation.php:565 ../../object/Item.php:117 msgid "Delete" msgstr "Supprimer" @@ -698,7 +699,7 @@ msgstr "Photos récentes" msgid "Not available." msgstr "Indisponible." -#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:93 +#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:92 #: ../../include/nav.php:101 msgid "Community" msgstr "Communauté" @@ -748,7 +749,7 @@ msgstr "Élément introuvable" msgid "Edit post" msgstr "Éditer la publication" -#: ../../mod/editpost.php:88 ../../include/conversation.php:942 +#: ../../mod/editpost.php:88 ../../include/conversation.php:943 msgid "Post to Email" msgstr "Publier aussi par courriel" @@ -759,85 +760,85 @@ msgstr "Éditer" #: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150 #: ../../mod/message.php:291 ../../mod/message.php:478 -#: ../../include/conversation.php:957 +#: ../../include/conversation.php:958 msgid "Upload photo" msgstr "Joindre photo" -#: ../../mod/editpost.php:105 ../../include/conversation.php:958 +#: ../../mod/editpost.php:105 ../../include/conversation.php:959 msgid "upload photo" msgstr "envoi image" -#: ../../mod/editpost.php:106 ../../include/conversation.php:959 +#: ../../mod/editpost.php:106 ../../include/conversation.php:960 msgid "Attach file" msgstr "Joindre fichier" -#: ../../mod/editpost.php:107 ../../include/conversation.php:960 +#: ../../mod/editpost.php:107 ../../include/conversation.php:961 msgid "attach file" msgstr "ajout fichier" #: ../../mod/editpost.php:108 ../../mod/wallmessage.php:151 #: ../../mod/message.php:292 ../../mod/message.php:479 -#: ../../include/conversation.php:961 +#: ../../include/conversation.php:962 msgid "Insert web link" msgstr "Insérer lien web" -#: ../../mod/editpost.php:109 ../../include/conversation.php:962 +#: ../../mod/editpost.php:109 ../../include/conversation.php:963 msgid "web link" msgstr "lien web" -#: ../../mod/editpost.php:110 ../../include/conversation.php:963 +#: ../../mod/editpost.php:110 ../../include/conversation.php:964 msgid "Insert video link" msgstr "Insérer un lien video" -#: ../../mod/editpost.php:111 ../../include/conversation.php:964 +#: ../../mod/editpost.php:111 ../../include/conversation.php:965 msgid "video link" msgstr "lien vidéo" -#: ../../mod/editpost.php:112 ../../include/conversation.php:965 +#: ../../mod/editpost.php:112 ../../include/conversation.php:966 msgid "Insert audio link" msgstr "Insérer un lien audio" -#: ../../mod/editpost.php:113 ../../include/conversation.php:966 +#: ../../mod/editpost.php:113 ../../include/conversation.php:967 msgid "audio link" msgstr "lien audio" -#: ../../mod/editpost.php:114 ../../include/conversation.php:967 +#: ../../mod/editpost.php:114 ../../include/conversation.php:968 msgid "Set your location" msgstr "Définir votre localisation" -#: ../../mod/editpost.php:115 ../../include/conversation.php:968 +#: ../../mod/editpost.php:115 ../../include/conversation.php:969 msgid "set location" msgstr "spéc. localisation" -#: ../../mod/editpost.php:116 ../../include/conversation.php:969 +#: ../../mod/editpost.php:116 ../../include/conversation.php:970 msgid "Clear browser location" msgstr "Effacer la localisation du navigateur" -#: ../../mod/editpost.php:117 ../../include/conversation.php:970 +#: ../../mod/editpost.php:117 ../../include/conversation.php:971 msgid "clear location" msgstr "supp. localisation" -#: ../../mod/editpost.php:119 ../../include/conversation.php:976 +#: ../../mod/editpost.php:119 ../../include/conversation.php:977 msgid "Permission settings" msgstr "Réglages des permissions" -#: ../../mod/editpost.php:127 ../../include/conversation.php:985 +#: ../../mod/editpost.php:127 ../../include/conversation.php:986 msgid "CC: email addresses" msgstr "CC: adresses de courriel" -#: ../../mod/editpost.php:128 ../../include/conversation.php:986 +#: ../../mod/editpost.php:128 ../../include/conversation.php:987 msgid "Public post" msgstr "Notice publique" -#: ../../mod/editpost.php:131 ../../include/conversation.php:972 +#: ../../mod/editpost.php:131 ../../include/conversation.php:973 msgid "Set title" msgstr "Définir un titre" -#: ../../mod/editpost.php:133 ../../include/conversation.php:974 +#: ../../mod/editpost.php:133 ../../include/conversation.php:975 msgid "Categories (comma-separated list)" msgstr "Catégories (séparées par des virgules)" -#: ../../mod/editpost.php:134 ../../include/conversation.php:988 +#: ../../mod/editpost.php:134 ../../include/conversation.php:989 msgid "Example: bob@example.com, mary@example.com" msgstr "Exemple: bob@exemple.com, mary@exemple.com" @@ -958,7 +959,7 @@ msgstr "Merci de confirmer votre demande d'introduction auprès de %s." msgid "Confirm" msgstr "Confirmer" -#: ../../mod/dfrn_request.php:715 ../../include/items.php:3292 +#: ../../mod/dfrn_request.php:715 ../../include/items.php:3293 msgid "[Name Withheld]" msgstr "[Nom non-publié]" @@ -1295,7 +1296,7 @@ msgstr "Conversion temporelle" #: ../../mod/localtime.php:26 msgid "" -"Friendika provides this service for sharing events with other networks and " +"Friendica provides this service for sharing events with other networks and " "friends in unknown timezones." msgstr "Friendica fournit ce service pour partager des événements avec d'autres réseaux et amis indépendament de leur fuseau horaire." @@ -1381,24 +1382,24 @@ msgid "Group: " msgstr "Groupe: " #: ../../mod/content.php:438 ../../mod/content.php:722 -#: ../../include/conversation.php:563 ../../object/Item.php:116 +#: ../../include/conversation.php:564 ../../object/Item.php:116 msgid "Select" msgstr "Sélectionner" #: ../../mod/content.php:455 ../../mod/content.php:815 -#: ../../mod/content.php:816 ../../include/conversation.php:582 +#: ../../mod/content.php:816 ../../include/conversation.php:583 #: ../../object/Item.php:227 ../../object/Item.php:228 #, php-format msgid "View %s's profile @ %s" msgstr "Voir le profil de %s @ %s" #: ../../mod/content.php:465 ../../mod/content.php:827 -#: ../../include/conversation.php:602 ../../object/Item.php:240 +#: ../../include/conversation.php:603 ../../object/Item.php:240 #, php-format msgid "%s from %s" msgstr "%s de %s" -#: ../../mod/content.php:480 ../../include/conversation.php:617 +#: ../../mod/content.php:480 ../../include/conversation.php:618 msgid "View in context" msgstr "Voir dans le contexte" @@ -1409,7 +1410,7 @@ msgid_plural "%d comments" msgstr[0] "%d commentaire" msgstr[1] "%d commentaires" -#: ../../mod/content.php:588 ../../include/text.php:1443 +#: ../../mod/content.php:588 ../../include/text.php:1441 #: ../../object/Item.php:279 ../../object/Item.php:292 msgid "comment" msgid_plural "comments" @@ -1541,10 +1542,10 @@ msgstr "Réseau" msgid "Personal" msgstr "Personnel" -#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:87 +#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:86 #: ../../include/nav.php:77 ../../include/nav.php:115 msgid "Home" -msgstr "Accueil" +msgstr "Profil" #: ../../mod/notifications.php:98 ../../include/nav.php:121 msgid "Introductions" @@ -1986,7 +1987,7 @@ msgstr "Vous le/la suivez" msgid "Edit contact" msgstr "Éditer le contact" -#: ../../mod/contacts.php:571 ../../view/theme/diabook/theme.php:89 +#: ../../mod/contacts.php:571 ../../view/theme/diabook/theme.php:88 #: ../../include/nav.php:139 msgid "Contacts" msgstr "Contacts" @@ -2023,7 +2024,7 @@ msgstr "Requête de réinitialisation de mot de passe à %s" #: ../../addon/facebook/facebook.php:702 #: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661 #: ../../addon/public_server/public_server.php:62 -#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3301 +#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3302 #: ../../boot.php:799 ../../addon.old/facebook/facebook.php:702 #: ../../addon.old/facebook/facebook.php:1200 #: ../../addon.old/fbpost/fbpost.php:661 @@ -2113,9 +2114,8 @@ msgstr "Supprimer le compte" #: ../../mod/settings.php:69 ../../mod/newmember.php:22 #: ../../mod/admin.php:785 ../../mod/admin.php:990 #: ../../addon/dav/friendica/layout.fnk.php:225 -#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:537 -#: ../../view/theme/diabook/theme.php:658 ../../include/nav.php:137 -#: ../../addon.old/dav/friendica/layout.fnk.php:225 +#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:614 +#: ../../include/nav.php:137 ../../addon.old/dav/friendica/layout.fnk.php:225 #: ../../addon.old/mathjax/mathjax.php:36 msgid "Settings" msgstr "Réglages" @@ -2779,7 +2779,7 @@ msgstr "Pas de destinataire." #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131 #: ../../mod/message.php:242 ../../mod/message.php:250 -#: ../../include/conversation.php:893 ../../include/conversation.php:910 +#: ../../include/conversation.php:894 ../../include/conversation.php:911 msgid "Please enter a link URL:" msgstr "Entrez un lien web:" @@ -2860,7 +2860,7 @@ msgid "" msgstr "Vérifiez les autres réglages, tout particulièrement ceux liés à la vie privée. Un profil non listé, c'est un peu comme un numéro sur liste rouge. En général, vous devriez probablement publier votre profil - à moins que tous vos amis (potentiels) sachent déjà comment vous trouver." #: ../../mod/newmember.php:32 ../../mod/profperm.php:103 -#: ../../view/theme/diabook/theme.php:88 ../../include/profile_advanced.php:7 +#: ../../view/theme/diabook/theme.php:87 ../../include/profile_advanced.php:7 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50 #: ../../boot.php:1684 msgid "Profile" @@ -2901,7 +2901,7 @@ msgstr "Choisissez quelques mots-clé publics pour votre profil par défaut. Ils #: ../../mod/newmember.php:44 msgid "Connecting" -msgstr "" +msgstr "Connexions" #: ../../mod/newmember.php:49 ../../mod/newmember.php:51 #: ../../addon/facebook/facebook.php:728 ../../addon/fbpost/fbpost.php:239 @@ -3185,8 +3185,8 @@ msgstr "Recherche de personnes" #: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1598 #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 -#: ../../view/theme/diabook/theme.php:459 -#: ../../view/theme/diabook/theme.php:468 ../../include/diaspora.php:1835 +#: ../../view/theme/diabook/theme.php:452 +#: ../../view/theme/diabook/theme.php:461 ../../include/diaspora.php:1835 #: ../../include/conversation.php:120 ../../include/conversation.php:129 #: ../../include/conversation.php:248 ../../include/conversation.php:257 #: ../../addon.old/facebook/facebook.php:1598 @@ -3197,7 +3197,7 @@ msgstr "le statut" #: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602 #: ../../addon/communityhome/communityhome.php:172 -#: ../../view/theme/diabook/theme.php:473 ../../include/diaspora.php:1851 +#: ../../view/theme/diabook/theme.php:466 ../../include/diaspora.php:1851 #: ../../include/conversation.php:136 #: ../../addon.old/facebook/facebook.php:1602 #: ../../addon.old/communityhome/communityhome.php:172 @@ -3212,7 +3212,7 @@ msgstr "%1$s n'aime pas %3$s de %2$s" #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159 #: ../../mod/admin.php:734 ../../mod/admin.php:933 ../../mod/display.php:29 -#: ../../mod/display.php:145 ../../include/items.php:3779 +#: ../../mod/display.php:145 ../../include/items.php:3780 msgid "Item not found." msgstr "Élément introuvable." @@ -3220,7 +3220,7 @@ msgstr "Élément introuvable." msgid "Access denied." msgstr "Accès refusé." -#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:90 +#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:89 #: ../../include/nav.php:51 ../../boot.php:1691 msgid "Photos" msgstr "Photos" @@ -4520,8 +4520,8 @@ msgstr "visible par tous" msgid "Edit visibility" msgstr "Changer la visibilité" -#: ../../mod/filer.php:29 ../../include/conversation.php:897 -#: ../../include/conversation.php:914 +#: ../../mod/filer.php:29 ../../include/conversation.php:898 +#: ../../include/conversation.php:915 msgid "Save to Folder:" msgstr "Sauver dans le Dossier:" @@ -4613,7 +4613,7 @@ msgstr "Texte source (format Diaspora) :" msgid "diaspora2bb: " msgstr "diaspora2bb :" -#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:520 +#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:513 #: ../../include/contact_widgets.php:34 msgid "Friend Suggestions" msgstr "Suggestions d'amitiés/contacts" @@ -4628,7 +4628,7 @@ msgstr "Aucune suggestion. Si ce site est récent, merci de recommencer dans 24h msgid "Ignore/Hide" msgstr "Ignorer/cacher" -#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:518 +#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:511 msgid "Global Directory" msgstr "Annuaire global" @@ -5565,7 +5565,7 @@ msgid "Latest likes" msgstr "Dernières approbations" #: ../../addon/communityhome/communityhome.php:155 -#: ../../view/theme/diabook/theme.php:456 ../../include/text.php:1437 +#: ../../view/theme/diabook/theme.php:449 ../../include/text.php:1435 #: ../../include/conversation.php:117 ../../include/conversation.php:245 #: ../../addon.old/communityhome/communityhome.php:155 msgid "event" @@ -5591,7 +5591,7 @@ msgstr "Pas d'accès" #: ../../addon.old/dav/common/wdcal_edit.inc.php:30 #: ../../addon.old/dav/common/wdcal_edit.inc.php:738 msgid "Could not open component for editing" -msgstr "" +msgstr "Échec d'ouverture de l'élément pour édition" #: ../../addon/dav/common/wdcal_edit.inc.php:140 #: ../../addon/dav/friendica/layout.fnk.php:143 @@ -5719,7 +5719,7 @@ msgstr "Jours" #: ../../addon/dav/common/wdcal_edit.inc.php:254 #: ../../addon/dav/common/wdcal_edit.inc.php:270 #: ../../addon/dav/common/wdcal_edit.inc.php:293 -#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:917 +#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:915 #: ../../addon.old/dav/common/wdcal_edit.inc.php:231 #: ../../addon.old/dav/common/wdcal_edit.inc.php:254 #: ../../addon.old/dav/common/wdcal_edit.inc.php:270 @@ -5730,7 +5730,7 @@ msgstr "Dimanche" #: ../../addon/dav/common/wdcal_edit.inc.php:235 #: ../../addon/dav/common/wdcal_edit.inc.php:274 -#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:917 +#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:915 #: ../../addon.old/dav/common/wdcal_edit.inc.php:235 #: ../../addon.old/dav/common/wdcal_edit.inc.php:274 #: ../../addon.old/dav/common/wdcal_edit.inc.php:308 @@ -5738,35 +5738,35 @@ msgid "Monday" msgstr "Lundi" #: ../../addon/dav/common/wdcal_edit.inc.php:238 -#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:917 +#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:915 #: ../../addon.old/dav/common/wdcal_edit.inc.php:238 #: ../../addon.old/dav/common/wdcal_edit.inc.php:277 msgid "Tuesday" msgstr "Mardi" #: ../../addon/dav/common/wdcal_edit.inc.php:241 -#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:917 +#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:915 #: ../../addon.old/dav/common/wdcal_edit.inc.php:241 #: ../../addon.old/dav/common/wdcal_edit.inc.php:280 msgid "Wednesday" msgstr "Mercredi" #: ../../addon/dav/common/wdcal_edit.inc.php:244 -#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:917 +#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:915 #: ../../addon.old/dav/common/wdcal_edit.inc.php:244 #: ../../addon.old/dav/common/wdcal_edit.inc.php:283 msgid "Thursday" msgstr "Jeudi" #: ../../addon/dav/common/wdcal_edit.inc.php:247 -#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:917 +#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:915 #: ../../addon.old/dav/common/wdcal_edit.inc.php:247 #: ../../addon.old/dav/common/wdcal_edit.inc.php:286 msgid "Friday" msgstr "Vendredi" #: ../../addon/dav/common/wdcal_edit.inc.php:250 -#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:917 +#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:915 #: ../../addon.old/dav/common/wdcal_edit.inc.php:250 #: ../../addon.old/dav/common/wdcal_edit.inc.php:289 msgid "Saturday" @@ -6391,7 +6391,7 @@ msgstr "Permissions distantes" msgid "" "Allow recipients of your private posts to see the other recipients of the " "posts" -msgstr "" +msgstr "Autoriser les destinataires de vos messages privés a voir les autres destinataires du message" #: ../../addon/remote_permissions/remote_permissions.php:57 msgid "Remote Permissions settings updated." @@ -6403,7 +6403,7 @@ msgstr "Visibilité" #: ../../addon/remote_permissions/remote_permissions.php:177 msgid "may only be a partial list" -msgstr "" +msgstr "peut être une liste partielle" #: ../../addon/remote_permissions/remote_permissions.php:196 msgid "Global" @@ -7579,137 +7579,135 @@ msgstr "Largeur du thème" msgid "Color scheme" msgstr "Palette de couleurs" -#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:49 +#: ../../view/theme/diabook/theme.php:86 ../../include/nav.php:49 #: ../../include/nav.php:115 msgid "Your posts and conversations" msgstr "Vos notices et conversations" -#: ../../view/theme/diabook/theme.php:88 ../../include/nav.php:50 +#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:50 msgid "Your profile page" msgstr "Votre page de profil" -#: ../../view/theme/diabook/theme.php:89 +#: ../../view/theme/diabook/theme.php:88 msgid "Your contacts" msgstr "Vos contacts" -#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:51 +#: ../../view/theme/diabook/theme.php:89 ../../include/nav.php:51 msgid "Your photos" msgstr "Vos photos" -#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:52 +#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:52 msgid "Your events" msgstr "Vos événements" -#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53 +#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:53 msgid "Personal notes" msgstr "Notes personnelles" -#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53 +#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:53 msgid "Your personal photos" msgstr "Vos photos personnelles" -#: ../../view/theme/diabook/theme.php:94 -#: ../../view/theme/diabook/theme.php:537 -#: ../../view/theme/diabook/theme.php:632 +#: ../../view/theme/diabook/theme.php:93 #: ../../view/theme/diabook/config.php:163 msgid "Community Pages" msgstr "Pages de Communauté" -#: ../../view/theme/diabook/theme.php:384 -#: ../../view/theme/diabook/theme.php:634 +#: ../../view/theme/diabook/theme.php:377 +#: ../../view/theme/diabook/theme.php:591 #: ../../view/theme/diabook/config.php:165 msgid "Community Profiles" msgstr "Profils communautaires" -#: ../../view/theme/diabook/theme.php:405 -#: ../../view/theme/diabook/theme.php:639 +#: ../../view/theme/diabook/theme.php:398 +#: ../../view/theme/diabook/theme.php:596 #: ../../view/theme/diabook/config.php:170 msgid "Last users" msgstr "Derniers utilisateurs" -#: ../../view/theme/diabook/theme.php:434 -#: ../../view/theme/diabook/theme.php:641 +#: ../../view/theme/diabook/theme.php:427 +#: ../../view/theme/diabook/theme.php:598 #: ../../view/theme/diabook/config.php:172 msgid "Last likes" msgstr "Dernièrement aimé" -#: ../../view/theme/diabook/theme.php:479 -#: ../../view/theme/diabook/theme.php:640 +#: ../../view/theme/diabook/theme.php:472 +#: ../../view/theme/diabook/theme.php:597 #: ../../view/theme/diabook/config.php:171 msgid "Last photos" msgstr "Dernières photos" -#: ../../view/theme/diabook/theme.php:516 -#: ../../view/theme/diabook/theme.php:637 +#: ../../view/theme/diabook/theme.php:509 +#: ../../view/theme/diabook/theme.php:594 #: ../../view/theme/diabook/config.php:168 msgid "Find Friends" msgstr "Trouver des amis" -#: ../../view/theme/diabook/theme.php:517 +#: ../../view/theme/diabook/theme.php:510 msgid "Local Directory" msgstr "Annuaire local" -#: ../../view/theme/diabook/theme.php:519 ../../include/contact_widgets.php:35 +#: ../../view/theme/diabook/theme.php:512 ../../include/contact_widgets.php:35 msgid "Similar Interests" msgstr "Intérêts similaires" -#: ../../view/theme/diabook/theme.php:521 ../../include/contact_widgets.php:37 +#: ../../view/theme/diabook/theme.php:514 ../../include/contact_widgets.php:37 msgid "Invite Friends" msgstr "Inviter des amis" -#: ../../view/theme/diabook/theme.php:572 -#: ../../view/theme/diabook/theme.php:633 +#: ../../view/theme/diabook/theme.php:531 +#: ../../view/theme/diabook/theme.php:590 #: ../../view/theme/diabook/config.php:164 msgid "Earth Layers" msgstr "Géolocalisation" -#: ../../view/theme/diabook/theme.php:577 +#: ../../view/theme/diabook/theme.php:536 msgid "Set zoomfactor for Earth Layers" msgstr "Régler le niveau de zoom pour la géolocalisation" -#: ../../view/theme/diabook/theme.php:578 +#: ../../view/theme/diabook/theme.php:537 #: ../../view/theme/diabook/config.php:161 msgid "Set longitude (X) for Earth Layers" msgstr "Régler la longitude (X) pour la géolocalisation" -#: ../../view/theme/diabook/theme.php:579 +#: ../../view/theme/diabook/theme.php:538 #: ../../view/theme/diabook/config.php:162 msgid "Set latitude (Y) for Earth Layers" msgstr "Régler la latitude (Y) pour la géolocalisation" +#: ../../view/theme/diabook/theme.php:551 #: ../../view/theme/diabook/theme.php:592 -#: ../../view/theme/diabook/theme.php:635 #: ../../view/theme/diabook/config.php:166 msgid "Help or @NewHere ?" msgstr "Aide ou @NewHere?" -#: ../../view/theme/diabook/theme.php:599 -#: ../../view/theme/diabook/theme.php:636 +#: ../../view/theme/diabook/theme.php:558 +#: ../../view/theme/diabook/theme.php:593 #: ../../view/theme/diabook/config.php:167 msgid "Connect Services" msgstr "Connecter des services" -#: ../../view/theme/diabook/theme.php:606 -#: ../../view/theme/diabook/theme.php:638 +#: ../../view/theme/diabook/theme.php:565 +#: ../../view/theme/diabook/theme.php:595 msgid "Last Tweets" msgstr "Derniers tweets" -#: ../../view/theme/diabook/theme.php:609 +#: ../../view/theme/diabook/theme.php:568 #: ../../view/theme/diabook/config.php:159 msgid "Set twitter search term" msgstr "Rechercher un terme twitter" -#: ../../view/theme/diabook/theme.php:629 +#: ../../view/theme/diabook/theme.php:587 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:288 msgid "don't show" msgstr "cacher" -#: ../../view/theme/diabook/theme.php:629 +#: ../../view/theme/diabook/theme.php:587 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:287 msgid "show" msgstr "montrer" -#: ../../view/theme/diabook/theme.php:630 +#: ../../view/theme/diabook/theme.php:588 msgid "Show/hide boxes at right-hand column:" msgstr "Montrer/cacher les boîtes dans la colonne de droite :" @@ -7748,7 +7746,7 @@ msgstr "Centre" #: ../../view/theme/quattro/config.php:69 msgid "Posts font size" -msgstr "" +msgstr "Taille de texte des messages" #: ../../view/theme/quattro/config.php:70 msgid "Textareas font size" @@ -8295,79 +8293,79 @@ msgstr "détendue" msgid "surprised" msgstr "surprise" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "January" msgstr "Janvier" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "February" msgstr "Février" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "March" msgstr "Mars" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "April" msgstr "Avril" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "May" msgstr "Mai" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "June" msgstr "Juin" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "July" msgstr "Juillet" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "August" msgstr "Août" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "September" msgstr "Septembre" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "October" msgstr "Octobre" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "November" msgstr "Novembre" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "December" msgstr "Décembre" -#: ../../include/text.php:1007 +#: ../../include/text.php:1005 msgid "bytes" msgstr "octets" -#: ../../include/text.php:1034 ../../include/text.php:1046 +#: ../../include/text.php:1032 ../../include/text.php:1044 msgid "Click to open/close" msgstr "Cliquer pour ouvrir/fermer" -#: ../../include/text.php:1219 ../../include/user.php:236 +#: ../../include/text.php:1217 ../../include/user.php:236 msgid "default" msgstr "défaut" -#: ../../include/text.php:1231 +#: ../../include/text.php:1229 msgid "Select an alternate language" msgstr "Choisir une langue alternative" -#: ../../include/text.php:1441 +#: ../../include/text.php:1439 msgid "activity" msgstr "activité" -#: ../../include/text.php:1444 +#: ../../include/text.php:1442 msgid "post" msgstr "publication" -#: ../../include/text.php:1599 +#: ../../include/text.php:1597 msgid "Item filed" msgstr "Élément classé" @@ -8660,17 +8658,17 @@ msgstr "secondes" msgid "%1$d %2$s ago" msgstr "%1$d %2$s auparavant" -#: ../../include/datetime.php:472 ../../include/items.php:1688 +#: ../../include/datetime.php:472 ../../include/items.php:1689 #, php-format msgid "%s's birthday" msgstr "Anniversaire de %s's" -#: ../../include/datetime.php:473 ../../include/items.php:1689 +#: ../../include/datetime.php:473 ../../include/items.php:1690 #, php-format msgid "Happy Birthday %s" msgstr "Joyeux anniversaire, %s !" -#: ../../include/onepoll.php:409 +#: ../../include/onepoll.php:414 msgid "From: " msgstr "De: " @@ -8940,15 +8938,15 @@ msgstr "Impossible de récupérer les informations du contact." msgid "following" msgstr "following" -#: ../../include/items.php:3299 +#: ../../include/items.php:3300 msgid "A new person is sharing with you at " msgstr "Une nouvelle personne partage avec vous à " -#: ../../include/items.php:3299 +#: ../../include/items.php:3300 msgid "You have a new follower at " msgstr "Vous avez un nouvel abonné à " -#: ../../include/items.php:3980 +#: ../../include/items.php:3981 msgid "Archives" msgstr "Archives" @@ -9042,34 +9040,34 @@ msgstr "Le jeton de sécurité du formulaire n'est pas correct. Ceci veut probab msgid "stopped following" msgstr "retiré de la liste de suivi" -#: ../../include/Contact.php:220 ../../include/conversation.php:790 +#: ../../include/Contact.php:220 ../../include/conversation.php:791 msgid "Poke" msgstr "Sollicitations (pokes)" -#: ../../include/Contact.php:221 ../../include/conversation.php:784 +#: ../../include/Contact.php:221 ../../include/conversation.php:785 msgid "View Status" msgstr "Voir les statuts" -#: ../../include/Contact.php:222 ../../include/conversation.php:785 +#: ../../include/Contact.php:222 ../../include/conversation.php:786 msgid "View Profile" msgstr "Voir le profil" -#: ../../include/Contact.php:223 ../../include/conversation.php:786 +#: ../../include/Contact.php:223 ../../include/conversation.php:787 msgid "View Photos" msgstr "Voir les photos" #: ../../include/Contact.php:224 ../../include/Contact.php:237 -#: ../../include/conversation.php:787 +#: ../../include/conversation.php:788 msgid "Network Posts" msgstr "Posts du Réseau" #: ../../include/Contact.php:225 ../../include/Contact.php:237 -#: ../../include/conversation.php:788 +#: ../../include/conversation.php:789 msgid "Edit Contact" msgstr "Éditer le contact" #: ../../include/Contact.php:226 ../../include/Contact.php:237 -#: ../../include/conversation.php:789 +#: ../../include/conversation.php:790 msgid "Send PM" msgstr "Message privé" @@ -9087,86 +9085,86 @@ msgstr "publication/élément" msgid "%1$s marked %2$s's %3$s as favorite" msgstr "%1$s a marqué le %3$s de %2$s comme favori" -#: ../../include/conversation.php:594 ../../object/Item.php:218 +#: ../../include/conversation.php:595 ../../object/Item.php:218 msgid "Categories:" msgstr "Catégories:" -#: ../../include/conversation.php:595 ../../object/Item.php:219 +#: ../../include/conversation.php:596 ../../object/Item.php:219 msgid "Filed under:" msgstr "Rangé sous:" -#: ../../include/conversation.php:680 +#: ../../include/conversation.php:681 msgid "remove" msgstr "enlever" -#: ../../include/conversation.php:684 +#: ../../include/conversation.php:685 msgid "Delete Selected Items" msgstr "Supprimer les éléments sélectionnés" -#: ../../include/conversation.php:783 +#: ../../include/conversation.php:784 msgid "Follow Thread" msgstr "Suivre le fil" -#: ../../include/conversation.php:852 +#: ../../include/conversation.php:853 #, php-format msgid "%s likes this." msgstr "%s aime ça." -#: ../../include/conversation.php:852 +#: ../../include/conversation.php:853 #, php-format msgid "%s doesn't like this." msgstr "%s n'aime pas ça." -#: ../../include/conversation.php:856 +#: ../../include/conversation.php:857 #, php-format msgid "%2$d people like this." msgstr "%2$d personnes aiment ça." -#: ../../include/conversation.php:858 +#: ../../include/conversation.php:859 #, php-format msgid "%2$d people don't like this." msgstr "%2$d personnes n'aiment pas ça." -#: ../../include/conversation.php:864 +#: ../../include/conversation.php:865 msgid "and" msgstr "et" -#: ../../include/conversation.php:867 +#: ../../include/conversation.php:868 #, php-format msgid ", and %d other people" msgstr ", et %d autres personnes" -#: ../../include/conversation.php:868 +#: ../../include/conversation.php:869 #, php-format msgid "%s like this." msgstr "%s aiment ça." -#: ../../include/conversation.php:868 +#: ../../include/conversation.php:869 #, php-format msgid "%s don't like this." msgstr "%s n'aiment pas ça." -#: ../../include/conversation.php:892 ../../include/conversation.php:909 +#: ../../include/conversation.php:893 ../../include/conversation.php:910 msgid "Visible to everybody" msgstr "Visible par tout le monde" -#: ../../include/conversation.php:894 ../../include/conversation.php:911 +#: ../../include/conversation.php:895 ../../include/conversation.php:912 msgid "Please enter a video link/URL:" msgstr "Entrez un lien/URL video :" -#: ../../include/conversation.php:895 ../../include/conversation.php:912 +#: ../../include/conversation.php:896 ../../include/conversation.php:913 msgid "Please enter an audio link/URL:" msgstr "Entrez un lien/URL audio :" -#: ../../include/conversation.php:896 ../../include/conversation.php:913 +#: ../../include/conversation.php:897 ../../include/conversation.php:914 msgid "Tag term:" msgstr "Tag : " -#: ../../include/conversation.php:898 ../../include/conversation.php:915 +#: ../../include/conversation.php:899 ../../include/conversation.php:916 msgid "Where are you right now?" msgstr "Où êtes-vous présentemment?" -#: ../../include/conversation.php:977 +#: ../../include/conversation.php:978 msgid "permissions" msgstr "permissions" diff --git a/view/fr/strings.php b/view/fr/strings.php index 34d11d8b3..70059fa2f 100644 --- a/view/fr/strings.php +++ b/view/fr/strings.php @@ -255,7 +255,7 @@ $a->strings["

What next

"] = "

Ensuite

"; $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANT: Vous devez configurer [manuellement] une tâche programmée pour le 'poller'."; $a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A"; $a->strings["Time Conversion"] = "Conversion temporelle"; -$a->strings["Friendika provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica fournit ce service pour partager des événements avec d'autres réseaux et amis indépendament de leur fuseau horaire."; +$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica fournit ce service pour partager des événements avec d'autres réseaux et amis indépendament de leur fuseau horaire."; $a->strings["UTC time: %s"] = "Temps UTC : %s"; $a->strings["Current timezone: %s"] = "Zone de temps courante : %s"; $a->strings["Converted localtime: %s"] = "Temps local converti : %s"; @@ -316,7 +316,7 @@ $a->strings["Ignore"] = "Ignorer"; $a->strings["System"] = "Système"; $a->strings["Network"] = "Réseau"; $a->strings["Personal"] = "Personnel"; -$a->strings["Home"] = "Accueil"; +$a->strings["Home"] = "Profil"; $a->strings["Introductions"] = "Introductions"; $a->strings["Messages"] = "Messages"; $a->strings["Show Ignored Requests"] = "Voir les demandes ignorées"; @@ -629,7 +629,7 @@ $a->strings["Edit Your Profile"] = "Éditer votre Profil"; $a->strings["Edit your default profile to your liking. Review the settings for hiding your list of friends and hiding the profile from unknown visitors."] = "Éditez votre profil par défaut à votre convenance. Vérifiez les réglages concernant la visibilité de votre liste d'amis par les visiteurs inconnus."; $a->strings["Profile Keywords"] = "Mots-clés du profil"; $a->strings["Set some public keywords for your default profile which describe your interests. We may be able to find other people with similar interests and suggest friendships."] = "Choisissez quelques mots-clé publics pour votre profil par défaut. Ils pourront ainsi décrire vos centres d'intérêt, et nous pourrons vous proposer des contacts qui les partagent."; -$a->strings["Connecting"] = ""; +$a->strings["Connecting"] = "Connexions"; $a->strings["Facebook"] = "Facebook"; $a->strings["Authorise the Facebook Connector if you currently have a Facebook account and we will (optionally) import all your Facebook friends and conversations."] = "Activez et paramétrez le connecteur Facebook si vous avez un compte Facebook et nous pourrons (de manière facultative) importer tous vos amis et conversations Facebook."; $a->strings["If this is your own personal server, installing the Facebook addon may ease your transition to the free social web."] = "Si ceci est votre propre serveur, installer le connecteur Facebook peut adoucir votre transition vers le web social libre."; @@ -1215,7 +1215,7 @@ $a->strings["Latest photos"] = "Dernières photos"; $a->strings["Latest likes"] = "Dernières approbations"; $a->strings["event"] = "évènement"; $a->strings["No access"] = "Pas d'accès"; -$a->strings["Could not open component for editing"] = ""; +$a->strings["Could not open component for editing"] = "Échec d'ouverture de l'élément pour édition"; $a->strings["Go back to the calendar"] = "Revenir au calendrier"; $a->strings["Event data"] = "Données de l'évènement"; $a->strings["Calendar"] = "Calendrier"; @@ -1363,10 +1363,10 @@ $a->strings["dreamwidth username"] = "Nom d'utilisateur Dreamwidth"; $a->strings["dreamwidth password"] = "Mot de passe"; $a->strings["Post to dreamwidth by default"] = "Poster vers Dreamwidth par défaut"; $a->strings["Remote Permissions Settings"] = "Permissions distantes"; -$a->strings["Allow recipients of your private posts to see the other recipients of the posts"] = ""; +$a->strings["Allow recipients of your private posts to see the other recipients of the posts"] = "Autoriser les destinataires de vos messages privés a voir les autres destinataires du message"; $a->strings["Remote Permissions settings updated."] = "Permissions distantes mises-à-jour."; $a->strings["Visible to"] = "Visibilité"; -$a->strings["may only be a partial list"] = ""; +$a->strings["may only be a partial list"] = "peut être une liste partielle"; $a->strings["Global"] = "Global"; $a->strings["The posts of every user on this server show the post recipients"] = "Les publications de tous les utilisateurs de ce serveur afficheront leurs destinataires"; $a->strings["Individual"] = "Individuel"; @@ -1631,7 +1631,7 @@ $a->strings["Last tweets"] = "Derniers tweets"; $a->strings["Alignment"] = "Alignement"; $a->strings["Left"] = "Gauche"; $a->strings["Center"] = "Centre"; -$a->strings["Posts font size"] = ""; +$a->strings["Posts font size"] = "Taille de texte des messages"; $a->strings["Textareas font size"] = ""; $a->strings["Set colour scheme"] = "Choisir le schéma de couleurs"; $a->strings["j F, Y"] = "j F, Y"; From 9086641fd1d2375123f72fc9147e7f7904090e68 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Thu, 1 Nov 2012 13:12:54 +0100 Subject: [PATCH 13/41] ES: update to the strings --- view/es/messages.po | 320 ++++++++++++++++++++++---------------------- view/es/strings.php | 6 +- 2 files changed, 162 insertions(+), 164 deletions(-) diff --git a/view/es/messages.po b/view/es/messages.po index 025a087d5..a6ecbbdfe 100644 --- a/view/es/messages.po +++ b/view/es/messages.po @@ -10,13 +10,14 @@ # Manuel Pérez , 2011-2012. # Manuel Pérez Monís, 2011. # Mike Macgirvin, 2010. +# , 2012. msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n" -"POT-Creation-Date: 2012-10-18 10:00-0700\n" -"PO-Revision-Date: 2012-10-15 08:33+0000\n" -"Last-Translator: Carlos Solís \n" +"POT-Creation-Date: 2012-10-30 10:00-0700\n" +"PO-Revision-Date: 2012-11-01 12:11+0000\n" +"Last-Translator: bavatar \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/friendica/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -65,7 +66,7 @@ msgstr "Error al actualizar el Contacto." #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510 #: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:159 #: ../../addon/fbpost/fbpost.php:165 -#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3913 +#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3914 #: ../../index.php:319 ../../addon.old/facebook/facebook.php:510 #: ../../addon.old/facebook/facebook.php:516 #: ../../addon.old/fbpost/fbpost.php:159 ../../addon.old/fbpost/fbpost.php:165 @@ -185,7 +186,7 @@ msgstr "Nueva foto de esta dirección" #: ../../addon/irc/irc.php:55 ../../addon/fromapp/fromapp.php:77 #: ../../addon/blogger/blogger.php:102 ../../addon/posterous/posterous.php:103 #: ../../view/theme/cleanzero/config.php:80 -#: ../../view/theme/diabook/theme.php:642 +#: ../../view/theme/diabook/theme.php:599 #: ../../view/theme/diabook/config.php:152 #: ../../view/theme/quattro/config.php:64 ../../view/theme/dispy/config.php:70 #: ../../object/Item.php:558 ../../addon.old/fromgplus/fromgplus.php:40 @@ -288,11 +289,11 @@ msgstr "l, F j" msgid "Edit event" msgstr "Editar evento" -#: ../../mod/events.php:323 ../../include/text.php:1187 +#: ../../mod/events.php:323 ../../include/text.php:1185 msgid "link to source" msgstr "Enlace al original" -#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:91 +#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:90 #: ../../include/nav.php:52 ../../boot.php:1701 msgid "Events" msgstr "Eventos" @@ -366,7 +367,7 @@ msgstr "Comparte este evento" #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:142 #: ../../mod/dfrn_request.php:847 ../../mod/settings.php:544 #: ../../mod/settings.php:570 ../../addon/js_upload/js_upload.php:45 -#: ../../include/conversation.php:995 +#: ../../include/conversation.php:996 #: ../../addon.old/js_upload/js_upload.php:45 msgid "Cancel" msgstr "Cancelar" @@ -444,7 +445,7 @@ msgstr "Álbum de Fotos" #: ../../mod/photos.php:1095 ../../mod/photos.php:1110 #: ../../mod/photos.php:1562 ../../mod/photos.php:1574 #: ../../addon/communityhome/communityhome.php:110 -#: ../../view/theme/diabook/theme.php:492 +#: ../../view/theme/diabook/theme.php:485 #: ../../addon.old/communityhome/communityhome.php:110 msgid "Contact Photos" msgstr "Foto del contacto" @@ -467,7 +468,7 @@ msgstr "Información del contacto no disponible" #: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296 #: ../../mod/profile_photo.php:305 #: ../../addon/communityhome/communityhome.php:111 -#: ../../view/theme/diabook/theme.php:493 ../../include/user.php:324 +#: ../../view/theme/diabook/theme.php:486 ../../include/user.php:324 #: ../../include/user.php:331 ../../include/user.php:338 #: ../../addon.old/communityhome/communityhome.php:111 msgid "Profile Photos" @@ -491,7 +492,7 @@ msgstr "ha sido etiquetado en" #: ../../mod/photos.php:606 ../../mod/like.php:145 ../../mod/subthread.php:87 #: ../../mod/tagger.php:62 ../../addon/communityhome/communityhome.php:163 -#: ../../view/theme/diabook/theme.php:464 ../../include/text.php:1439 +#: ../../view/theme/diabook/theme.php:457 ../../include/text.php:1437 #: ../../include/diaspora.php:1835 ../../include/conversation.php:125 #: ../../include/conversation.php:253 #: ../../addon.old/communityhome/communityhome.php:163 @@ -653,15 +654,15 @@ msgstr "Me gusta esto (cambiar)" msgid "I don't like this (toggle)" msgstr "No me gusta esto (cambiar)" -#: ../../mod/photos.php:1386 ../../include/conversation.php:956 +#: ../../mod/photos.php:1386 ../../include/conversation.php:957 msgid "Share" msgstr "Compartir" #: ../../mod/photos.php:1387 ../../mod/editpost.php:118 #: ../../mod/content.php:482 ../../mod/content.php:845 #: ../../mod/wallmessage.php:152 ../../mod/message.php:293 -#: ../../mod/message.php:481 ../../include/conversation.php:619 -#: ../../include/conversation.php:975 ../../object/Item.php:258 +#: ../../mod/message.php:481 ../../include/conversation.php:620 +#: ../../include/conversation.php:976 ../../object/Item.php:258 msgid "Please wait" msgstr "Por favor, espera" @@ -679,7 +680,7 @@ msgstr "Comentar" #: ../../mod/photos.php:1407 ../../mod/photos.php:1450 #: ../../mod/photos.php:1521 ../../mod/editpost.php:139 -#: ../../mod/content.php:702 ../../include/conversation.php:993 +#: ../../mod/content.php:702 ../../include/conversation.php:994 #: ../../object/Item.php:567 msgid "Preview" msgstr "Vista previa" @@ -687,7 +688,7 @@ msgstr "Vista previa" #: ../../mod/photos.php:1489 ../../mod/content.php:439 #: ../../mod/content.php:723 ../../mod/settings.php:606 #: ../../mod/group.php:168 ../../mod/admin.php:696 -#: ../../include/conversation.php:564 ../../object/Item.php:117 +#: ../../include/conversation.php:565 ../../object/Item.php:117 msgid "Delete" msgstr "Eliminar" @@ -703,7 +704,7 @@ msgstr "Fotos recientes" msgid "Not available." msgstr "No disponible" -#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:93 +#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:92 #: ../../include/nav.php:101 msgid "Community" msgstr "Comunidad" @@ -753,7 +754,7 @@ msgstr "Elemento no encontrado" msgid "Edit post" msgstr "Editar publicación" -#: ../../mod/editpost.php:88 ../../include/conversation.php:942 +#: ../../mod/editpost.php:88 ../../include/conversation.php:943 msgid "Post to Email" msgstr "Publicar mediante correo electrónico" @@ -764,85 +765,85 @@ msgstr "Editar" #: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150 #: ../../mod/message.php:291 ../../mod/message.php:478 -#: ../../include/conversation.php:957 +#: ../../include/conversation.php:958 msgid "Upload photo" msgstr "Subir foto" -#: ../../mod/editpost.php:105 ../../include/conversation.php:958 +#: ../../mod/editpost.php:105 ../../include/conversation.php:959 msgid "upload photo" msgstr "subir imagen" -#: ../../mod/editpost.php:106 ../../include/conversation.php:959 +#: ../../mod/editpost.php:106 ../../include/conversation.php:960 msgid "Attach file" msgstr "Adjuntar archivo" -#: ../../mod/editpost.php:107 ../../include/conversation.php:960 +#: ../../mod/editpost.php:107 ../../include/conversation.php:961 msgid "attach file" msgstr "adjuntar archivo" #: ../../mod/editpost.php:108 ../../mod/wallmessage.php:151 #: ../../mod/message.php:292 ../../mod/message.php:479 -#: ../../include/conversation.php:961 +#: ../../include/conversation.php:962 msgid "Insert web link" msgstr "Insertar enlace" -#: ../../mod/editpost.php:109 ../../include/conversation.php:962 +#: ../../mod/editpost.php:109 ../../include/conversation.php:963 msgid "web link" msgstr "enlace web" -#: ../../mod/editpost.php:110 ../../include/conversation.php:963 +#: ../../mod/editpost.php:110 ../../include/conversation.php:964 msgid "Insert video link" msgstr "Insertar enlace del vídeo" -#: ../../mod/editpost.php:111 ../../include/conversation.php:964 +#: ../../mod/editpost.php:111 ../../include/conversation.php:965 msgid "video link" msgstr "enlace de video" -#: ../../mod/editpost.php:112 ../../include/conversation.php:965 +#: ../../mod/editpost.php:112 ../../include/conversation.php:966 msgid "Insert audio link" msgstr "Insertar vínculo del audio" -#: ../../mod/editpost.php:113 ../../include/conversation.php:966 +#: ../../mod/editpost.php:113 ../../include/conversation.php:967 msgid "audio link" msgstr "enlace de audio" -#: ../../mod/editpost.php:114 ../../include/conversation.php:967 +#: ../../mod/editpost.php:114 ../../include/conversation.php:968 msgid "Set your location" msgstr "Configurar tu localización" -#: ../../mod/editpost.php:115 ../../include/conversation.php:968 +#: ../../mod/editpost.php:115 ../../include/conversation.php:969 msgid "set location" msgstr "establecer tu ubicación" -#: ../../mod/editpost.php:116 ../../include/conversation.php:969 +#: ../../mod/editpost.php:116 ../../include/conversation.php:970 msgid "Clear browser location" msgstr "Borrar la localización del navegador" -#: ../../mod/editpost.php:117 ../../include/conversation.php:970 +#: ../../mod/editpost.php:117 ../../include/conversation.php:971 msgid "clear location" msgstr "limpiar la localización" -#: ../../mod/editpost.php:119 ../../include/conversation.php:976 +#: ../../mod/editpost.php:119 ../../include/conversation.php:977 msgid "Permission settings" msgstr "Configuración de permisos" -#: ../../mod/editpost.php:127 ../../include/conversation.php:985 +#: ../../mod/editpost.php:127 ../../include/conversation.php:986 msgid "CC: email addresses" msgstr "CC: dirección de correo electrónico" -#: ../../mod/editpost.php:128 ../../include/conversation.php:986 +#: ../../mod/editpost.php:128 ../../include/conversation.php:987 msgid "Public post" msgstr "Publicación pública" -#: ../../mod/editpost.php:131 ../../include/conversation.php:972 +#: ../../mod/editpost.php:131 ../../include/conversation.php:973 msgid "Set title" msgstr "Establecer el título" -#: ../../mod/editpost.php:133 ../../include/conversation.php:974 +#: ../../mod/editpost.php:133 ../../include/conversation.php:975 msgid "Categories (comma-separated list)" msgstr "Categorías (lista separada por comas)" -#: ../../mod/editpost.php:134 ../../include/conversation.php:988 +#: ../../mod/editpost.php:134 ../../include/conversation.php:989 msgid "Example: bob@example.com, mary@example.com" msgstr "Ejemplo: juan@ejemplo.com, sofia@ejemplo.com" @@ -963,7 +964,7 @@ msgstr "Por favor, confirma tu solicitud de presentación/conexión con %s." msgid "Confirm" msgstr "Confirmar" -#: ../../mod/dfrn_request.php:715 ../../include/items.php:3292 +#: ../../mod/dfrn_request.php:715 ../../include/items.php:3293 msgid "[Name Withheld]" msgstr "[Nombre oculto]" @@ -1300,9 +1301,9 @@ msgstr "Conversión horária" #: ../../mod/localtime.php:26 msgid "" -"Friendika provides this service for sharing events with other networks and " +"Friendica provides this service for sharing events with other networks and " "friends in unknown timezones." -msgstr "Friendica ofrece este servicio para compartir eventos con otras redes y amigos en zonas horarias desconocidas." +msgstr "" #: ../../mod/localtime.php:30 #, php-format @@ -1386,24 +1387,24 @@ msgid "Group: " msgstr "Grupo: " #: ../../mod/content.php:438 ../../mod/content.php:722 -#: ../../include/conversation.php:563 ../../object/Item.php:116 +#: ../../include/conversation.php:564 ../../object/Item.php:116 msgid "Select" msgstr "Seleccionar" #: ../../mod/content.php:455 ../../mod/content.php:815 -#: ../../mod/content.php:816 ../../include/conversation.php:582 +#: ../../mod/content.php:816 ../../include/conversation.php:583 #: ../../object/Item.php:227 ../../object/Item.php:228 #, php-format msgid "View %s's profile @ %s" msgstr "Ver perfil de %s @ %s" #: ../../mod/content.php:465 ../../mod/content.php:827 -#: ../../include/conversation.php:602 ../../object/Item.php:240 +#: ../../include/conversation.php:603 ../../object/Item.php:240 #, php-format msgid "%s from %s" msgstr "%s de %s" -#: ../../mod/content.php:480 ../../include/conversation.php:617 +#: ../../mod/content.php:480 ../../include/conversation.php:618 msgid "View in context" msgstr "Verlo en contexto" @@ -1414,7 +1415,7 @@ msgid_plural "%d comments" msgstr[0] "%d comentario" msgstr[1] "%d comentarios" -#: ../../mod/content.php:588 ../../include/text.php:1443 +#: ../../mod/content.php:588 ../../include/text.php:1441 #: ../../object/Item.php:279 ../../object/Item.php:292 msgid "comment" msgid_plural "comments" @@ -1546,7 +1547,7 @@ msgstr "Red" msgid "Personal" msgstr "Personal" -#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:87 +#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:86 #: ../../include/nav.php:77 ../../include/nav.php:115 msgid "Home" msgstr "Inicio" @@ -1991,7 +1992,7 @@ msgstr "eres fan de" msgid "Edit contact" msgstr "Modificar contacto" -#: ../../mod/contacts.php:571 ../../view/theme/diabook/theme.php:89 +#: ../../mod/contacts.php:571 ../../view/theme/diabook/theme.php:88 #: ../../include/nav.php:139 msgid "Contacts" msgstr "Contactos" @@ -2028,7 +2029,7 @@ msgstr "Contraseña restablecida enviada a %s" #: ../../addon/facebook/facebook.php:702 #: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661 #: ../../addon/public_server/public_server.php:62 -#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3301 +#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3302 #: ../../boot.php:799 ../../addon.old/facebook/facebook.php:702 #: ../../addon.old/facebook/facebook.php:1200 #: ../../addon.old/fbpost/fbpost.php:661 @@ -2093,7 +2094,7 @@ msgstr "Configuración de tu cuenta" #: ../../mod/settings.php:35 msgid "Display settings" -msgstr "Mostrar configuración" +msgstr "Configuración Tema/Visualización" #: ../../mod/settings.php:41 msgid "Connector settings" @@ -2118,9 +2119,8 @@ msgstr "Eliminar cuenta" #: ../../mod/settings.php:69 ../../mod/newmember.php:22 #: ../../mod/admin.php:785 ../../mod/admin.php:990 #: ../../addon/dav/friendica/layout.fnk.php:225 -#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:537 -#: ../../view/theme/diabook/theme.php:658 ../../include/nav.php:137 -#: ../../addon.old/dav/friendica/layout.fnk.php:225 +#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:614 +#: ../../include/nav.php:137 ../../addon.old/dav/friendica/layout.fnk.php:225 #: ../../addon.old/mathjax/mathjax.php:36 msgid "Settings" msgstr "Configuración" @@ -2346,7 +2346,7 @@ msgstr "No hay tema especial para dispositivos móviles" #: ../../mod/settings.php:767 msgid "Display Settings" -msgstr "Mostrar Configuración" +msgstr "Configuración Tema/Visualización" #: ../../mod/settings.php:773 ../../mod/settings.php:784 msgid "Display Theme:" @@ -2784,7 +2784,7 @@ msgstr "Sin receptor." #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131 #: ../../mod/message.php:242 ../../mod/message.php:250 -#: ../../include/conversation.php:893 ../../include/conversation.php:910 +#: ../../include/conversation.php:894 ../../include/conversation.php:911 msgid "Please enter a link URL:" msgstr "Introduce la dirección del enlace:" @@ -2865,7 +2865,7 @@ msgid "" msgstr "Revisa las otras configuraciones, especialmente la configuración de privacidad. Un listado de directorio sin publicar es como tener un número de teléfono sin publicar. Normalmente querrás publicar tu listado, a menos que tus amigos y amigos potenciales sepan cómo ponerse en contacto contigo." #: ../../mod/newmember.php:32 ../../mod/profperm.php:103 -#: ../../view/theme/diabook/theme.php:88 ../../include/profile_advanced.php:7 +#: ../../view/theme/diabook/theme.php:87 ../../include/profile_advanced.php:7 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50 #: ../../boot.php:1684 msgid "Profile" @@ -3190,8 +3190,8 @@ msgstr "Buscar personas" #: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1598 #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 -#: ../../view/theme/diabook/theme.php:459 -#: ../../view/theme/diabook/theme.php:468 ../../include/diaspora.php:1835 +#: ../../view/theme/diabook/theme.php:452 +#: ../../view/theme/diabook/theme.php:461 ../../include/diaspora.php:1835 #: ../../include/conversation.php:120 ../../include/conversation.php:129 #: ../../include/conversation.php:248 ../../include/conversation.php:257 #: ../../addon.old/facebook/facebook.php:1598 @@ -3202,7 +3202,7 @@ msgstr "estado" #: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602 #: ../../addon/communityhome/communityhome.php:172 -#: ../../view/theme/diabook/theme.php:473 ../../include/diaspora.php:1851 +#: ../../view/theme/diabook/theme.php:466 ../../include/diaspora.php:1851 #: ../../include/conversation.php:136 #: ../../addon.old/facebook/facebook.php:1602 #: ../../addon.old/communityhome/communityhome.php:172 @@ -3217,7 +3217,7 @@ msgstr "A %1$s no le gusta %3$s de %2$s" #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159 #: ../../mod/admin.php:734 ../../mod/admin.php:933 ../../mod/display.php:29 -#: ../../mod/display.php:145 ../../include/items.php:3779 +#: ../../mod/display.php:145 ../../include/items.php:3780 msgid "Item not found." msgstr "Elemento no encontrado." @@ -3225,7 +3225,7 @@ msgstr "Elemento no encontrado." msgid "Access denied." msgstr "Acceso denegado." -#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:90 +#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:89 #: ../../include/nav.php:51 ../../boot.php:1691 msgid "Photos" msgstr "Fotografías" @@ -4525,8 +4525,8 @@ msgstr "Visible para todos" msgid "Edit visibility" msgstr "Editar visibilidad" -#: ../../mod/filer.php:29 ../../include/conversation.php:897 -#: ../../include/conversation.php:914 +#: ../../mod/filer.php:29 ../../include/conversation.php:898 +#: ../../include/conversation.php:915 msgid "Save to Folder:" msgstr "Guardar en directorio:" @@ -4618,7 +4618,7 @@ msgstr "Fuente (formato Diaspora): " msgid "diaspora2bb: " msgstr "diaspora2bb: " -#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:520 +#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:513 #: ../../include/contact_widgets.php:34 msgid "Friend Suggestions" msgstr "Sugerencias de amigos" @@ -4633,7 +4633,7 @@ msgstr "No hay sugerencias disponibles. Si el sitio web es nuevo inténtalo de n msgid "Ignore/Hide" msgstr "Ignorar/Ocultar" -#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:518 +#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:511 msgid "Global Directory" msgstr "Directorio global" @@ -5570,7 +5570,7 @@ msgid "Latest likes" msgstr "Últimos me gusta" #: ../../addon/communityhome/communityhome.php:155 -#: ../../view/theme/diabook/theme.php:456 ../../include/text.php:1437 +#: ../../view/theme/diabook/theme.php:449 ../../include/text.php:1435 #: ../../include/conversation.php:117 ../../include/conversation.php:245 #: ../../addon.old/communityhome/communityhome.php:155 msgid "event" @@ -5724,7 +5724,7 @@ msgstr "Días" #: ../../addon/dav/common/wdcal_edit.inc.php:254 #: ../../addon/dav/common/wdcal_edit.inc.php:270 #: ../../addon/dav/common/wdcal_edit.inc.php:293 -#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:917 +#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:915 #: ../../addon.old/dav/common/wdcal_edit.inc.php:231 #: ../../addon.old/dav/common/wdcal_edit.inc.php:254 #: ../../addon.old/dav/common/wdcal_edit.inc.php:270 @@ -5735,7 +5735,7 @@ msgstr "Domingo" #: ../../addon/dav/common/wdcal_edit.inc.php:235 #: ../../addon/dav/common/wdcal_edit.inc.php:274 -#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:917 +#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:915 #: ../../addon.old/dav/common/wdcal_edit.inc.php:235 #: ../../addon.old/dav/common/wdcal_edit.inc.php:274 #: ../../addon.old/dav/common/wdcal_edit.inc.php:308 @@ -5743,35 +5743,35 @@ msgid "Monday" msgstr "Lunes" #: ../../addon/dav/common/wdcal_edit.inc.php:238 -#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:917 +#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:915 #: ../../addon.old/dav/common/wdcal_edit.inc.php:238 #: ../../addon.old/dav/common/wdcal_edit.inc.php:277 msgid "Tuesday" msgstr "Martes" #: ../../addon/dav/common/wdcal_edit.inc.php:241 -#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:917 +#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:915 #: ../../addon.old/dav/common/wdcal_edit.inc.php:241 #: ../../addon.old/dav/common/wdcal_edit.inc.php:280 msgid "Wednesday" msgstr "Miércoles" #: ../../addon/dav/common/wdcal_edit.inc.php:244 -#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:917 +#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:915 #: ../../addon.old/dav/common/wdcal_edit.inc.php:244 #: ../../addon.old/dav/common/wdcal_edit.inc.php:283 msgid "Thursday" msgstr "Jueves" #: ../../addon/dav/common/wdcal_edit.inc.php:247 -#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:917 +#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:915 #: ../../addon.old/dav/common/wdcal_edit.inc.php:247 #: ../../addon.old/dav/common/wdcal_edit.inc.php:286 msgid "Friday" msgstr "Viernes" #: ../../addon/dav/common/wdcal_edit.inc.php:250 -#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:917 +#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:915 #: ../../addon.old/dav/common/wdcal_edit.inc.php:250 #: ../../addon.old/dav/common/wdcal_edit.inc.php:289 msgid "Saturday" @@ -7584,137 +7584,135 @@ msgstr "Establecer el ancho para el tema" msgid "Color scheme" msgstr "Esquema de color" -#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:49 +#: ../../view/theme/diabook/theme.php:86 ../../include/nav.php:49 #: ../../include/nav.php:115 msgid "Your posts and conversations" msgstr "Tus publicaciones y conversaciones" -#: ../../view/theme/diabook/theme.php:88 ../../include/nav.php:50 +#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:50 msgid "Your profile page" msgstr "Tu página de perfil" -#: ../../view/theme/diabook/theme.php:89 +#: ../../view/theme/diabook/theme.php:88 msgid "Your contacts" msgstr "Tus contactos" -#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:51 +#: ../../view/theme/diabook/theme.php:89 ../../include/nav.php:51 msgid "Your photos" msgstr "Tus fotos" -#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:52 +#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:52 msgid "Your events" msgstr "Tus eventos" -#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53 +#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:53 msgid "Personal notes" msgstr "Notas personales" -#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53 +#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:53 msgid "Your personal photos" msgstr "Tus fotos personales" -#: ../../view/theme/diabook/theme.php:94 -#: ../../view/theme/diabook/theme.php:537 -#: ../../view/theme/diabook/theme.php:632 +#: ../../view/theme/diabook/theme.php:93 #: ../../view/theme/diabook/config.php:163 msgid "Community Pages" msgstr "Páginas de Comunidad" -#: ../../view/theme/diabook/theme.php:384 -#: ../../view/theme/diabook/theme.php:634 +#: ../../view/theme/diabook/theme.php:377 +#: ../../view/theme/diabook/theme.php:591 #: ../../view/theme/diabook/config.php:165 msgid "Community Profiles" msgstr "Perfiles de la Comunidad" -#: ../../view/theme/diabook/theme.php:405 -#: ../../view/theme/diabook/theme.php:639 +#: ../../view/theme/diabook/theme.php:398 +#: ../../view/theme/diabook/theme.php:596 #: ../../view/theme/diabook/config.php:170 msgid "Last users" msgstr "Últimos usuarios" -#: ../../view/theme/diabook/theme.php:434 -#: ../../view/theme/diabook/theme.php:641 +#: ../../view/theme/diabook/theme.php:427 +#: ../../view/theme/diabook/theme.php:598 #: ../../view/theme/diabook/config.php:172 msgid "Last likes" msgstr "Últimos \"me gusta\"" -#: ../../view/theme/diabook/theme.php:479 -#: ../../view/theme/diabook/theme.php:640 +#: ../../view/theme/diabook/theme.php:472 +#: ../../view/theme/diabook/theme.php:597 #: ../../view/theme/diabook/config.php:171 msgid "Last photos" msgstr "Últimas fotos" -#: ../../view/theme/diabook/theme.php:516 -#: ../../view/theme/diabook/theme.php:637 +#: ../../view/theme/diabook/theme.php:509 +#: ../../view/theme/diabook/theme.php:594 #: ../../view/theme/diabook/config.php:168 msgid "Find Friends" msgstr "Buscar amigos" -#: ../../view/theme/diabook/theme.php:517 +#: ../../view/theme/diabook/theme.php:510 msgid "Local Directory" msgstr "Directorio local" -#: ../../view/theme/diabook/theme.php:519 ../../include/contact_widgets.php:35 +#: ../../view/theme/diabook/theme.php:512 ../../include/contact_widgets.php:35 msgid "Similar Interests" msgstr "Intereses similares" -#: ../../view/theme/diabook/theme.php:521 ../../include/contact_widgets.php:37 +#: ../../view/theme/diabook/theme.php:514 ../../include/contact_widgets.php:37 msgid "Invite Friends" msgstr "Invitar amigos" -#: ../../view/theme/diabook/theme.php:572 -#: ../../view/theme/diabook/theme.php:633 +#: ../../view/theme/diabook/theme.php:531 +#: ../../view/theme/diabook/theme.php:590 #: ../../view/theme/diabook/config.php:164 msgid "Earth Layers" msgstr "Minimapa" -#: ../../view/theme/diabook/theme.php:577 +#: ../../view/theme/diabook/theme.php:536 msgid "Set zoomfactor for Earth Layers" msgstr "Configurar zoom en Minimapa" -#: ../../view/theme/diabook/theme.php:578 +#: ../../view/theme/diabook/theme.php:537 #: ../../view/theme/diabook/config.php:161 msgid "Set longitude (X) for Earth Layers" msgstr "Configurar longitud (X) en Minimapa" -#: ../../view/theme/diabook/theme.php:579 +#: ../../view/theme/diabook/theme.php:538 #: ../../view/theme/diabook/config.php:162 msgid "Set latitude (Y) for Earth Layers" msgstr "Configurar latitud (Y) en Minimapa" +#: ../../view/theme/diabook/theme.php:551 #: ../../view/theme/diabook/theme.php:592 -#: ../../view/theme/diabook/theme.php:635 #: ../../view/theme/diabook/config.php:166 msgid "Help or @NewHere ?" msgstr "¿Ayuda o @NuevoAquí?" -#: ../../view/theme/diabook/theme.php:599 -#: ../../view/theme/diabook/theme.php:636 +#: ../../view/theme/diabook/theme.php:558 +#: ../../view/theme/diabook/theme.php:593 #: ../../view/theme/diabook/config.php:167 msgid "Connect Services" msgstr "Servicios conectados" -#: ../../view/theme/diabook/theme.php:606 -#: ../../view/theme/diabook/theme.php:638 +#: ../../view/theme/diabook/theme.php:565 +#: ../../view/theme/diabook/theme.php:595 msgid "Last Tweets" msgstr "Últimos tweets" -#: ../../view/theme/diabook/theme.php:609 +#: ../../view/theme/diabook/theme.php:568 #: ../../view/theme/diabook/config.php:159 msgid "Set twitter search term" msgstr "Establecer término de búsqueda en Twitter" -#: ../../view/theme/diabook/theme.php:629 +#: ../../view/theme/diabook/theme.php:587 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:288 msgid "don't show" msgstr "no mostrar" -#: ../../view/theme/diabook/theme.php:629 +#: ../../view/theme/diabook/theme.php:587 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:287 msgid "show" msgstr "mostrar" -#: ../../view/theme/diabook/theme.php:630 +#: ../../view/theme/diabook/theme.php:588 msgid "Show/hide boxes at right-hand column:" msgstr "Mostrar/Ocultar casillas en la columna derecha:" @@ -8300,79 +8298,79 @@ msgstr "relajado" msgid "surprised" msgstr "sorprendido" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "January" msgstr "Enero" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "February" msgstr "Febrero" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "March" msgstr "Marzo" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "April" msgstr "Abril" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "May" msgstr "Mayo" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "June" msgstr "Junio" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "July" msgstr "Julio" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "August" msgstr "Agosto" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "September" msgstr "Septiembre" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "October" msgstr "Octubre" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "November" msgstr "Noviembre" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "December" msgstr "Diciembre" -#: ../../include/text.php:1007 +#: ../../include/text.php:1005 msgid "bytes" msgstr "bytes" -#: ../../include/text.php:1034 ../../include/text.php:1046 +#: ../../include/text.php:1032 ../../include/text.php:1044 msgid "Click to open/close" msgstr "Pulsa para abrir/cerrar" -#: ../../include/text.php:1219 ../../include/user.php:236 +#: ../../include/text.php:1217 ../../include/user.php:236 msgid "default" msgstr "predeterminado" -#: ../../include/text.php:1231 +#: ../../include/text.php:1229 msgid "Select an alternate language" msgstr "Elige otro idioma" -#: ../../include/text.php:1441 +#: ../../include/text.php:1439 msgid "activity" msgstr "Actividad" -#: ../../include/text.php:1444 +#: ../../include/text.php:1442 msgid "post" msgstr "Publicación" -#: ../../include/text.php:1599 +#: ../../include/text.php:1597 msgid "Item filed" msgstr "Elemento archivado" @@ -8665,17 +8663,17 @@ msgstr "segundos" msgid "%1$d %2$s ago" msgstr "hace %1$d %2$s" -#: ../../include/datetime.php:472 ../../include/items.php:1688 +#: ../../include/datetime.php:472 ../../include/items.php:1689 #, php-format msgid "%s's birthday" msgstr "Cumpleaños de %s" -#: ../../include/datetime.php:473 ../../include/items.php:1689 +#: ../../include/datetime.php:473 ../../include/items.php:1690 #, php-format msgid "Happy Birthday %s" msgstr "Feliz cumpleaños %s" -#: ../../include/onepoll.php:409 +#: ../../include/onepoll.php:414 msgid "From: " msgstr "De: " @@ -8945,15 +8943,15 @@ msgstr "No ha sido posible recibir la información del contacto." msgid "following" msgstr "siguiendo" -#: ../../include/items.php:3299 +#: ../../include/items.php:3300 msgid "A new person is sharing with you at " msgstr "Una nueva persona está compartiendo contigo en " -#: ../../include/items.php:3299 +#: ../../include/items.php:3300 msgid "You have a new follower at " msgstr "Tienes un nuevo seguidor en " -#: ../../include/items.php:3980 +#: ../../include/items.php:3981 msgid "Archives" msgstr "Archivos" @@ -9047,34 +9045,34 @@ msgstr "La ficha de seguridad no es correcta. Seguramente haya ocurrido por habe msgid "stopped following" msgstr "dejó de seguir" -#: ../../include/Contact.php:220 ../../include/conversation.php:790 +#: ../../include/Contact.php:220 ../../include/conversation.php:791 msgid "Poke" msgstr "Toque" -#: ../../include/Contact.php:221 ../../include/conversation.php:784 +#: ../../include/Contact.php:221 ../../include/conversation.php:785 msgid "View Status" msgstr "Ver estado" -#: ../../include/Contact.php:222 ../../include/conversation.php:785 +#: ../../include/Contact.php:222 ../../include/conversation.php:786 msgid "View Profile" msgstr "Ver perfil" -#: ../../include/Contact.php:223 ../../include/conversation.php:786 +#: ../../include/Contact.php:223 ../../include/conversation.php:787 msgid "View Photos" msgstr "Ver fotos" #: ../../include/Contact.php:224 ../../include/Contact.php:237 -#: ../../include/conversation.php:787 +#: ../../include/conversation.php:788 msgid "Network Posts" msgstr "Publicaciones en la red" #: ../../include/Contact.php:225 ../../include/Contact.php:237 -#: ../../include/conversation.php:788 +#: ../../include/conversation.php:789 msgid "Edit Contact" msgstr "Editar contacto" #: ../../include/Contact.php:226 ../../include/Contact.php:237 -#: ../../include/conversation.php:789 +#: ../../include/conversation.php:790 msgid "Send PM" msgstr "Enviar mensaje privado" @@ -9092,86 +9090,86 @@ msgstr "publicación/tema" msgid "%1$s marked %2$s's %3$s as favorite" msgstr "%1$s ha marcado %3$s de %2$s como Favorito" -#: ../../include/conversation.php:594 ../../object/Item.php:218 +#: ../../include/conversation.php:595 ../../object/Item.php:218 msgid "Categories:" msgstr "" -#: ../../include/conversation.php:595 ../../object/Item.php:219 +#: ../../include/conversation.php:596 ../../object/Item.php:219 msgid "Filed under:" msgstr "" -#: ../../include/conversation.php:680 +#: ../../include/conversation.php:681 msgid "remove" msgstr "eliminar" -#: ../../include/conversation.php:684 +#: ../../include/conversation.php:685 msgid "Delete Selected Items" msgstr "Eliminar el elemento seleccionado" -#: ../../include/conversation.php:783 +#: ../../include/conversation.php:784 msgid "Follow Thread" msgstr "" -#: ../../include/conversation.php:852 +#: ../../include/conversation.php:853 #, php-format msgid "%s likes this." msgstr "A %s le gusta esto." -#: ../../include/conversation.php:852 +#: ../../include/conversation.php:853 #, php-format msgid "%s doesn't like this." msgstr "A %s no le gusta esto." -#: ../../include/conversation.php:856 +#: ../../include/conversation.php:857 #, php-format msgid "%2$d people like this." msgstr "Le gusta a %2$d personas." -#: ../../include/conversation.php:858 +#: ../../include/conversation.php:859 #, php-format msgid "%2$d people don't like this." msgstr "No le gusta a %2$d personas." -#: ../../include/conversation.php:864 +#: ../../include/conversation.php:865 msgid "and" msgstr "y" -#: ../../include/conversation.php:867 +#: ../../include/conversation.php:868 #, php-format msgid ", and %d other people" msgstr " y a otras %d personas" -#: ../../include/conversation.php:868 +#: ../../include/conversation.php:869 #, php-format msgid "%s like this." msgstr "Le gusta a %s." -#: ../../include/conversation.php:868 +#: ../../include/conversation.php:869 #, php-format msgid "%s don't like this." msgstr "No le gusta a %s." -#: ../../include/conversation.php:892 ../../include/conversation.php:909 +#: ../../include/conversation.php:893 ../../include/conversation.php:910 msgid "Visible to everybody" msgstr "Visible para cualquiera" -#: ../../include/conversation.php:894 ../../include/conversation.php:911 +#: ../../include/conversation.php:895 ../../include/conversation.php:912 msgid "Please enter a video link/URL:" msgstr "Por favor, introduce la URL/enlace del vídeo:" -#: ../../include/conversation.php:895 ../../include/conversation.php:912 +#: ../../include/conversation.php:896 ../../include/conversation.php:913 msgid "Please enter an audio link/URL:" msgstr "Por favor, introduce la URL/enlace del audio:" -#: ../../include/conversation.php:896 ../../include/conversation.php:913 +#: ../../include/conversation.php:897 ../../include/conversation.php:914 msgid "Tag term:" msgstr "Etiquetar:" -#: ../../include/conversation.php:898 ../../include/conversation.php:915 +#: ../../include/conversation.php:899 ../../include/conversation.php:916 msgid "Where are you right now?" msgstr "¿Dónde estás ahora?" -#: ../../include/conversation.php:977 +#: ../../include/conversation.php:978 msgid "permissions" msgstr "permisos" diff --git a/view/es/strings.php b/view/es/strings.php index a476bfe05..d001a2772 100644 --- a/view/es/strings.php +++ b/view/es/strings.php @@ -255,7 +255,7 @@ $a->strings["

What next

"] = "

¿Ahora qué?

"; $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANTE: Tendrás que configurar [manualmente] una tarea programada para el sondeo"; $a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A"; $a->strings["Time Conversion"] = "Conversión horária"; -$a->strings["Friendika provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica ofrece este servicio para compartir eventos con otras redes y amigos en zonas horarias desconocidas."; +$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = ""; $a->strings["UTC time: %s"] = "Tiempo UTC: %s"; $a->strings["Current timezone: %s"] = "Zona horaria actual: %s"; $a->strings["Converted localtime: %s"] = "Zona horaria local convertida: %s"; @@ -443,7 +443,7 @@ $a->strings["Enter your email address and submit to have your password reset. Th $a->strings["Nickname or Email: "] = "Apodo o Correo electrónico: "; $a->strings["Reset"] = "Restablecer"; $a->strings["Account settings"] = "Configuración de tu cuenta"; -$a->strings["Display settings"] = "Mostrar configuración"; +$a->strings["Display settings"] = "Configuración Tema/Visualización"; $a->strings["Connector settings"] = "Configuración del conector"; $a->strings["Plugin settings"] = "Configuración de los módulos"; $a->strings["Connected apps"] = "Aplicaciones conectadas"; @@ -499,7 +499,7 @@ $a->strings["Mark as seen"] = "Marcar como leído"; $a->strings["Move to folder"] = "Mover a un directorio"; $a->strings["Move to folder:"] = "Mover al directorio:"; $a->strings["No special theme for mobile devices"] = "No hay tema especial para dispositivos móviles"; -$a->strings["Display Settings"] = "Mostrar Configuración"; +$a->strings["Display Settings"] = "Configuración Tema/Visualización"; $a->strings["Display Theme:"] = "Utilizar tema:"; $a->strings["Mobile Theme:"] = "Tema móvil:"; $a->strings["Update browser every xx seconds"] = "Actualizar navegador cada xx segundos"; From c177a5e5b28755b2b829dddc6fb166e09181a37b Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Thu, 1 Nov 2012 15:05:31 +0100 Subject: [PATCH 14/41] vier: threads --- view/theme/vier/style.css | 6 ++---- view/theme/vier/threaded_conversation.tpl | 2 +- view/theme/vier/wall_thread.tpl | 23 ++++++++++++++++++----- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index 64b3ba974..96903bba0 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -1079,15 +1079,13 @@ section { padding-bottom: 2px; } .tag { - background: url("../../../images/tag_b.png") repeat-x center left; - color: #ffffff; + color: rgb(153,153,153); padding-left: 3px; font-size: 10px; } .tag a { padding-right: 8px; - background: url("../../../images/tag.png") no-repeat center right; - color: #ffffff; + color: rgb(153,153,153); } .wwto { position: absolute !important; diff --git a/view/theme/vier/threaded_conversation.tpl b/view/theme/vier/threaded_conversation.tpl index ad510185e..7eadf7e9f 100644 --- a/view/theme/vier/threaded_conversation.tpl +++ b/view/theme/vier/threaded_conversation.tpl @@ -2,7 +2,7 @@ $live_update {{ for $threads as $item }} -
+
{{ if $item.type == tag }} diff --git a/view/theme/vier/wall_thread.tpl b/view/theme/vier/wall_thread.tpl index becf868e7..f6f4679cb 100644 --- a/view/theme/vier/wall_thread.tpl +++ b/view/theme/vier/wall_thread.tpl @@ -42,7 +42,7 @@
- {{ if $item.owner_url }} + {{ if $item.owner_url }}
$item.owner_name @@ -60,9 +60,18 @@
- {{ for $item.tags as $tag }} + {{ for $item.hashtags as $tag }} $tag {{ endfor }} + {{ for $item.mentions as $tag }} + $tag + {{ endfor }} + {{ for $item.folders as $cat }} + $cat.name{{if $cat.removeurl}} (x) {{endif}} + {{ endfor }} + {{ for $item.categories as $cat }} + $cat.name{{if $cat.removeurl}} (x) {{endif}} + {{ endfor }}
@@ -71,7 +80,11 @@
- $item.name $item.ago + $item.name + $item.ago {{ if $item.owner_url }}
$item.to $item.owner_name $item.vwall {{ endif }}
@@ -118,14 +131,14 @@
$item.dislike
- {{ if $item.threaded }}{{ if $item.comment }}{{ if $item.indent==comment }} + {{ if $item.threaded }}{{ if $item.comment }}
$item.comment
- {{ endif }}{{ endif }}{{ endif }} + {{ endif }}{{ endif }}
From 43de9cf90434088d40cde9958f91414001840c9d Mon Sep 17 00:00:00 2001 From: Zach Prezkuta Date: Thu, 1 Nov 2012 10:32:33 -0600 Subject: [PATCH 15/41] don't try to auto redir if I'm a blocked or pending contact --- include/redir.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/include/redir.php b/include/redir.php index 7a4403613..3fbbf4c13 100644 --- a/include/redir.php +++ b/include/redir.php @@ -12,6 +12,8 @@ function auto_redir(&$a, $contact_nick) { // same nickname as me on other hubs or other networks. Exclude these by requiring // that the contact have a local URL. I will be the only person with my nickname at // this URL, so if a result is found, then I am a contact of the $contact_nick user. + // + // We also have to make sure that I'm a legitimate contact--I'm not blocked or pending. $baseurl = $a->get_baseurl(); $domain_st = strpos($baseurl, "://"); @@ -20,7 +22,7 @@ function auto_redir(&$a, $contact_nick) { $baseurl = substr($baseurl, $domain_st + 3); $r = q("SELECT id FROM contact WHERE uid = ( SELECT uid FROM user WHERE nickname = '%s' LIMIT 1 ) - AND nick = '%s' AND self = 0 AND url LIKE '%%%s%%' LIMIT 1", + AND nick = '%s' AND self = 0 AND url LIKE '%%%s%%' AND blocked = 0 AND pending = 0 LIMIT 1", dbesc($contact_nick), dbesc($a->user['nickname']), dbesc($baseurl) @@ -30,10 +32,12 @@ function auto_redir(&$a, $contact_nick) { return; - $r = q("SELECT * FROM contact WHERE nick = '%s' AND network = '%s' AND uid = %d LIMIT 1", + $r = q("SELECT * FROM contact WHERE nick = '%s' + AND network = '%s' AND uid = %d AND url LIKE '%%%s%%' LIMIT 1", dbesc($contact_nick), dbesc(NETWORK_DFRN), - intval(local_user()) + intval(local_user()), + dbesc($baseurl) ); if(! ($r && count($r))) From d98974572b1beaa3d7d34c5c6c8109a41e428bc4 Mon Sep 17 00:00:00 2001 From: Zach Prezkuta Date: Thu, 1 Nov 2012 10:33:01 -0600 Subject: [PATCH 16/41] fix theme control of allowing threading --- include/conversation.php | 3 ++- object/Item.php | 4 ++-- results | 10 ++++++++++ 3 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 results diff --git a/include/conversation.php b/include/conversation.php index 7f4c5bc3d..5f44cde7f 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1008,9 +1008,10 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { function get_item_children($arr, $parent) { $children = array(); + $a = get_app(); foreach($arr as $item) { if($item['id'] != $item['parent']) { - if(get_config('system','thread_allow')) { + if(get_config('system','thread_allow') && $a->theme_thread_allow) { // Fallback to parent-uri if thr-parent is not set $thr_parent = $item['thr-parent']; if($thr_parent == '') diff --git a/object/Item.php b/object/Item.php index 134dbd643..035255466 100644 --- a/object/Item.php +++ b/object/Item.php @@ -519,7 +519,8 @@ class Item extends BaseObject { * _ false on failure */ private function get_comment_box($indent) { - if(!$this->is_toplevel() && !get_config('system','thread_allow')) { + $a = $this->get_app(); + if(!$this->is_toplevel() && !(get_config('system','thread_allow') && $a->theme_thread_allow)) { return ''; } @@ -531,7 +532,6 @@ class Item extends BaseObject { $ww = 'ww'; if($conv->is_writable() && $this->is_writable()) { - $a = $this->get_app(); $qc = $qcomment = null; /* diff --git a/results b/results new file mode 100644 index 000000000..22fcacc50 --- /dev/null +++ b/results @@ -0,0 +1,10 @@ +include/conversation.php: . "; var netargs = '" . substr($a->cmd,8) +include/conversation.php: . "; var netargs = '?f='; var profile_page = " . $a->pager['page'] . "; \r\n"; +include/conversation.php: . "; var netargs = '/?f='; var profile_page = " . $a->pager['page'] . "; \r\n"; +include/conversation.php: . "\r\n"; +js/main.js: var udargs = ((netargs.length) ? '/' + netargs : ''); +js/main.min.js:function openClose(e){document.getElementById(e).style.display=="block"?document.getElementById(e).style.display="none":document.getElementById(e).style.display="block"}function openMenu(e){document.getElementById(e).style.display="block"}function closeMenu(e){document.getElementById(e).style.display="none"}function NavUpdate(){if(!stopped){var e="ping"+(localUser!=0?"?f=&uid="+localUser:"");$.get(e,function(e){$(e).find("result").each(function(){$("nav").trigger("nav-update",this),$("#live-network").length&&(src="network",liveUpdate()),$("#live-profile").length&&(src="profile",liveUpdate()),$("#live-community").length&&(src="community",liveUpdate()),$("#live-notes").length&&(src="notes",liveUpdate()),$("#live-display").length&&liking&&(liking=0,window.location.href=window.location.href),$("#live-photos").length&&liking&&(liking=0,window.location.href=window.location.href)})})}timer=setTimeout(NavUpdate,updateInterval)}function liveUpdate(){if(src==null||stopped||!profile_uid){$(".like-rotator").hide();return}if($(".comment-edit-text-full").length||in_progress){livetime&&clearTimeout(livetime),livetime=setTimeout(liveUpdate,1e4);return}livetime!=null&&(livetime=null),prev="live-"+src,in_progress=!0;var e=netargs.length?"/"+netargs:"",t="update_"+src+e+"&p="+profile_uid+"&page="+profile_page+"&msie="+(msie?1:0);$.get(t,function(e){in_progress=!1,$(".toplevel_item",e).each(function(){var e=$(this).attr("id");$("#"+e).length==0&&profile_page==1?($("img",this).each(function(){$(this).attr("src",$(this).attr("dst"))}),$("#"+prev).after($(this))):($("img",this).each(function(){$(this).attr("src",$(this).attr("dst"))}),$("#"+e).replaceWith($(this))),prev=e}),$(".like-rotator").hide(),commentBusy&&(commentBusy=!1,$("body").css("cursor","auto")),$(".comment-edit-form textarea").contact_autocomplete(baseurl+"/acl")})}function imgbright(e){$(e).removeClass("drophide").addClass("drop")}function imgdull(e){$(e).removeClass("drop").addClass("drophide")}function dolike(e,t){unpause(),$("#like-rotator-"+e.toString()).show(),$.get("like/"+e.toString()+"?verb="+t,NavUpdate),liking=1}function dostar(e){e=e.toString(),$("#like-rotator-"+e).show(),$.get("starred/"+e,function(t){t.match(/1/)?($("#starred-"+e).addClass("starred"),$("#starred-"+e).removeClass("unstarred"),$("#star-"+e).addClass("hidden"),$("#unstar-"+e).removeClass("hidden")):($("#starred-"+e).addClass("unstarred"),$("#starred-"+e).removeClass("starred"),$("#star-"+e).removeClass("hidden"),$("#unstar-"+e).addClass("hidden")),$("#like-rotator-"+e).hide()})}function getPosition(e){var t={x:0,y:0};if(e.pageX||e.pageY)t.x=e.pageX,t.y=e.pageY;else if(e.clientX||e.clientY)t.x=e.clientX+(document.documentElement.scrollLeft||document.body.scrollLeft)-document.documentElement.clientLeft,t.y=e.clientY+(document.documentElement.scrollTop||document.body.scrollTop)-document.documentElement.clientTop;else if(e.x||e.y)t.x=e.x,t.y=e.y;return t}function lockview(e,t){e=e||window.event,cursor=getPosition(e),lockvisible?lockviewhide():(lockvisible=!0,$.get("lockview/"+t,function(e){$("#panel").html(e),$("#panel").css({left:cursor.x+5,top:cursor.y+5}),$("#panel").show()}))}function lockviewhide(){lockvisible=!1,$("#panel").hide()}function post_comment(e){return unpause(),commentBusy=!0,$("body").css("cursor","wait"),$("#comment-preview-inp-"+e).val("0"),$.post("item",$("#comment-edit-form-"+e).serialize(),function(t){if(t.success){$("#comment-edit-wrapper-"+e).hide(),$("#comment-edit-text-"+e).val("");var n=document.getElementById("comment-edit-text-"+e);n&&commentClose(n,e),timer&&clearTimeout(timer),timer=setTimeout(NavUpdate,10)}t.reload&&(window.location.href=t.reload)},"json"),!1}function preview_comment(e){return $("#comment-preview-inp-"+e).val("1"),$("#comment-edit-preview-"+e).show(),$.post("item",$("#comment-edit-form-"+e).serialize(),function(t){t.preview&&($("#comment-edit-preview-"+e).html(t.preview),$("#comment-edit-preview-"+e+" a").click(function(){return!1}))},"json"),!0}function preview_post(){return $("#jot-preview").val("1"),$("#jot-preview-content").show(),tinyMCE.triggerSave(),$.post("item",$("#profile-jot-form").serialize(),function(e){e.preview&&($("#jot-preview-content").html(e.preview),$("#jot-preview-content a").click(function(){return!1}))},"json"),$("#jot-preview").val("0"),!0}function unpause(){totStopped=!1,stopped=!1,$("#pause").html("")}function bin2hex(e){var t,n,r=0,i=[];e+="",r=e.length;for(n=0;n'+e.desc+'
'+e.version+'
'+e.credits+'
'+theme+'')})}var src=null,prev=null,livetime=null,msie=!1,stopped=!1,totStopped=!1,timer=null,pr=0,liking=0,in_progress=!1,langSelect=!1,commentBusy=!1,last_popup_menu=null,last_popup_button=null;$(function(){function e(){last_popup_menu&&(last_popup_menu.hide(),last_popup_button.removeClass("selected"),last_popup_menu=null,last_popup_button=null)}$.ajaxSetup({cache:!1}),msie=$.browser.msie,$(".onoff input").each(function(){val=$(this).val(),id=$(this).attr("id"),$("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden")}),$(".onoff > a").click(function(e){e.preventDefault();var t=$(this).siblings("input"),n=1-t.val(),r=t.attr("id");$("#"+r+"_onoff ."+(n==0?"on":"off")).addClass("hidden"),$("#"+r+"_onoff ."+(n==1?"on":"off")).removeClass("hidden"),t.val(n)}),setupFieldRichtext(),$("a[rel^=#]").click(function(t){return e(),menu=$($(this).attr("rel")),t.preventDefault(),t.stopPropagation(),menu.attr("popup")=="false"?!1:($(this).parent().toggleClass("selected"),menu.toggle(),menu.css("display")=="none"?(last_popup_menu=null,last_popup_button=null):(last_popup_menu=menu,last_popup_button=$(this).parent()),!1)}),$("html").click(function(){e()}),$("a.popupbox").fancybox({transitionIn:"elastic",transitionOut:"elastic"});var t=unescape($("#nav-notifications-template[rel=template]").html()),n=unescape($("
").append($("#nav-notifications-see-all").clone()).html()),r=unescape($("
").append($("#nav-notifications-mark-all").clone()).html()),i=unescape($("#nav-notifications-menu").html());$("nav").bind("nav-update",function(e,s){var o=$(s).find("invalid").text();o==1&&(window.location.href=window.location.href);var u=$(s).find("net").text();u==0?(u="",$("#net-update").removeClass("show")):$("#net-update").addClass("show"),$("#net-update").html(u);var a=$(s).find("home").text();a==0?(a="",$("#home-update").removeClass("show")):$("#home-update").addClass("show"),$("#home-update").html(a);var f=$(s).find("intro").text();f==0?(f="",$("#intro-update").removeClass("show")):$("#intro-update").addClass("show"),$("#intro-update").html(f);var l=$(s).find("mail").text();l==0?(l="",$("#mail-update").removeClass("show")):$("#mail-update").addClass("show"),$("#mail-update").html(l);var f=$(s).find("intro").text();f==0?(f="",$("#intro-update-li").removeClass("show")):$("#intro-update-li").addClass("show"),$("#intro-update-li").html(f);var l=$(s).find("mail").text();l==0?(l="",$("#mail-update-li").removeClass("show")):$("#mail-update-li").addClass("show"),$("#mail-update-li").html(l);var c=$(s).find("notif");c.children("note").length==0?$("#nav-notifications-menu").html(i):(nnm=$("#nav-notifications-menu"),nnm.html(n+r),c.children("note").each(function(){e=$(this),text=e.text().format(""+e.attr("name")+""),html=t.format(e.attr("href"),e.attr("photo"),text,e.attr("date"),e.attr("seen")),nnm.append(html)})),notif=c.attr("count"),notif>0?$("#nav-notifications-linkmenu").addClass("on"):$("#nav-notifications-linkmenu").removeClass("on"),notif==0?(notif="",$("#notify-update").removeClass("show")):$("#notify-update").addClass("show"),$("#notify-update").html(notif);var h=$(s).find("sysmsgs");h.children("notice").each(function(){text=$(this).text(),$.jGrowl(text,{sticky:!0,theme:"notice"})}),h.children("info").each(function(){text=$(this).text(),$.jGrowl(text,{sticky:!1,theme:"info",life:1e4})})}),NavUpdate(),$(document).keydown(function(e){if(e.keyCode=="8"){var t=e.target||e.srcElement;if(!/input|textarea/i.test(t.nodeName))return!1}e.keyCode=="19"||e.ctrlKey&&e.which=="32"?(e.preventDefault(),stopped==0?(stopped=!0,e.ctrlKey&&(totStopped=!0),$("#pause").html('pause')):unpause()):totStopped||unpause()})});var lockvisible=!1;String.prototype.format=function(){var e=this;for(var t=0;t img").not(function(){return this.complete}),n=t.length;n?t.load(function(){n--,n||collapseHeight()}):collapseHeight(),$j(".like-rotator").hide(),commentBusy&&(commentBusy=!1,$j("body").css("cursor","auto")),$j(".comment-edit-form textarea").contact_autocomplete(baseurl+"/acl")})}function collapseHeight(){$j(".wall-item-body").each(function(){$j(this).height()>310&&($j(this).hasClass("divmore")||($j(this).divgrow({initialHeight:300,showBrackets:!1,speed:0}),$j(this).addClass("divmore")))})}function imgbright(e){$j(e).removeClass("drophide").addClass("drop")}function imgdull(e){$j(e).removeClass("drop").addClass("drophide")}function dolike(e,t){unpause(),$j("#like-rotator-"+e.toString()).show(),$j.get("like/"+e.toString()+"?verb="+t,NavUpdate),liking=1}function dostar(e){e=e.toString(),$j.get("starred/"+e,function(t){t.match(/1/)?($j("#starred-"+e).addClass("starred"),$j("#starred-"+e).removeClass("unstarred"),$j("#star-"+e).addClass("hidden"),$j("#unstar-"+e).removeClass("hidden")):($j("#starred-"+e).addClass("unstarred"),$j("#starred-"+e).removeClass("starred"),$j("#star-"+e).removeClass("hidden"),$j("#unstar-"+e).addClass("hidden"))})}function getPosition(e){var t={x:0,y:0};if(e.touches[0].pageX||e.touches[0].pageY)t.x=e.touches[0].pageX,t.y=e.touches[0].pageY;else if(e.touches[0].clientX||e.touches[0].clientY)t.x=e.touches[0].clientX+(document.documentElement.scrollLeft||document.body.scrollLeft)-document.documentElement.clientLeft,t.y=e.touches[0].clientY+(document.documentElement.scrollTop||document.body.scrollTop)-document.documentElement.clientTop;else if(e.touches[0].x||e.touches[0].y)t.touches[0].x=e.touches[0].x,t.touches[0].y=e.touches[0].y;return t}function lockview(e,t){e=e||window.event,cursor=getPosition(e),lockvisible?lockviewhide():(lockvisible=!0,$j.get("lockview/"+t,function(e){$j("#panel").html(e),$j("#panel").css({left:cursor.x+5,top:cursor.y+5}),$j("#panel").show()}))}function lockviewhide(){lockvisible=!1,$j("#panel").hide()}function post_comment(e){return unpause(),commentBusy=!0,$j("body").css("cursor","wait"),$j("#comment-preview-inp-"+e).val("0"),$j.post("item",$j("#comment-edit-form-"+e).serialize(),function(t){if(t.success){$j("#comment-edit-wrapper-"+e).hide(),$j("#comment-edit-text-"+e).val("");var n=document.getElementById("comment-edit-text-"+e);n&&commentClose(n,e),timer&&clearTimeout(timer),timer=setTimeout(NavUpdate,10)}t.reload&&(window.location.href=t.reload)},"json"),!1}function preview_comment(e){return $j("#comment-preview-inp-"+e).val("1"),$j("#comment-edit-preview-"+e).show(),$j.post("item",$j("#comment-edit-form-"+e).serialize(),function(t){t.preview&&($j("#comment-edit-preview-"+e).html(t.preview),$j("#comment-edit-preview-"+e+" a").click(function(){return!1}))},"json"),!0}function preview_post(){return $j("#jot-preview").val("1"),$j("#jot-preview-content").show(),tinyMCE.triggerSave(),$j.post("item",$j("#profile-jot-form").serialize(),function(e){e.preview&&($j("#jot-preview-content").html(e.preview),$j("#jot-preview-content a").click(function(){return!1}))},"json"),$j("#jot-preview").val("0"),!0}function unpause(){totStopped=!1,stopped=!1,$j("#pause").html("")}function bin2hex(e){var t,n,r=0,i=[];e+="",r=e.length;for(n=0;n'+e.desc+'
'+e.version+'
'+e.credits+"
")})}var src=null,prev=null,livetime=null,msie=!1,stopped=!1,totStopped=!1,timer=null,pr=0,liking=0,in_progress=!1,langSelect=!1,commentBusy=!1,last_popup_menu=null,last_popup_button=null;$j(function(){function e(e){last_popup_menu&&"#"+last_popup_menu.attr("id")!==$j(e.target).attr("rel")&&(last_popup_menu.hide(),last_popup_menu.attr("id")=="nav-notifications-menu"&&$j(".main-container").show(),last_popup_button.removeClass("selected"),last_popup_menu=null,last_popup_button=null)}$j.ajaxSetup({cache:!1}),msie=$j.browser.msie,$j(".onoff input").each(function(){val=$j(this).val(),id=$j(this).attr("id"),$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden")}),$j(".onoff > a").click(function(e){e.preventDefault();var t=$j(this).siblings("input"),n=1-t.val(),r=t.attr("id");$j("#"+r+"_onoff ."+(n==0?"on":"off")).addClass("hidden"),$j("#"+r+"_onoff ."+(n==1?"on":"off")).removeClass("hidden"),t.val(n)}),$j("img[rel^=#]").click(function(t){return e(t),menu=$j($j(this).attr("rel")),t.preventDefault(),t.stopPropagation(),menu.attr("popup")=="false"?!1:(menu.css("display")=="none"?($j(this).parent().addClass("selected"),menu.show(),menu.attr("id")=="nav-notifications-menu"&&$j(".main-container").hide(),last_popup_menu=menu,last_popup_button=$j(this).parent()):($j(this).parent().removeClass("selected"),menu.hide(),menu.attr("id")=="nav-notifications-menu"&&$j(".main-container").show(),last_popup_menu=null,last_popup_button=null),!1)}),$j("html").click(function(t){e(t)});var t=unescape($j("#nav-notifications-template[rel=template]").html()),n=unescape($j("
").append($j("#nav-notifications-see-all").clone()).html()),r=unescape($j("
").append($j("#nav-notifications-mark-all").clone()).html()),i=unescape($j("#nav-notifications-menu").html());$j("nav").bind("nav-update",function(e,s){var o=$j(s).find("invalid").text();o==1&&(window.location.href=window.location.href);var u=$j(s).find("net").text();u==0?(u="",$j("#net-update").removeClass("show")):$j("#net-update").addClass("show"),$j("#net-update").html(u);var a=$j(s).find("home").text();a==0?(a="",$j("#home-update").removeClass("show")):$j("#home-update").addClass("show"),$j("#home-update").html(a);var f=$j(s).find("intro").text();f==0?(f="",$j("#intro-update").removeClass("show")):$j("#intro-update").addClass("show"),$j("#intro-update").html(f);var l=$j(s).find("mail").text();l==0?(l="",$j("#mail-update").removeClass("show")):$j("#mail-update").addClass("show"),$j("#mail-update").html(l);var f=$j(s).find("intro").text();f==0?(f="",$j("#intro-update-li").removeClass("show")):$j("#intro-update-li").addClass("show"),$j("#intro-update-li").html(f);var l=$j(s).find("mail").text();l==0?(l="",$j("#mail-update-li").removeClass("show")):$j("#mail-update-li").addClass("show"),$j("#mail-update-li").html(l);var c=$j(s).find("notif");c.children("note").length==0?$j("#nav-notifications-menu").html(i):(nnm=$j("#nav-notifications-menu"),nnm.html(n+r),c.children("note").each(function(){e=$j(this),text=e.text().format(""+e.attr("name")+""),html=t.format(e.attr("href"),e.attr("photo"),text,e.attr("date"),e.attr("seen")),nnm.append(html)})),notif=c.attr("count"),notif>0?$j("#nav-notifications-linkmenu").addClass("on"):$j("#nav-notifications-linkmenu").removeClass("on"),notif==0?(notif="",$j("#notify-update").removeClass("show")):$j("#notify-update").addClass("show"),$j("#notify-update").html(notif);var h=$j(s).find("sysmsgs");h.children("notice").each(function(){text=$j(this).text(),$j.jGrowl(text,{sticky:!1,theme:"notice",life:1e3})}),h.children("info").each(function(){text=$j(this).text(),$j.jGrowl(text,{sticky:!1,theme:"info",life:1e3})})}),NavUpdate()});var lockvisible=!1;String.prototype.format=function(){var e=this;for(var t=0;t img").not(function(){return this.complete}),n=t.length;n?t.load(function(){n--,n||collapseHeight()}):collapseHeight()})}function collapseHeight(){$j(".wall-item-body").each(function(){$j(this).height()>410&&($j(this).hasClass("divmore")||($j(this).divgrow({initialHeight:400,showBrackets:!1,speed:300}),$j(this).addClass("divmore")))})}function imgbright(e){$j(e).removeClass("drophide").addClass("drop")}function imgdull(e){$j(e).removeClass("drop").addClass("drophide")}function dolike(e,t){unpause(),$j("#like-rotator-"+e.toString()).show(),$j.get("like/"+e.toString()+"?verb="+t,NavUpdate),liking=1}function dostar(e){e=e.toString(),$j.get("starred/"+e,function(t){t.match(/1/)?($j("#starred-"+e).addClass("starred"),$j("#starred-"+e).removeClass("unstarred"),$j("#star-"+e).addClass("hidden"),$j("#unstar-"+e).removeClass("hidden")):($j("#starred-"+e).addClass("unstarred"),$j("#starred-"+e).removeClass("starred"),$j("#star-"+e).removeClass("hidden"),$j("#unstar-"+e).addClass("hidden"))})}function getPosition(e){var t={x:0,y:0};if(e.pageX||e.pageY)t.x=e.pageX,t.y=e.pageY;else if(e.clientX||e.clientY)t.x=e.clientX+(document.documentElement.scrollLeft||document.body.scrollLeft)-document.documentElement.clientLeft,t.y=e.clientY+(document.documentElement.scrollTop||document.body.scrollTop)-document.documentElement.clientTop;else if(e.x||e.y)t.x=e.x,t.y=e.y;return t}function lockview(e,t){e=e||window.event,cursor=getPosition(e),lockvisible?lockviewhide():(lockvisible=!0,$j.get("lockview/"+t,function(e){$j("#panel").html(e),$j("#panel").css({left:cursor.x+5,top:cursor.y+5}),$j("#panel").show()}))}function lockviewhide(){lockvisible=!1,$j("#panel").hide()}function post_comment(e){return unpause(),commentBusy=!0,$j("body").css("cursor","wait"),$j("#comment-preview-inp-"+e).val("0"),$j.post("item",$j("#comment-edit-form-"+e).serialize(),function(t){if(t.success){$j("#comment-edit-wrapper-"+e).hide(),$j("#comment-edit-text-"+e).val("");var n=document.getElementById("comment-edit-text-"+e);n&&commentClose(n,e),timer&&clearTimeout(timer),timer=setTimeout(NavUpdate,10)}t.reload&&(window.location.href=t.reload)},"json"),!1}function preview_comment(e){return $j("#comment-preview-inp-"+e).val("1"),$j("#comment-edit-preview-"+e).show(),$j.post("item",$j("#comment-edit-form-"+e).serialize(),function(t){t.preview&&($j("#comment-edit-preview-"+e).html(t.preview),$j("#comment-edit-preview-"+e+" a").click(function(){return!1}))},"json"),!0}function preview_post(){return $j("#jot-preview").val("1"),$j("#jot-preview-content").show(),tinyMCE.triggerSave(),$j.post("item",$j("#profile-jot-form").serialize(),function(e){e.preview&&($j("#jot-preview-content").html(e.preview),$j("#jot-preview-content a").click(function(){return!1}))},"json"),$j("#jot-preview").val("0"),!0}function unpause(){totStopped=!1,stopped=!1,$j("#pause").html("")}function bin2hex(e){var t,n,r=0,i=[];e+="",r=e.length;for(n=0;n'+e.desc+'
'+e.version+'
'+e.credits+'
'+theme+'')})}var src=null,prev=null,livetime=null,msie=!1,stopped=!1,totStopped=!1,timer=null,pr=0,liking=0,in_progress=!1,langSelect=!1,commentBusy=!1,last_popup_menu=null,last_popup_button=null;$j(function(){function e(e){last_popup_menu&&"#"+last_popup_menu.attr("id")!==$j(e.target).attr("rel")&&(last_popup_menu.hide(),last_popup_button.removeClass("selected"),last_popup_menu=null,last_popup_button=null)}$j.ajaxSetup({cache:!1}),msie=$j.browser.msie,$j(".onoff input").each(function(){val=$j(this).val(),id=$j(this).attr("id"),$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden")}),$j(".onoff > a").click(function(e){e.preventDefault();var t=$j(this).siblings("input"),n=1-t.val(),r=t.attr("id");$j("#"+r+"_onoff ."+(n==0?"on":"off")).addClass("hidden"),$j("#"+r+"_onoff ."+(n==1?"on":"off")).removeClass("hidden"),t.val(n)}),setupFieldRichtext(),$j("a[rel^=#]").click(function(t){return e(t),menu=$j($j(this).attr("rel")),t.preventDefault(),t.stopPropagation(),menu.attr("popup")=="false"?!1:($j(this).parent().toggleClass("selected"),menu.slideToggle("fast"),menu.css("display")=="none"?(last_popup_menu=null,last_popup_button=null):(last_popup_menu=menu,last_popup_button=$j(this).parent()),!1)}),$j("html").click(function(t){e(t)}),$j("a.popupbox").fancybox({transitionIn:"none",transitionOut:"none"});var t=unescape($j("#nav-notifications-template[rel=template]").html()),n=unescape($j("
").append($j("#nav-notifications-see-all").clone()).html()),r=unescape($j("
").append($j("#nav-notifications-mark-all").clone()).html()),i=unescape($j("#nav-notifications-menu").html());$j("nav").bind("nav-update",function(e,s){var o=$j(s).find("invalid").text();o==1&&(window.location.href=window.location.href);var u=$j(s).find("net").text();u==0?(u="",$j("#net-update").removeClass("show")):$j("#net-update").addClass("show"),$j("#net-update").html(u);var a=$j(s).find("home").text();a==0?(a="",$j("#home-update").removeClass("show")):$j("#home-update").addClass("show"),$j("#home-update").html(a);var f=$j(s).find("intro").text();f==0?(f="",$j("#intro-update").removeClass("show")):$j("#intro-update").addClass("show"),$j("#intro-update").html(f);var l=$j(s).find("mail").text();l==0?(l="",$j("#mail-update").removeClass("show")):$j("#mail-update").addClass("show"),$j("#mail-update").html(l);var f=$j(s).find("intro").text();f==0?(f="",$j("#intro-update-li").removeClass("show")):$j("#intro-update-li").addClass("show"),$j("#intro-update-li").html(f);var l=$j(s).find("mail").text();l==0?(l="",$j("#mail-update-li").removeClass("show")):$j("#mail-update-li").addClass("show"),$j("#mail-update-li").html(l);var c=$j(s).find("notif");c.children("note").length==0?$j("#nav-notifications-menu").html(i):(nnm=$j("#nav-notifications-menu"),nnm.html(n+r),c.children("note").each(function(){e=$j(this),text=e.text().format(""+e.attr("name")+""),html=t.format(e.attr("href"),e.attr("photo"),text,e.attr("date"),e.attr("seen")),nnm.append(html)})),notif=c.attr("count"),notif>0?$j("#nav-notifications-linkmenu").addClass("on"):$j("#nav-notifications-linkmenu").removeClass("on"),notif==0?(notif="",$j("#notify-update").removeClass("show")):$j("#notify-update").addClass("show"),$j("#notify-update").html(notif);var h=$j(s).find("sysmsgs");h.children("notice").each(function(){text=$j(this).text(),$j.jGrowl(text,{sticky:!1,theme:"notice",life:3e3})}),h.children("info").each(function(){text=$j(this).text(),$j.jGrowl(text,{sticky:!1,theme:"info",life:1e3})})}),NavUpdate(),$j(document).keydown(function(e){if(e.keyCode=="8"){var t=e.target||e.srcElement;if(!/input|textarea/i.test(t.nodeName))return!1}e.keyCode=="19"||e.ctrlKey&&e.which=="32"?(e.preventDefault(),stopped==0?(stopped=!0,e.ctrlKey&&(totStopped=!0),$j("#pause").html('pause')):unpause()):totStopped||unpause()})});var lockvisible=!1;String.prototype.format=function(){var e=this;for(var t=0;t Date: Thu, 1 Nov 2012 10:35:20 -0600 Subject: [PATCH 17/41] get rid of stray file --- results | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 results diff --git a/results b/results deleted file mode 100644 index 22fcacc50..000000000 --- a/results +++ /dev/null @@ -1,10 +0,0 @@ -include/conversation.php: . "; var netargs = '" . substr($a->cmd,8) -include/conversation.php: . "; var netargs = '?f='; var profile_page = " . $a->pager['page'] . "; \r\n"; -include/conversation.php: . "; var netargs = '/?f='; var profile_page = " . $a->pager['page'] . "; \r\n"; -include/conversation.php: . "\r\n"; -js/main.js: var udargs = ((netargs.length) ? '/' + netargs : ''); -js/main.min.js:function openClose(e){document.getElementById(e).style.display=="block"?document.getElementById(e).style.display="none":document.getElementById(e).style.display="block"}function openMenu(e){document.getElementById(e).style.display="block"}function closeMenu(e){document.getElementById(e).style.display="none"}function NavUpdate(){if(!stopped){var e="ping"+(localUser!=0?"?f=&uid="+localUser:"");$.get(e,function(e){$(e).find("result").each(function(){$("nav").trigger("nav-update",this),$("#live-network").length&&(src="network",liveUpdate()),$("#live-profile").length&&(src="profile",liveUpdate()),$("#live-community").length&&(src="community",liveUpdate()),$("#live-notes").length&&(src="notes",liveUpdate()),$("#live-display").length&&liking&&(liking=0,window.location.href=window.location.href),$("#live-photos").length&&liking&&(liking=0,window.location.href=window.location.href)})})}timer=setTimeout(NavUpdate,updateInterval)}function liveUpdate(){if(src==null||stopped||!profile_uid){$(".like-rotator").hide();return}if($(".comment-edit-text-full").length||in_progress){livetime&&clearTimeout(livetime),livetime=setTimeout(liveUpdate,1e4);return}livetime!=null&&(livetime=null),prev="live-"+src,in_progress=!0;var e=netargs.length?"/"+netargs:"",t="update_"+src+e+"&p="+profile_uid+"&page="+profile_page+"&msie="+(msie?1:0);$.get(t,function(e){in_progress=!1,$(".toplevel_item",e).each(function(){var e=$(this).attr("id");$("#"+e).length==0&&profile_page==1?($("img",this).each(function(){$(this).attr("src",$(this).attr("dst"))}),$("#"+prev).after($(this))):($("img",this).each(function(){$(this).attr("src",$(this).attr("dst"))}),$("#"+e).replaceWith($(this))),prev=e}),$(".like-rotator").hide(),commentBusy&&(commentBusy=!1,$("body").css("cursor","auto")),$(".comment-edit-form textarea").contact_autocomplete(baseurl+"/acl")})}function imgbright(e){$(e).removeClass("drophide").addClass("drop")}function imgdull(e){$(e).removeClass("drop").addClass("drophide")}function dolike(e,t){unpause(),$("#like-rotator-"+e.toString()).show(),$.get("like/"+e.toString()+"?verb="+t,NavUpdate),liking=1}function dostar(e){e=e.toString(),$("#like-rotator-"+e).show(),$.get("starred/"+e,function(t){t.match(/1/)?($("#starred-"+e).addClass("starred"),$("#starred-"+e).removeClass("unstarred"),$("#star-"+e).addClass("hidden"),$("#unstar-"+e).removeClass("hidden")):($("#starred-"+e).addClass("unstarred"),$("#starred-"+e).removeClass("starred"),$("#star-"+e).removeClass("hidden"),$("#unstar-"+e).addClass("hidden")),$("#like-rotator-"+e).hide()})}function getPosition(e){var t={x:0,y:0};if(e.pageX||e.pageY)t.x=e.pageX,t.y=e.pageY;else if(e.clientX||e.clientY)t.x=e.clientX+(document.documentElement.scrollLeft||document.body.scrollLeft)-document.documentElement.clientLeft,t.y=e.clientY+(document.documentElement.scrollTop||document.body.scrollTop)-document.documentElement.clientTop;else if(e.x||e.y)t.x=e.x,t.y=e.y;return t}function lockview(e,t){e=e||window.event,cursor=getPosition(e),lockvisible?lockviewhide():(lockvisible=!0,$.get("lockview/"+t,function(e){$("#panel").html(e),$("#panel").css({left:cursor.x+5,top:cursor.y+5}),$("#panel").show()}))}function lockviewhide(){lockvisible=!1,$("#panel").hide()}function post_comment(e){return unpause(),commentBusy=!0,$("body").css("cursor","wait"),$("#comment-preview-inp-"+e).val("0"),$.post("item",$("#comment-edit-form-"+e).serialize(),function(t){if(t.success){$("#comment-edit-wrapper-"+e).hide(),$("#comment-edit-text-"+e).val("");var n=document.getElementById("comment-edit-text-"+e);n&&commentClose(n,e),timer&&clearTimeout(timer),timer=setTimeout(NavUpdate,10)}t.reload&&(window.location.href=t.reload)},"json"),!1}function preview_comment(e){return $("#comment-preview-inp-"+e).val("1"),$("#comment-edit-preview-"+e).show(),$.post("item",$("#comment-edit-form-"+e).serialize(),function(t){t.preview&&($("#comment-edit-preview-"+e).html(t.preview),$("#comment-edit-preview-"+e+" a").click(function(){return!1}))},"json"),!0}function preview_post(){return $("#jot-preview").val("1"),$("#jot-preview-content").show(),tinyMCE.triggerSave(),$.post("item",$("#profile-jot-form").serialize(),function(e){e.preview&&($("#jot-preview-content").html(e.preview),$("#jot-preview-content a").click(function(){return!1}))},"json"),$("#jot-preview").val("0"),!0}function unpause(){totStopped=!1,stopped=!1,$("#pause").html("")}function bin2hex(e){var t,n,r=0,i=[];e+="",r=e.length;for(n=0;n'+e.desc+'
'+e.version+'
'+e.credits+'
'+theme+'')})}var src=null,prev=null,livetime=null,msie=!1,stopped=!1,totStopped=!1,timer=null,pr=0,liking=0,in_progress=!1,langSelect=!1,commentBusy=!1,last_popup_menu=null,last_popup_button=null;$(function(){function e(){last_popup_menu&&(last_popup_menu.hide(),last_popup_button.removeClass("selected"),last_popup_menu=null,last_popup_button=null)}$.ajaxSetup({cache:!1}),msie=$.browser.msie,$(".onoff input").each(function(){val=$(this).val(),id=$(this).attr("id"),$("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden")}),$(".onoff > a").click(function(e){e.preventDefault();var t=$(this).siblings("input"),n=1-t.val(),r=t.attr("id");$("#"+r+"_onoff ."+(n==0?"on":"off")).addClass("hidden"),$("#"+r+"_onoff ."+(n==1?"on":"off")).removeClass("hidden"),t.val(n)}),setupFieldRichtext(),$("a[rel^=#]").click(function(t){return e(),menu=$($(this).attr("rel")),t.preventDefault(),t.stopPropagation(),menu.attr("popup")=="false"?!1:($(this).parent().toggleClass("selected"),menu.toggle(),menu.css("display")=="none"?(last_popup_menu=null,last_popup_button=null):(last_popup_menu=menu,last_popup_button=$(this).parent()),!1)}),$("html").click(function(){e()}),$("a.popupbox").fancybox({transitionIn:"elastic",transitionOut:"elastic"});var t=unescape($("#nav-notifications-template[rel=template]").html()),n=unescape($("
").append($("#nav-notifications-see-all").clone()).html()),r=unescape($("
").append($("#nav-notifications-mark-all").clone()).html()),i=unescape($("#nav-notifications-menu").html());$("nav").bind("nav-update",function(e,s){var o=$(s).find("invalid").text();o==1&&(window.location.href=window.location.href);var u=$(s).find("net").text();u==0?(u="",$("#net-update").removeClass("show")):$("#net-update").addClass("show"),$("#net-update").html(u);var a=$(s).find("home").text();a==0?(a="",$("#home-update").removeClass("show")):$("#home-update").addClass("show"),$("#home-update").html(a);var f=$(s).find("intro").text();f==0?(f="",$("#intro-update").removeClass("show")):$("#intro-update").addClass("show"),$("#intro-update").html(f);var l=$(s).find("mail").text();l==0?(l="",$("#mail-update").removeClass("show")):$("#mail-update").addClass("show"),$("#mail-update").html(l);var f=$(s).find("intro").text();f==0?(f="",$("#intro-update-li").removeClass("show")):$("#intro-update-li").addClass("show"),$("#intro-update-li").html(f);var l=$(s).find("mail").text();l==0?(l="",$("#mail-update-li").removeClass("show")):$("#mail-update-li").addClass("show"),$("#mail-update-li").html(l);var c=$(s).find("notif");c.children("note").length==0?$("#nav-notifications-menu").html(i):(nnm=$("#nav-notifications-menu"),nnm.html(n+r),c.children("note").each(function(){e=$(this),text=e.text().format(""+e.attr("name")+""),html=t.format(e.attr("href"),e.attr("photo"),text,e.attr("date"),e.attr("seen")),nnm.append(html)})),notif=c.attr("count"),notif>0?$("#nav-notifications-linkmenu").addClass("on"):$("#nav-notifications-linkmenu").removeClass("on"),notif==0?(notif="",$("#notify-update").removeClass("show")):$("#notify-update").addClass("show"),$("#notify-update").html(notif);var h=$(s).find("sysmsgs");h.children("notice").each(function(){text=$(this).text(),$.jGrowl(text,{sticky:!0,theme:"notice"})}),h.children("info").each(function(){text=$(this).text(),$.jGrowl(text,{sticky:!1,theme:"info",life:1e4})})}),NavUpdate(),$(document).keydown(function(e){if(e.keyCode=="8"){var t=e.target||e.srcElement;if(!/input|textarea/i.test(t.nodeName))return!1}e.keyCode=="19"||e.ctrlKey&&e.which=="32"?(e.preventDefault(),stopped==0?(stopped=!0,e.ctrlKey&&(totStopped=!0),$("#pause").html('pause')):unpause()):totStopped||unpause()})});var lockvisible=!1;String.prototype.format=function(){var e=this;for(var t=0;t img").not(function(){return this.complete}),n=t.length;n?t.load(function(){n--,n||collapseHeight()}):collapseHeight(),$j(".like-rotator").hide(),commentBusy&&(commentBusy=!1,$j("body").css("cursor","auto")),$j(".comment-edit-form textarea").contact_autocomplete(baseurl+"/acl")})}function collapseHeight(){$j(".wall-item-body").each(function(){$j(this).height()>310&&($j(this).hasClass("divmore")||($j(this).divgrow({initialHeight:300,showBrackets:!1,speed:0}),$j(this).addClass("divmore")))})}function imgbright(e){$j(e).removeClass("drophide").addClass("drop")}function imgdull(e){$j(e).removeClass("drop").addClass("drophide")}function dolike(e,t){unpause(),$j("#like-rotator-"+e.toString()).show(),$j.get("like/"+e.toString()+"?verb="+t,NavUpdate),liking=1}function dostar(e){e=e.toString(),$j.get("starred/"+e,function(t){t.match(/1/)?($j("#starred-"+e).addClass("starred"),$j("#starred-"+e).removeClass("unstarred"),$j("#star-"+e).addClass("hidden"),$j("#unstar-"+e).removeClass("hidden")):($j("#starred-"+e).addClass("unstarred"),$j("#starred-"+e).removeClass("starred"),$j("#star-"+e).removeClass("hidden"),$j("#unstar-"+e).addClass("hidden"))})}function getPosition(e){var t={x:0,y:0};if(e.touches[0].pageX||e.touches[0].pageY)t.x=e.touches[0].pageX,t.y=e.touches[0].pageY;else if(e.touches[0].clientX||e.touches[0].clientY)t.x=e.touches[0].clientX+(document.documentElement.scrollLeft||document.body.scrollLeft)-document.documentElement.clientLeft,t.y=e.touches[0].clientY+(document.documentElement.scrollTop||document.body.scrollTop)-document.documentElement.clientTop;else if(e.touches[0].x||e.touches[0].y)t.touches[0].x=e.touches[0].x,t.touches[0].y=e.touches[0].y;return t}function lockview(e,t){e=e||window.event,cursor=getPosition(e),lockvisible?lockviewhide():(lockvisible=!0,$j.get("lockview/"+t,function(e){$j("#panel").html(e),$j("#panel").css({left:cursor.x+5,top:cursor.y+5}),$j("#panel").show()}))}function lockviewhide(){lockvisible=!1,$j("#panel").hide()}function post_comment(e){return unpause(),commentBusy=!0,$j("body").css("cursor","wait"),$j("#comment-preview-inp-"+e).val("0"),$j.post("item",$j("#comment-edit-form-"+e).serialize(),function(t){if(t.success){$j("#comment-edit-wrapper-"+e).hide(),$j("#comment-edit-text-"+e).val("");var n=document.getElementById("comment-edit-text-"+e);n&&commentClose(n,e),timer&&clearTimeout(timer),timer=setTimeout(NavUpdate,10)}t.reload&&(window.location.href=t.reload)},"json"),!1}function preview_comment(e){return $j("#comment-preview-inp-"+e).val("1"),$j("#comment-edit-preview-"+e).show(),$j.post("item",$j("#comment-edit-form-"+e).serialize(),function(t){t.preview&&($j("#comment-edit-preview-"+e).html(t.preview),$j("#comment-edit-preview-"+e+" a").click(function(){return!1}))},"json"),!0}function preview_post(){return $j("#jot-preview").val("1"),$j("#jot-preview-content").show(),tinyMCE.triggerSave(),$j.post("item",$j("#profile-jot-form").serialize(),function(e){e.preview&&($j("#jot-preview-content").html(e.preview),$j("#jot-preview-content a").click(function(){return!1}))},"json"),$j("#jot-preview").val("0"),!0}function unpause(){totStopped=!1,stopped=!1,$j("#pause").html("")}function bin2hex(e){var t,n,r=0,i=[];e+="",r=e.length;for(n=0;n'+e.desc+'
'+e.version+'
'+e.credits+"
")})}var src=null,prev=null,livetime=null,msie=!1,stopped=!1,totStopped=!1,timer=null,pr=0,liking=0,in_progress=!1,langSelect=!1,commentBusy=!1,last_popup_menu=null,last_popup_button=null;$j(function(){function e(e){last_popup_menu&&"#"+last_popup_menu.attr("id")!==$j(e.target).attr("rel")&&(last_popup_menu.hide(),last_popup_menu.attr("id")=="nav-notifications-menu"&&$j(".main-container").show(),last_popup_button.removeClass("selected"),last_popup_menu=null,last_popup_button=null)}$j.ajaxSetup({cache:!1}),msie=$j.browser.msie,$j(".onoff input").each(function(){val=$j(this).val(),id=$j(this).attr("id"),$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden")}),$j(".onoff > a").click(function(e){e.preventDefault();var t=$j(this).siblings("input"),n=1-t.val(),r=t.attr("id");$j("#"+r+"_onoff ."+(n==0?"on":"off")).addClass("hidden"),$j("#"+r+"_onoff ."+(n==1?"on":"off")).removeClass("hidden"),t.val(n)}),$j("img[rel^=#]").click(function(t){return e(t),menu=$j($j(this).attr("rel")),t.preventDefault(),t.stopPropagation(),menu.attr("popup")=="false"?!1:(menu.css("display")=="none"?($j(this).parent().addClass("selected"),menu.show(),menu.attr("id")=="nav-notifications-menu"&&$j(".main-container").hide(),last_popup_menu=menu,last_popup_button=$j(this).parent()):($j(this).parent().removeClass("selected"),menu.hide(),menu.attr("id")=="nav-notifications-menu"&&$j(".main-container").show(),last_popup_menu=null,last_popup_button=null),!1)}),$j("html").click(function(t){e(t)});var t=unescape($j("#nav-notifications-template[rel=template]").html()),n=unescape($j("
").append($j("#nav-notifications-see-all").clone()).html()),r=unescape($j("
").append($j("#nav-notifications-mark-all").clone()).html()),i=unescape($j("#nav-notifications-menu").html());$j("nav").bind("nav-update",function(e,s){var o=$j(s).find("invalid").text();o==1&&(window.location.href=window.location.href);var u=$j(s).find("net").text();u==0?(u="",$j("#net-update").removeClass("show")):$j("#net-update").addClass("show"),$j("#net-update").html(u);var a=$j(s).find("home").text();a==0?(a="",$j("#home-update").removeClass("show")):$j("#home-update").addClass("show"),$j("#home-update").html(a);var f=$j(s).find("intro").text();f==0?(f="",$j("#intro-update").removeClass("show")):$j("#intro-update").addClass("show"),$j("#intro-update").html(f);var l=$j(s).find("mail").text();l==0?(l="",$j("#mail-update").removeClass("show")):$j("#mail-update").addClass("show"),$j("#mail-update").html(l);var f=$j(s).find("intro").text();f==0?(f="",$j("#intro-update-li").removeClass("show")):$j("#intro-update-li").addClass("show"),$j("#intro-update-li").html(f);var l=$j(s).find("mail").text();l==0?(l="",$j("#mail-update-li").removeClass("show")):$j("#mail-update-li").addClass("show"),$j("#mail-update-li").html(l);var c=$j(s).find("notif");c.children("note").length==0?$j("#nav-notifications-menu").html(i):(nnm=$j("#nav-notifications-menu"),nnm.html(n+r),c.children("note").each(function(){e=$j(this),text=e.text().format(""+e.attr("name")+""),html=t.format(e.attr("href"),e.attr("photo"),text,e.attr("date"),e.attr("seen")),nnm.append(html)})),notif=c.attr("count"),notif>0?$j("#nav-notifications-linkmenu").addClass("on"):$j("#nav-notifications-linkmenu").removeClass("on"),notif==0?(notif="",$j("#notify-update").removeClass("show")):$j("#notify-update").addClass("show"),$j("#notify-update").html(notif);var h=$j(s).find("sysmsgs");h.children("notice").each(function(){text=$j(this).text(),$j.jGrowl(text,{sticky:!1,theme:"notice",life:1e3})}),h.children("info").each(function(){text=$j(this).text(),$j.jGrowl(text,{sticky:!1,theme:"info",life:1e3})})}),NavUpdate()});var lockvisible=!1;String.prototype.format=function(){var e=this;for(var t=0;t img").not(function(){return this.complete}),n=t.length;n?t.load(function(){n--,n||collapseHeight()}):collapseHeight()})}function collapseHeight(){$j(".wall-item-body").each(function(){$j(this).height()>410&&($j(this).hasClass("divmore")||($j(this).divgrow({initialHeight:400,showBrackets:!1,speed:300}),$j(this).addClass("divmore")))})}function imgbright(e){$j(e).removeClass("drophide").addClass("drop")}function imgdull(e){$j(e).removeClass("drop").addClass("drophide")}function dolike(e,t){unpause(),$j("#like-rotator-"+e.toString()).show(),$j.get("like/"+e.toString()+"?verb="+t,NavUpdate),liking=1}function dostar(e){e=e.toString(),$j.get("starred/"+e,function(t){t.match(/1/)?($j("#starred-"+e).addClass("starred"),$j("#starred-"+e).removeClass("unstarred"),$j("#star-"+e).addClass("hidden"),$j("#unstar-"+e).removeClass("hidden")):($j("#starred-"+e).addClass("unstarred"),$j("#starred-"+e).removeClass("starred"),$j("#star-"+e).removeClass("hidden"),$j("#unstar-"+e).addClass("hidden"))})}function getPosition(e){var t={x:0,y:0};if(e.pageX||e.pageY)t.x=e.pageX,t.y=e.pageY;else if(e.clientX||e.clientY)t.x=e.clientX+(document.documentElement.scrollLeft||document.body.scrollLeft)-document.documentElement.clientLeft,t.y=e.clientY+(document.documentElement.scrollTop||document.body.scrollTop)-document.documentElement.clientTop;else if(e.x||e.y)t.x=e.x,t.y=e.y;return t}function lockview(e,t){e=e||window.event,cursor=getPosition(e),lockvisible?lockviewhide():(lockvisible=!0,$j.get("lockview/"+t,function(e){$j("#panel").html(e),$j("#panel").css({left:cursor.x+5,top:cursor.y+5}),$j("#panel").show()}))}function lockviewhide(){lockvisible=!1,$j("#panel").hide()}function post_comment(e){return unpause(),commentBusy=!0,$j("body").css("cursor","wait"),$j("#comment-preview-inp-"+e).val("0"),$j.post("item",$j("#comment-edit-form-"+e).serialize(),function(t){if(t.success){$j("#comment-edit-wrapper-"+e).hide(),$j("#comment-edit-text-"+e).val("");var n=document.getElementById("comment-edit-text-"+e);n&&commentClose(n,e),timer&&clearTimeout(timer),timer=setTimeout(NavUpdate,10)}t.reload&&(window.location.href=t.reload)},"json"),!1}function preview_comment(e){return $j("#comment-preview-inp-"+e).val("1"),$j("#comment-edit-preview-"+e).show(),$j.post("item",$j("#comment-edit-form-"+e).serialize(),function(t){t.preview&&($j("#comment-edit-preview-"+e).html(t.preview),$j("#comment-edit-preview-"+e+" a").click(function(){return!1}))},"json"),!0}function preview_post(){return $j("#jot-preview").val("1"),$j("#jot-preview-content").show(),tinyMCE.triggerSave(),$j.post("item",$j("#profile-jot-form").serialize(),function(e){e.preview&&($j("#jot-preview-content").html(e.preview),$j("#jot-preview-content a").click(function(){return!1}))},"json"),$j("#jot-preview").val("0"),!0}function unpause(){totStopped=!1,stopped=!1,$j("#pause").html("")}function bin2hex(e){var t,n,r=0,i=[];e+="",r=e.length;for(n=0;n'+e.desc+'
'+e.version+'
'+e.credits+'
'+theme+'')})}var src=null,prev=null,livetime=null,msie=!1,stopped=!1,totStopped=!1,timer=null,pr=0,liking=0,in_progress=!1,langSelect=!1,commentBusy=!1,last_popup_menu=null,last_popup_button=null;$j(function(){function e(e){last_popup_menu&&"#"+last_popup_menu.attr("id")!==$j(e.target).attr("rel")&&(last_popup_menu.hide(),last_popup_button.removeClass("selected"),last_popup_menu=null,last_popup_button=null)}$j.ajaxSetup({cache:!1}),msie=$j.browser.msie,$j(".onoff input").each(function(){val=$j(this).val(),id=$j(this).attr("id"),$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden")}),$j(".onoff > a").click(function(e){e.preventDefault();var t=$j(this).siblings("input"),n=1-t.val(),r=t.attr("id");$j("#"+r+"_onoff ."+(n==0?"on":"off")).addClass("hidden"),$j("#"+r+"_onoff ."+(n==1?"on":"off")).removeClass("hidden"),t.val(n)}),setupFieldRichtext(),$j("a[rel^=#]").click(function(t){return e(t),menu=$j($j(this).attr("rel")),t.preventDefault(),t.stopPropagation(),menu.attr("popup")=="false"?!1:($j(this).parent().toggleClass("selected"),menu.slideToggle("fast"),menu.css("display")=="none"?(last_popup_menu=null,last_popup_button=null):(last_popup_menu=menu,last_popup_button=$j(this).parent()),!1)}),$j("html").click(function(t){e(t)}),$j("a.popupbox").fancybox({transitionIn:"none",transitionOut:"none"});var t=unescape($j("#nav-notifications-template[rel=template]").html()),n=unescape($j("
").append($j("#nav-notifications-see-all").clone()).html()),r=unescape($j("
").append($j("#nav-notifications-mark-all").clone()).html()),i=unescape($j("#nav-notifications-menu").html());$j("nav").bind("nav-update",function(e,s){var o=$j(s).find("invalid").text();o==1&&(window.location.href=window.location.href);var u=$j(s).find("net").text();u==0?(u="",$j("#net-update").removeClass("show")):$j("#net-update").addClass("show"),$j("#net-update").html(u);var a=$j(s).find("home").text();a==0?(a="",$j("#home-update").removeClass("show")):$j("#home-update").addClass("show"),$j("#home-update").html(a);var f=$j(s).find("intro").text();f==0?(f="",$j("#intro-update").removeClass("show")):$j("#intro-update").addClass("show"),$j("#intro-update").html(f);var l=$j(s).find("mail").text();l==0?(l="",$j("#mail-update").removeClass("show")):$j("#mail-update").addClass("show"),$j("#mail-update").html(l);var f=$j(s).find("intro").text();f==0?(f="",$j("#intro-update-li").removeClass("show")):$j("#intro-update-li").addClass("show"),$j("#intro-update-li").html(f);var l=$j(s).find("mail").text();l==0?(l="",$j("#mail-update-li").removeClass("show")):$j("#mail-update-li").addClass("show"),$j("#mail-update-li").html(l);var c=$j(s).find("notif");c.children("note").length==0?$j("#nav-notifications-menu").html(i):(nnm=$j("#nav-notifications-menu"),nnm.html(n+r),c.children("note").each(function(){e=$j(this),text=e.text().format(""+e.attr("name")+""),html=t.format(e.attr("href"),e.attr("photo"),text,e.attr("date"),e.attr("seen")),nnm.append(html)})),notif=c.attr("count"),notif>0?$j("#nav-notifications-linkmenu").addClass("on"):$j("#nav-notifications-linkmenu").removeClass("on"),notif==0?(notif="",$j("#notify-update").removeClass("show")):$j("#notify-update").addClass("show"),$j("#notify-update").html(notif);var h=$j(s).find("sysmsgs");h.children("notice").each(function(){text=$j(this).text(),$j.jGrowl(text,{sticky:!1,theme:"notice",life:3e3})}),h.children("info").each(function(){text=$j(this).text(),$j.jGrowl(text,{sticky:!1,theme:"info",life:1e3})})}),NavUpdate(),$j(document).keydown(function(e){if(e.keyCode=="8"){var t=e.target||e.srcElement;if(!/input|textarea/i.test(t.nodeName))return!1}e.keyCode=="19"||e.ctrlKey&&e.which=="32"?(e.preventDefault(),stopped==0?(stopped=!0,e.ctrlKey&&(totStopped=!0),$j("#pause").html('pause')):unpause()):totStopped||unpause()})});var lockvisible=!1;String.prototype.format=function(){var e=this;for(var t=0;t Date: Thu, 1 Nov 2012 17:14:42 -0600 Subject: [PATCH 18/41] prevent double posting of status updates and comments --- boot.php | 7 ++++++ include/conversation.php | 3 ++- mod/content.php | 3 ++- mod/editpost.php | 3 ++- mod/item.php | 27 ++++++++++++++++++------ mod/photos.php | 9 +++++--- object/Item.php | 3 ++- view/comment_item.tpl | 1 + view/jot.tpl | 1 + view/theme/comix-plain/comment_item.tpl | 1 + view/theme/comix/comment_item.tpl | 1 + view/theme/diabook/comment_item.tpl | 1 + view/theme/diabook/jot.tpl | 1 + view/theme/dispy/comment_item.tpl | 1 + view/theme/dispy/jot.tpl | 1 + view/theme/duepuntozero/comment_item.tpl | 1 + view/theme/facepark/comment_item.tpl | 1 + view/theme/facepark/jot.tpl | 1 + view/theme/frost-mobile/comment_item.tpl | 1 + view/theme/frost-mobile/jot.tpl | 1 + view/theme/frost/comment_item.tpl | 1 + view/theme/frost/jot.tpl | 1 + view/theme/quattro/comment_item.tpl | 1 + view/theme/quattro/jot.tpl | 1 + view/theme/smoothly/jot.tpl | 1 + view/theme/testbubble/comment_item.tpl | 1 + view/theme/testbubble/jot.tpl | 1 + 27 files changed, 62 insertions(+), 13 deletions(-) diff --git a/boot.php b/boot.php index a96d223a0..d231d87d1 100644 --- a/boot.php +++ b/boot.php @@ -1796,3 +1796,10 @@ function curPageURL() { return $pageURL; } +function random_digits($digits) { + $rn = ''; + for($i = 0; $i < $digits; $i++) { + $rn .= rand(0,9); + } + return $rn; +} diff --git a/include/conversation.php b/include/conversation.php index 5f44cde7f..45736051d 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -993,7 +993,8 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { '$profile_uid' => $x['profile_uid'], '$preview' => t('Preview'), '$sourceapp' => t($a->sourcename), - '$cancel' => t('Cancel') + '$cancel' => t('Cancel'), + '$rand_num' => random_digits(12) )); diff --git a/mod/content.php b/mod/content.php index d827b5b57..e0634b3e8 100644 --- a/mod/content.php +++ b/mod/content.php @@ -701,7 +701,8 @@ function render_content(&$a, $items, $mode, $update, $preview = false) { '$edvideo' => t('Video'), '$preview' => t('Preview'), '$sourceapp' => t($a->sourcename), - '$ww' => (($mode === 'network') ? $commentww : '') + '$ww' => (($mode === 'network') ? $commentww : ''), + '$rand_num' => random_digits(12) )); } } diff --git a/mod/editpost.php b/mod/editpost.php index 75b686bcd..1dc6aea21 100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -139,7 +139,8 @@ function editpost_content(&$a) { '$preview' => t('Preview'), '$jotplugins' => $jotplugins, '$sourceapp' => t($a->sourcename), - '$cancel' => t('Cancel') + '$cancel' => t('Cancel'), + '$rand_num' => random_digits(12) )); return $o; diff --git a/mod/item.php b/mod/item.php index de6bce972..6dbe99dfd 100644 --- a/mod/item.php +++ b/mod/item.php @@ -46,6 +46,19 @@ function item_post(&$a) { $return_path = ((x($_REQUEST,'return')) ? $_REQUEST['return'] : ''); $preview = ((x($_REQUEST,'preview')) ? intval($_REQUEST['preview']) : 0); + + // Check for doubly-submitted posts, and reject duplicates + // Note that we have to ignore previews, otherwise nothing will post + // after it's been previewed + if(!$preview && x($_REQUEST['post_id_random'])) { + if(x($_SESSION['post-random']) && $_SESSION['post-random'] == $_REQUEST['post_id_random']) { + logger("item post: duplicate post", LOGGER_DEBUG); + item_post_return($a->get_baseurl(), $api_source, $return_path); + } + else + $_SESSION['post-random'] = $_REQUEST['post_id_random']; + } + /** * Is this a reply to something? */ @@ -98,7 +111,7 @@ function item_post(&$a) { // multi-level threading - preserve the info but re-parent to our single level threading //if(($parid) && ($parid != $parent)) - $thr_parent = $parent_uri; + $thr_parent = $parent_uri; if($parent_item['contact-id'] && $uid) { $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", @@ -873,30 +886,32 @@ function item_post(&$a) { logger('post_complete'); + item_post_return($a->get_baseurl(), $api_source, $return_path); + // NOTREACHED +} + +function item_post_return($baseurl, $api_source, $return_path) { // figure out how to return, depending on from whence we came if($api_source) return; if($return_path) { - goaway($a->get_baseurl() . "/" . $return_path); + goaway($baseurl . "/" . $return_path); } $json = array('success' => 1); if(x($_REQUEST,'jsreload') && strlen($_REQUEST['jsreload'])) - $json['reload'] = $a->get_baseurl() . '/' . $_REQUEST['jsreload']; + $json['reload'] = $baseurl . '/' . $_REQUEST['jsreload']; logger('post_json: ' . print_r($json,true), LOGGER_DEBUG); echo json_encode($json); killme(); - // NOTREACHED } - - function item_content(&$a) { if((! local_user()) && (! remote_user())) diff --git a/mod/photos.php b/mod/photos.php index 63b093dc3..fa4ca3fc0 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -1406,7 +1406,8 @@ function photos_content(&$a) { '$submit' => t('Submit'), '$preview' => t('Preview'), '$sourceapp' => t($a->sourcename), - '$ww' => '' + '$ww' => '', + '$rand_num' => random_digits(12) )); } } @@ -1449,7 +1450,8 @@ function photos_content(&$a) { '$submit' => t('Submit'), '$preview' => t('Preview'), '$sourceapp' => t($a->sourcename), - '$ww' => '' + '$ww' => '', + '$rand_num' => random_digits(12) )); } } @@ -1520,7 +1522,8 @@ function photos_content(&$a) { '$submit' => t('Submit'), '$preview' => t('Preview'), '$sourceapp' => t($a->sourcename), - '$ww' => '' + '$ww' => '', + '$rand_num' => random_digits(12) )); } } diff --git a/object/Item.php b/object/Item.php index 035255466..b5837b6b6 100644 --- a/object/Item.php +++ b/object/Item.php @@ -567,7 +567,8 @@ class Item extends BaseObject { '$preview' => t('Preview'), '$indent' => $indent, '$sourceapp' => t($a->sourcename), - '$ww' => (($conv->get_mode() === 'network') ? $ww : '') + '$ww' => (($conv->get_mode() === 'network') ? $ww : ''), + '$rand_num' => random_digits(12) )); } diff --git a/view/comment_item.tpl b/view/comment_item.tpl index 3de24ca8d..5783a409c 100644 --- a/view/comment_item.tpl +++ b/view/comment_item.tpl @@ -10,6 +10,7 @@ +
$mytitle diff --git a/view/jot.tpl b/view/jot.tpl index 91de628ac..0f2176681 100644 --- a/view/jot.tpl +++ b/view/jot.tpl @@ -14,6 +14,7 @@ +
diff --git a/view/theme/comix-plain/comment_item.tpl b/view/theme/comix-plain/comment_item.tpl index 9c3facaff..e3c686f05 100644 --- a/view/theme/comix-plain/comment_item.tpl +++ b/view/theme/comix-plain/comment_item.tpl @@ -6,6 +6,7 @@ +
$mytitle diff --git a/view/theme/comix/comment_item.tpl b/view/theme/comix/comment_item.tpl index 9c3facaff..e3c686f05 100644 --- a/view/theme/comix/comment_item.tpl +++ b/view/theme/comix/comment_item.tpl @@ -6,6 +6,7 @@ +
$mytitle diff --git a/view/theme/diabook/comment_item.tpl b/view/theme/diabook/comment_item.tpl index fc3594fdc..c5a24ec48 100644 --- a/view/theme/diabook/comment_item.tpl +++ b/view/theme/diabook/comment_item.tpl @@ -6,6 +6,7 @@ +
$mytitle diff --git a/view/theme/diabook/jot.tpl b/view/theme/diabook/jot.tpl index 1d94cb6d3..a9c0a3740 100644 --- a/view/theme/diabook/jot.tpl +++ b/view/theme/diabook/jot.tpl @@ -13,6 +13,7 @@ +
diff --git a/view/theme/dispy/comment_item.tpl b/view/theme/dispy/comment_item.tpl index aa63a03ed..765b41437 100644 --- a/view/theme/dispy/comment_item.tpl +++ b/view/theme/dispy/comment_item.tpl @@ -6,6 +6,7 @@ +
$mytitle diff --git a/view/theme/dispy/jot.tpl b/view/theme/dispy/jot.tpl index 12969dd03..580904485 100644 --- a/view/theme/dispy/jot.tpl +++ b/view/theme/dispy/jot.tpl @@ -9,6 +9,7 @@ +
diff --git a/view/theme/duepuntozero/comment_item.tpl b/view/theme/duepuntozero/comment_item.tpl index 87e060571..0f655ba43 100755 --- a/view/theme/duepuntozero/comment_item.tpl +++ b/view/theme/duepuntozero/comment_item.tpl @@ -10,6 +10,7 @@ +
$mytitle diff --git a/view/theme/facepark/comment_item.tpl b/view/theme/facepark/comment_item.tpl index 3503c3843..7e71aa380 100644 --- a/view/theme/facepark/comment_item.tpl +++ b/view/theme/facepark/comment_item.tpl @@ -6,6 +6,7 @@ +
$mytitle diff --git a/view/theme/facepark/jot.tpl b/view/theme/facepark/jot.tpl index 5fe1f954e..6b24045ef 100644 --- a/view/theme/facepark/jot.tpl +++ b/view/theme/facepark/jot.tpl @@ -14,6 +14,7 @@ +
diff --git a/view/theme/frost-mobile/comment_item.tpl b/view/theme/frost-mobile/comment_item.tpl index 570db6842..adcd5d75e 100755 --- a/view/theme/frost-mobile/comment_item.tpl +++ b/view/theme/frost-mobile/comment_item.tpl @@ -21,6 +21,7 @@ + $mytitle diff --git a/view/theme/frost-mobile/jot.tpl b/view/theme/frost-mobile/jot.tpl index b491f448d..7dd689378 100644 --- a/view/theme/frost-mobile/jot.tpl +++ b/view/theme/frost-mobile/jot.tpl @@ -15,6 +15,7 @@ +
diff --git a/view/theme/frost/comment_item.tpl b/view/theme/frost/comment_item.tpl index 32d4d78ef..380803807 100755 --- a/view/theme/frost/comment_item.tpl +++ b/view/theme/frost/comment_item.tpl @@ -20,6 +20,7 @@ + $mytitle diff --git a/view/theme/frost/jot.tpl b/view/theme/frost/jot.tpl index e7a89d8e0..9f7b71c53 100644 --- a/view/theme/frost/jot.tpl +++ b/view/theme/frost/jot.tpl @@ -14,6 +14,7 @@ +
diff --git a/view/theme/quattro/comment_item.tpl b/view/theme/quattro/comment_item.tpl index 7d1d7550b..3fbde1631 100644 --- a/view/theme/quattro/comment_item.tpl +++ b/view/theme/quattro/comment_item.tpl @@ -6,6 +6,7 @@ +
$mytitle diff --git a/view/theme/quattro/jot.tpl b/view/theme/quattro/jot.tpl index 7f9f9bbaf..55fc322d7 100644 --- a/view/theme/quattro/jot.tpl +++ b/view/theme/quattro/jot.tpl @@ -13,6 +13,7 @@ + diff --git a/view/theme/smoothly/jot.tpl b/view/theme/smoothly/jot.tpl index 437eec437..f990c95e1 100644 --- a/view/theme/smoothly/jot.tpl +++ b/view/theme/smoothly/jot.tpl @@ -14,6 +14,7 @@ +
diff --git a/view/theme/testbubble/comment_item.tpl b/view/theme/testbubble/comment_item.tpl index 6d9230dbf..1054b23e2 100644 --- a/view/theme/testbubble/comment_item.tpl +++ b/view/theme/testbubble/comment_item.tpl @@ -6,6 +6,7 @@ +
$mytitle diff --git a/view/theme/testbubble/jot.tpl b/view/theme/testbubble/jot.tpl index 89150534c..12f60b29c 100644 --- a/view/theme/testbubble/jot.tpl +++ b/view/theme/testbubble/jot.tpl @@ -16,6 +16,7 @@ +
From 6effdd570c4905d3921859c0780a093e544defcb Mon Sep 17 00:00:00 2001 From: Zach Prezkuta Date: Thu, 1 Nov 2012 17:42:40 -0600 Subject: [PATCH 19/41] add a confirm dialog and a busy rotator for delete selected --- include/conversation.php | 3 +- include/items.php | 4 +-- view/jot-header.tpl | 33 ++++++++++-------- view/theme/frost/jot-header.tpl | 1 + view/theme/frost/js/theme.js | 34 ++++++++++--------- view/theme/frost/threaded_conversation.tpl | 6 ++-- view/theme/quattro/threaded_conversation.tpl | 3 +- view/theme/smoothly/jot-header.tpl | 35 +++++++++++--------- view/theme/testbubble/jot-header.tpl | 33 ++++++++++-------- view/theme/vier/threaded_conversation.tpl | 3 +- view/threaded_conversation.tpl | 1 + 11 files changed, 91 insertions(+), 65 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index 45736051d..56d34f3d8 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -896,7 +896,8 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { '$audurl' => t("Please enter an audio link/URL:"), '$term' => t('Tag term:'), '$fileas' => t('Save to Folder:'), - '$whereareu' => t('Where are you right now?') + '$whereareu' => t('Where are you right now?'), + '$delitems' => t('Delete item(s)?') )); diff --git a/include/items.php b/include/items.php index 9203f663c..939cefc3d 100755 --- a/include/items.php +++ b/include/items.php @@ -3901,10 +3901,10 @@ function drop_item($id,$interactive = true) { // send the notification upstream/downstream as the case may be + proc_run('php',"include/notifier.php","drop","$drop_id"); + if(! $interactive) return $owner; - - proc_run('php',"include/notifier.php","drop","$drop_id"); goaway($a->get_baseurl() . '/' . $_SESSION['return_url']); //NOTREACHED } diff --git a/view/jot-header.tpl b/view/jot-header.tpl index 64bcf27ca..d6f39d6c4 100644 --- a/view/jot-header.tpl +++ b/view/jot-header.tpl @@ -158,21 +158,26 @@ function enableOnUser(){ }); function deleteCheckedItems() { - var checkedstr = ''; + if(confirm('$delitems')) { + var checkedstr = ''; - $('.item-select').each( function() { - if($(this).is(':checked')) { - if(checkedstr.length != 0) { - checkedstr = checkedstr + ',' + $(this).val(); - } - else { - checkedstr = $(this).val(); - } - } - }); - $.post('item', { dropitems: checkedstr }, function(data) { - window.location.reload(); - }); + $("#item-delete-selected").hide(); + $('#item-delete-selected-rotator').show(); + + $('.item-select').each( function() { + if($(this).is(':checked')) { + if(checkedstr.length != 0) { + checkedstr = checkedstr + ',' + $(this).val(); + } + else { + checkedstr = $(this).val(); + } + } + }); + $.post('item', { dropitems: checkedstr }, function(data) { + window.location.reload(); + }); + } } function jotGetLink() { diff --git a/view/theme/frost/jot-header.tpl b/view/theme/frost/jot-header.tpl index 16fd47317..04169beb5 100644 --- a/view/theme/frost/jot-header.tpl +++ b/view/theme/frost/jot-header.tpl @@ -12,5 +12,6 @@ window.baseURL = "$baseurl"; window.geoTag = function () { $geotag } window.ajaxType = 'jot-header'; + window.delItems = '$delitems'; diff --git a/view/theme/frost/js/theme.js b/view/theme/frost/js/theme.js index 37d06c80c..801b94e07 100644 --- a/view/theme/frost/js/theme.js +++ b/view/theme/frost/js/theme.js @@ -900,22 +900,26 @@ function wallInitEditor() { $j("#prvmail-text").contact_autocomplete(baseurl+"/acl"); } -function deleteCheckedItems() { - var checkedstr = ''; +function deleteCheckedItems(delID) { + if(confirm(window.delItems)) { + var checkedstr = ''; - $j('.item-select').each( function() { - if($j(this).is(':checked')) { - if(checkedstr.length != 0) { - checkedstr = checkedstr + ',' + $j(this).val(); - } - else { - checkedstr = $j(this).val(); - } - } - }); - $j.post('item', { dropitems: checkedstr }, function(data) { - window.location.reload(); - }); + $j(delID).hide(); + $j(delID + '-rotator').show(); + $j('.item-select').each( function() { + if($j(this).is(':checked')) { + if(checkedstr.length != 0) { + checkedstr = checkedstr + ',' + $j(this).val(); + } + else { + checkedstr = $j(this).val(); + } + } + }); + $j.post('item', { dropitems: checkedstr }, function(data) { + window.location.reload(); + }); + } } diff --git a/view/theme/frost/threaded_conversation.tpl b/view/theme/frost/threaded_conversation.tpl index 1e77f91c2..0f7f9a986 100644 --- a/view/theme/frost/threaded_conversation.tpl +++ b/view/theme/frost/threaded_conversation.tpl @@ -1,8 +1,9 @@ {{ if $dropping }} -