Merge remote-tracking branch 'remotes/friendica/master' into moveme

This commit is contained in:
Fabrixxm 2012-11-05 09:37:58 +01:00
commit 5b4944fe8e
126 changed files with 1348 additions and 1249 deletions

View file

@ -11,7 +11,7 @@ require_once('include/cache.php');
require_once('library/Mobile_Detect/Mobile_Detect.php'); require_once('library/Mobile_Detect/Mobile_Detect.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '3.0.1508' ); define ( 'FRIENDICA_VERSION', '3.0.1517' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1156 ); define ( 'DB_UPDATE_VERSION', 1156 );
@ -1516,9 +1516,9 @@ if(! function_exists('proc_run')) {
$cmdline = implode($args," "); $cmdline = implode($args," ");
if(get_config('system','proc_windows')) if(get_config('system','proc_windows'))
proc_close(proc_open('cmd /c start /b ' . $cmdline,array(),$foo)); proc_close(proc_open('cmd /c start /b ' . $cmdline,array(),$foo,dirname(__FILE__)));
else else
proc_close(proc_open($cmdline." &",array(),$foo)); proc_close(proc_open($cmdline." &",array(),$foo,dirname(__FILE__)));
} }
} }
@ -1806,3 +1806,10 @@ function curPageURL() {
return $pageURL; return $pageURL;
} }
function random_digits($digits) {
$rn = '';
for($i = 0; $i < $digits; $i++) {
$rn .= rand(0,9);
}
return $rn;
}

View file

@ -6,6 +6,8 @@ Friendica Documentation and Resources
* [Account Basics](help/Account-Basics) * [Account Basics](help/Account-Basics)
* [New User Quick Start](help/guide) * [New User Quick Start](help/guide)
* [Creating posts](help/Text_editor)
* [Comment, sort and delete posts](help/Text_comment)
* [Profiles](help/Profiles) * [Profiles](help/Profiles)
* [Connectors](help/Connectors) * [Connectors](help/Connectors)
* [Making Friends](help/Making-Friends) * [Making Friends](help/Making-Friends)

44
doc/Text_comment.md Normal file
View file

@ -0,0 +1,44 @@
Comment, sort and delete posts
==============
* [Home](help)
Here you can find an overview of the different ways to comment and sort existing posts. <span style="color: red;">Attention: we've used the <b>"diabook"</b> theme. If you're using another theme, some of the icons may be different.</span>
<img src="doc/img/diabook.png" width="308" height="42" alt="diabook" >
<i>The different icons</i>
<img src="doc/img/post_thumbs_up.png" width="27" height="32" alt="post_thumbs_up.png" align="left" style="padding-bottom: 10px;"> This symbol is used to indicate that you like the post. Click it twice to undo your choice.<p style="clear:both;"></p>
<img src="doc/img/post_thumbs_down.png" width="27" height="32" alt="post_thumbs_down.png" align="left" style="padding-bottom: 10px;"> This symbol is used to indicate that you <b>dislike</b> the post. Click it twice to undo your choice.
<p style="clear:both;"></p>
<img src="doc/img/post_share.png" width="27" height="32" alt="post_share.png" align="left" style="padding-bottom: 10px;"> This symbol is used to share a post. A copy of this post will automatically appear in your status editor and add a link to the original post.
<p style="clear:both;"></p>
<img src="doc/img/post_mark.png" width="27" height="32" alt="post_mark.png" align="left" style="padding-bottom: 10px;"> This symbol is used to mark a post. Marked posts will appear on your network page at the "starred" tab (from "star"). Click it twice to undo your choice.
<p style="clear:both;"></p>
<img src="doc/img/post_tag.png" width="27" height="41" alt="post_tag.png" align="left" style="padding-bottom: 10px;"> This symbol is used to tag a post with a self-chosen keyword. When you click at the word, you'll get a list of all posts with this tag. Attention: you can't delete the tag once you've set one.
<p style="clear:both;"></p>
<img src="doc/img/post_categorize.png" width="27" height="32" alt="post_categorize.png" align="left" style="padding-bottom: 20px;"> This symbol is used to categorize posts. Choose an existing folder or create a new one. You'll find the created folder on your network page under the "saved folders" tab.
<p style="clear:both;"></p>
<img src="doc/img/post_delete.png" width="27" height="32" alt="post_delete.png" align="left"> This symbol is used to delete your own post or to remove a post of another person from your stream.
<P style="clear: both;"></p>
<img src="doc/img/post_choose.png" width="27" height="32" alt="post_choose.png" align="left"> This symbol is used to choose more than one post to delete in a single step. After selecting all posts, go to the end of the page and click "Delete Selected Items".<P style="clear: both;"></p>
**Symbols of other themes**
Darkbubble <img src="doc/img/darkbubble.png" alt="darkbubble.png" style="padding-left: 20px; vertical-align:middle;">
Darkzero <img src="doc/img/darkzero.png" alt="darkzero.png" style="padding-left: 35px; vertical-align:middle;">
<span style="padding-left: 10px; font-style:italic;">(incl. more "zero"-themes, slackr, comix, easterbunny, facepark)</span>
Dispy <img src="doc/img/dispy.png" alt="dispy.png" style="padding-left: 57px; vertical-align:middle;"> <i>(incl. smoothly, testbubble)</i>
Frost Mobile <img src="doc/img/frost.png" alt="frost.png" style="padding-left: 16px; vertical-align:middle;">

40
doc/Text_editor.md Normal file
View file

@ -0,0 +1,40 @@
Creating posts
=================
* [Home](help)
Here you can find an overview of the different ways to create and edit your post. <span style="color: red;">Attention: we've used the <b>"diabook"</b> theme. If you're using another theme, some of the icons may be different.</span>
<img src="doc/img/friendica_editor.png" width="538" height="218" alt="editor">
<i>The different iconss</i>
<img src="doc/img/camera.png" width="44" height="33" alt="editor" align="left" style="padding-bottom: 20px;"> This symbol is used to upload a picture from your computer. If you only want to add an adress (url), you can also use the "tree" icon at the upper part of the editor. After selecting an image, you'll see a thumbnail in the editor.
<p style="clear:both;"></p>
<img src="doc/img/paper_clip.png" width="44" height="33" alt="paper_clip" align="left"> This symbol is used to add files from your computer. There'll be no preview of the content.
<p style="clear:both;"></p>
<img src="doc/img/chain.png" width="44" height="33" alt="chain" align="left"> This symbol is used to add a web address (url). You'll see a short preview of the website.
<p style="clear:both;"></p>
<img src="doc/img/video.png" width="44" height="33" alt="video" align="left"> This symbol is used to add a web address (url) of a video file. You'll see a small preview of the video.
<p style="clear:both;"></p>
<img src="doc/img/mic.png" width="44" height="33" alt="mic" align="left"> This symbol is used to add a web address (url) of an audio file. You'll see a player in your completed post.
<p style="clear:both;"></p>
<img src="doc/img/globe.png" width="44" height="33" alt="globe" align="left"> This symbol is used to add your geographic location. This location will be added into a Google Maps search. That's why a note like "New York" or "10004" is already enough.
<p style="clear:both;"></p>
**Symbols of other themes**
Cleanzero <img src="doc/img/editor_zero.png" alt="cleanzero.png" style="padding-left: 20px; vertical-align:middle;">
<span style="padding-left: 10px; font-style:italic;">(incl. more "zero"-themes, comix, easterbunny, facepark, slackr </span>
Darkbubble <img src="doc/img/editor_darkbubble.png" alt="darkbubble.png" style="padding-left: 14px; vertical-align:middle;"> <i>(inkl. smoothly, testbubble)</i>
Frost <img src="doc/img/editor_frost.png" alt="frost.png" style="padding-left: 42px; vertical-align:middle;">
Vier <img src="doc/img/editor_vier.png" alt="vier.png" style="padding-left: 44px; vertical-align:middle;"> <i>(inkl. dispy)</i>

View file

@ -5,4 +5,4 @@ Friendica - doc - german
Hier findest du die deutsche Version der Friendica-Hilfedateien. Es handelt sich um eine selbst erstellte, öffentlich freigegebene Arbeit mit dem Ziel, Friendica durch deutsche Hilfedateien für weitere Personen zugänglich zu machen, die dem Englischen nicht ausreichend mächtig sind. Hier findest du die deutsche Version der Friendica-Hilfedateien. Es handelt sich um eine selbst erstellte, öffentlich freigegebene Arbeit mit dem Ziel, Friendica durch deutsche Hilfedateien für weitere Personen zugänglich zu machen, die dem Englischen nicht ausreichend mächtig sind.
Die Daten basieren auf dem offiziellen Friendica-Github https://github.com/friendica/friendica (Stand 12.10.2012). Die Daten basieren auf dem offiziellen Friendica-Github https://github.com/friendica/friendica (Stand: 03.11.12)

View file

Before

Width:  |  Height:  |  Size: 828 B

After

Width:  |  Height:  |  Size: 828 B

View file

Before

Width:  |  Height:  |  Size: 709 B

After

Width:  |  Height:  |  Size: 709 B

View file

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

View file

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

View file

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

View file

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

View file

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

View file

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

View file

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

View file

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

View file

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

View file

Before

Width:  |  Height:  |  Size: 2 KiB

After

Width:  |  Height:  |  Size: 2 KiB

View file

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

View file

Before

Width:  |  Height:  |  Size: 1,017 B

After

Width:  |  Height:  |  Size: 1,017 B

View file

Before

Width:  |  Height:  |  Size: 393 B

After

Width:  |  Height:  |  Size: 393 B

View file

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

View file

Before

Width:  |  Height:  |  Size: 488 B

After

Width:  |  Height:  |  Size: 488 B

View file

Before

Width:  |  Height:  |  Size: 321 B

After

Width:  |  Height:  |  Size: 321 B

View file

Before

Width:  |  Height:  |  Size: 378 B

After

Width:  |  Height:  |  Size: 378 B

View file

Before

Width:  |  Height:  |  Size: 572 B

After

Width:  |  Height:  |  Size: 572 B

View file

Before

Width:  |  Height:  |  Size: 739 B

After

Width:  |  Height:  |  Size: 739 B

View file

Before

Width:  |  Height:  |  Size: 444 B

After

Width:  |  Height:  |  Size: 444 B

View file

Before

Width:  |  Height:  |  Size: 612 B

After

Width:  |  Height:  |  Size: 612 B

View file

Before

Width:  |  Height:  |  Size: 521 B

After

Width:  |  Height:  |  Size: 521 B

View file

Before

Width:  |  Height:  |  Size: 508 B

After

Width:  |  Height:  |  Size: 508 B

View file

Before

Width:  |  Height:  |  Size: 3 KiB

After

Width:  |  Height:  |  Size: 3 KiB

View file

Before

Width:  |  Height:  |  Size: 547 B

After

Width:  |  Height:  |  Size: 547 B

View file

@ -22,7 +22,8 @@ function user_remove($uid) {
$r[0]['nickname'] $r[0]['nickname']
); );
q("DELETE FROM `contact` WHERE `uid` = %d", intval($uid)); // don't delete yet, will be done later when contacts have deleted my stuff
// q("DELETE FROM `contact` WHERE `uid` = %d", intval($uid));
q("DELETE FROM `gcign` WHERE `uid` = %d", intval($uid)); q("DELETE FROM `gcign` WHERE `uid` = %d", intval($uid));
q("DELETE FROM `group` WHERE `uid` = %d", intval($uid)); q("DELETE FROM `group` WHERE `uid` = %d", intval($uid));
q("DELETE FROM `group_member` WHERE `uid` = %d", intval($uid)); q("DELETE FROM `group_member` WHERE `uid` = %d", intval($uid));
@ -41,7 +42,10 @@ function user_remove($uid) {
q("DELETE FROM `pconfig` WHERE `uid` = %d", intval($uid)); q("DELETE FROM `pconfig` WHERE `uid` = %d", intval($uid));
q("DELETE FROM `search` WHERE `uid` = %d", intval($uid)); q("DELETE FROM `search` WHERE `uid` = %d", intval($uid));
q("DELETE FROM `spam` WHERE `uid` = %d", intval($uid)); q("DELETE FROM `spam` WHERE `uid` = %d", intval($uid));
q("DELETE FROM `user` WHERE `uid` = %d", intval($uid)); // don't delete yet, will be done later when contacts have deleted my stuff
// q("DELETE FROM `user` WHERE `uid` = %d", intval($uid));
q("UPDATE `user` SET `account_removed` = 1, `account_expires_on` = UTC_TIMESTAMP() WHERE `uid` = %d", intval($uid));
proc_run('php', "include/notifier.php", "removeme", $uid);
if($uid == local_user()) { if($uid == local_user()) {
unset($_SESSION['authenticated']); unset($_SESSION['authenticated']);
unset($_SESSION['uid']); unset($_SESSION['uid']);
@ -165,6 +169,7 @@ function mark_for_death($contact) {
q("update contact set `archive` = 1 where id = %d limit 1", q("update contact set `archive` = 1 where id = %d limit 1",
intval($contact['id']) intval($contact['id'])
); );
q("UPDATE `item` SET `private` = 2 WHERE `contact-id` = %d AND `uid` = %d", intval($contact['id']), intval($contact['uid']));
//contact_remove($contact['id']); //contact_remove($contact['id']);

View file

@ -74,7 +74,7 @@
// process normal login request // process normal login request
$r = q("SELECT * FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' ) $r = q("SELECT * FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' )
AND `password` = '%s' AND `blocked` = 0 AND `account_expired` = 0 AND `verified` = 1 LIMIT 1", AND `password` = '%s' AND `blocked` = 0 AND `account_expired` = 0 AND `account_removed` = 0 AND `verified` = 1 LIMIT 1",
dbesc(trim($user)), dbesc(trim($user)),
dbesc(trim($user)), dbesc(trim($user)),
dbesc($encrypted) dbesc($encrypted)

View file

@ -59,7 +59,7 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
} }
$r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey` $r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey`
FROM `user` WHERE `uid` = %d AND `blocked` = 0 AND `account_expired` = 0 AND `verified` = 1 LIMIT 1", FROM `user` WHERE `uid` = %d AND `blocked` = 0 AND `account_expired` = 0 AND `account_removed` = 0 AND `verified` = 1 LIMIT 1",
intval($_SESSION['uid']) intval($_SESSION['uid'])
); );
@ -147,7 +147,7 @@ else {
$r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey` $r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey`
FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' ) FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' )
AND `password` = '%s' AND `blocked` = 0 AND `account_expired` = 0 AND `verified` = 1 LIMIT 1", AND `password` = '%s' AND `blocked` = 0 AND `account_expired` = 0 AND `account_removed` = 0 AND `verified` = 1 LIMIT 1",
dbesc(trim($_POST['username'])), dbesc(trim($_POST['username'])),
dbesc(trim($_POST['username'])), dbesc(trim($_POST['username'])),
dbesc($encrypted) dbesc($encrypted)

View file

@ -413,6 +413,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
if(!$update) { if(!$update) {
$tab = notags(trim($_GET['tab'])); $tab = notags(trim($_GET['tab']));
$tab = ( $tab ? $tab : 'posts' );
if($tab === 'posts') { if($tab === 'posts') {
// This is ugly, but we can't pass the profile_uid through the session to the ajax updater, // 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. // because browser prefetching might change it on us. We have to deliver it with the page.
@ -435,7 +436,11 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
else if($mode === 'display') { else if($mode === 'display') {
$profile_owner = $a->profile['uid']; $profile_owner = $a->profile['uid'];
$page_writeable = can_write_wall($a,$profile_owner); $page_writeable = can_write_wall($a,$profile_owner);
$live_update_div = '<div id="live-display"></div>' . "\r\n"; if(!$update) {
$live_update_div = '<div id="live-display"></div>' . "\r\n"
. "<script> var profile_uid = " . $_SESSION['uid'] . ";"
. " var profile_page = 1; </script>";
}
} }
else if($mode === 'community') { else if($mode === 'community') {
$profile_owner = 0; $profile_owner = 0;
@ -895,7 +900,8 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
'$audurl' => t("Please enter an audio link/URL:"), '$audurl' => t("Please enter an audio link/URL:"),
'$term' => t('Tag term:'), '$term' => t('Tag term:'),
'$fileas' => t('Save to Folder:'), '$fileas' => t('Save to Folder:'),
'$whereareu' => t('Where are you right now?') '$whereareu' => t('Where are you right now?'),
'$delitems' => t('Delete item(s)?')
)); ));
@ -992,7 +998,8 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
'$profile_uid' => $x['profile_uid'], '$profile_uid' => $x['profile_uid'],
'$preview' => t('Preview'), '$preview' => t('Preview'),
'$sourceapp' => t($a->sourcename), '$sourceapp' => t($a->sourcename),
'$cancel' => t('Cancel') '$cancel' => t('Cancel'),
'$rand_num' => random_digits(12)
)); ));
@ -1007,9 +1014,10 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
function get_item_children($arr, $parent) { function get_item_children($arr, $parent) {
$children = array(); $children = array();
$a = get_app();
foreach($arr as $item) { foreach($arr as $item) {
if($item['id'] != $item['parent']) { 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 // Fallback to parent-uri if thr-parent is not set
$thr_parent = $item['thr-parent']; $thr_parent = $item['thr-parent'];
if($thr_parent == '') if($thr_parent == '')

View file

@ -323,7 +323,7 @@ function delivery_run(&$argv, &$argc){
WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0 WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0
AND `contact`.`network` = '%s' AND `user`.`nickname` = '%s' AND `contact`.`network` = '%s' AND `user`.`nickname` = '%s'
$sql_extra $sql_extra
AND `user`.`account_expired` = 0 LIMIT 1", AND `user`.`account_expired` = 0 AND `user`.`account_removed` = 0 LIMIT 1",
dbesc(NETWORK_DFRN), dbesc(NETWORK_DFRN),
dbesc($nickname) dbesc($nickname)
); );

View file

@ -16,7 +16,7 @@ function diaspora_dispatch_public($msg) {
return; return;
} }
$r = q("SELECT `user`.* FROM `user` WHERE `user`.`uid` IN ( SELECT `contact`.`uid` FROM `contact` WHERE `contact`.`network` = '%s' AND `contact`.`addr` = '%s' ) AND `account_expired` = 0 ", $r = q("SELECT `user`.* FROM `user` WHERE `user`.`uid` IN ( SELECT `contact`.`uid` FROM `contact` WHERE `contact`.`network` = '%s' AND `contact`.`addr` = '%s' ) AND `account_expired` = 0 AND `account_removed` = 0 ",
dbesc(NETWORK_DIASPORA), dbesc(NETWORK_DIASPORA),
dbesc($msg['author']) dbesc($msg['author'])
); );

View file

@ -3958,10 +3958,10 @@ function drop_item($id,$interactive = true) {
// send the notification upstream/downstream as the case may be // send the notification upstream/downstream as the case may be
proc_run('php',"include/notifier.php","drop","$drop_id");
if(! $interactive) if(! $interactive)
return $owner; return $owner;
proc_run('php',"include/notifier.php","drop","$drop_id");
goaway($a->get_baseurl() . '/' . $_SESSION['return_url']); goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
//NOTREACHED //NOTREACHED
} }

View file

@ -134,13 +134,26 @@ function notifier_run(&$argv, &$argc){
$recipients[] = $suggest[0]['cid']; $recipients[] = $suggest[0]['cid'];
$item = $suggest[0]; $item = $suggest[0];
} }
elseif($cmd === 'removeme') {
$r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($item_id));
$user = $r[0];
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1", intval($item_id));
$self = $r[0];
$r = q("SELECT * FROM `contact` WHERE `self` = 0 AND `uid` = %d", intval($item_id));
if(! count($r))
return;
require_once('include/Contact.php');
foreach($r as $contact) {
terminate_friendship($user, $self, $contact);
}
return;
}
elseif($cmd === 'relocate') { elseif($cmd === 'relocate') {
$normal_mode = false; $normal_mode = false;
$relocate = true; $relocate = true;
$uid = $item_id; $uid = $item_id;
} }
else { else {
// find ancestors // find ancestors
$r = q("SELECT * FROM `item` WHERE `id` = %d and visible = 1 and moderated = 0 LIMIT 1", $r = q("SELECT * FROM `item` WHERE `id` = %d and visible = 1 and moderated = 0 LIMIT 1",
intval($item_id) intval($item_id)
@ -622,7 +635,7 @@ function notifier_run(&$argv, &$argc){
AND `contact`.`pending` = 0 AND `contact`.`pending` = 0
AND `contact`.`network` = '%s' AND `user`.`nickname` = '%s' AND `contact`.`network` = '%s' AND `user`.`nickname` = '%s'
$sql_extra $sql_extra
AND `user`.`account_expired` = 0 LIMIT 1", AND `user`.`account_expired` = 0 AND `user`.`account_removed` = 0 LIMIT 1",
dbesc(NETWORK_DFRN), dbesc(NETWORK_DFRN),
dbesc($nickname) dbesc($nickname)
); );

View file

@ -133,7 +133,7 @@ class FKOAuth1 extends OAuthServer {
function loginUser($uid){ function loginUser($uid){
logger("FKOAuth1::loginUser $uid"); logger("FKOAuth1::loginUser $uid");
$a = get_app(); $a = get_app();
$r = q("SELECT * FROM `user` WHERE uid=%d AND `blocked` = 0 AND `account_expired` = 0 AND `verified` = 1 LIMIT 1", $r = q("SELECT * FROM `user` WHERE uid=%d AND `blocked` = 0 AND `account_expired` = 0 AND `account_removed` = 0 AND `verified` = 1 LIMIT 1",
intval($uid) intval($uid)
); );
if(count($r)){ if(count($r)){

View file

@ -292,7 +292,12 @@ function onepoll_run(&$argv, &$argc){
logger("Mail: Parsing ".count($msgs)." mails for ".$mailconf[0]['user'], LOGGER_DEBUG); logger("Mail: Parsing ".count($msgs)." mails for ".$mailconf[0]['user'], LOGGER_DEBUG);
$metas = email_msg_meta($mbox,implode(',',$msgs)); $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); $msgs = array_combine($msgs, $metas);
foreach($msgs as $msg_uid => $meta) { foreach($msgs as $msg_uid => $meta) {
logger("Mail: Parsing mail ".$msg_uid, LOGGER_DATA); logger("Mail: Parsing mail ".$msg_uid, LOGGER_DATA);
@ -309,7 +314,7 @@ function onepoll_run(&$argv, &$argc){
); );
if(count($r)) { 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']) { if($meta->deleted && ! $r[0]['deleted']) {
q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `id` = %d LIMIT 1", q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `id` = %d LIMIT 1",
dbesc(datetime_convert()), dbesc(datetime_convert()),

View file

@ -67,6 +67,16 @@ function poller_run(&$argv, &$argc){
q("UPDATE user SET `account_expired` = 1 where `account_expired` = 0 q("UPDATE user SET `account_expired` = 1 where `account_expired` = 0
AND `account_expires_on` != '0000-00-00 00:00:00' AND `account_expires_on` != '0000-00-00 00:00:00'
AND `account_expires_on` < UTC_TIMESTAMP() "); AND `account_expires_on` < UTC_TIMESTAMP() ");
// delete user and contact records for recently removed accounts
$r = q("SELECT * FROM `user` WHERE `account_removed` = 1 AND `account_expires_on` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
if ($r) {
foreach($r as $user) {
q("DELETE FROM `contact` WHERE `uid` = %d", intval($user['uid']));
q("DELETE FROM `user` WHERE `uid` = %d", intval($user['uid']));
}
}
$abandon_days = intval(get_config('system','account_abandon_days')); $abandon_days = intval(get_config('system','account_abandon_days'));
if($abandon_days < 1) if($abandon_days < 1)
@ -154,7 +164,7 @@ function poller_run(&$argv, &$argc){
$sql_extra $sql_extra
AND `self` = 0 AND `contact`.`blocked` = 0 AND `contact`.`readonly` = 0 AND `self` = 0 AND `contact`.`blocked` = 0 AND `contact`.`readonly` = 0
AND `contact`.`archive` = 0 AND `contact`.`archive` = 0
AND `user`.`account_expired` = 0 $abandon_sql ORDER BY RAND()", AND `user`.`account_expired` = 0 AND `user`.`account_removed` = 0 $abandon_sql ORDER BY RAND()",
intval(CONTACT_IS_SHARING), intval(CONTACT_IS_SHARING),
intval(CONTACT_IS_FRIEND), intval(CONTACT_IS_FRIEND),
dbesc(NETWORK_DIASPORA), dbesc(NETWORK_DIASPORA),

View file

@ -7,20 +7,37 @@ function auto_redir(&$a, $contact_nick) {
if(local_user()) { 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.
//
// 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, "://");
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%%' AND blocked = 0 AND pending = 0 LIMIT 1",
dbesc($contact_nick), dbesc($contact_nick),
dbesc($a->user['nickname']), dbesc($a->user['nickname']),
dbesc(NETWORK_DFRN) dbesc($baseurl)
); );
if((!$r) || (! count($r)) || $r[0]['id'] == remote_user()) if((!$r) || (! count($r)) || $r[0]['id'] == remote_user())
return; 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($contact_nick),
dbesc(NETWORK_DFRN), dbesc(NETWORK_DFRN),
intval(local_user()) intval(local_user()),
dbesc($baseurl)
); );
if(! ($r && count($r))) if(! ($r && count($r)))
@ -52,7 +69,7 @@ function auto_redir(&$a, $contact_nick) {
$url = curPageURL(); $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 : ''); $dest = (($url) ? '&destination_url=' . $url : '');
goaway ($r[0]['poll'] . '?dfrn_id=' . $dfrn_id goaway ($r[0]['poll'] . '?dfrn_id=' . $dfrn_id
. '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile&sec=' . $sec . $dest ); . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile&sec=' . $sec . $dest );

View file

@ -250,12 +250,13 @@
if($('#live-profile').length) { src = 'profile'; liveUpdate(); } if($('#live-profile').length) { src = 'profile'; liveUpdate(); }
if($('#live-community').length) { src = 'community'; liveUpdate(); } if($('#live-community').length) { src = 'community'; liveUpdate(); }
if($('#live-notes').length) { src = 'notes'; liveUpdate(); } if($('#live-notes').length) { src = 'notes'; liveUpdate(); }
if($('#live-display').length) { if($('#live-display').length) { src = 'display'; liveUpdate(); }
/* if($('#live-display').length) {
if(liking) { if(liking) {
liking = 0; liking = 0;
window.location.href=window.location.href window.location.href=window.location.href
} }
} }*/
if($('#live-photos').length) { if($('#live-photos').length) {
if(liking) { if(liking) {
liking = 0; liking = 0;
@ -313,10 +314,26 @@
$('#' + prev).after($(this)); $('#' + prev).after($(this));
} }
else { else {
// Find out if the hidden comments are open, so we can keep it that way
// if a new comment has been posted
var id = $('.hide-comments-total', this).attr('id');
if(typeof id != 'undefined') {
id = id.split('-')[3];
var commentsOpen = $("#collapsed-comments-" + id).is(":visible");
}
$('img',this).each(function() { $('img',this).each(function() {
$(this).attr('src',$(this).attr('dst')); $(this).attr('src',$(this).attr('dst'));
}); });
//vScroll = $(document).scrollTop();
$('html').height($('html').height());
$('#' + ident).replaceWith($(this)); $('#' + ident).replaceWith($(this));
if(typeof id != 'undefined') {
if(commentsOpen) showHideComments(id);
}
$('html').height('auto');
//$(document).scrollTop(vScroll);
} }
prev = ident; prev = ident;
}); });
@ -503,6 +520,19 @@
function showHideComments(id) {
if( $("#collapsed-comments-" + id).is(":visible")) {
$("#collapsed-comments-" + id).hide();
$("#hide-comments-" + id).html(window.showMore);
}
else {
$("#collapsed-comments-" + id).show();
$("#hide-comments-" + id).html(window.showFewer);
}
}
function preview_post() { function preview_post() {
$("#jot-preview").val("1"); $("#jot-preview").val("1");
$("#jot-preview-content").show(); $("#jot-preview-content").show();

2
js/main.min.js vendored

File diff suppressed because one or more lines are too long

View file

@ -211,6 +211,9 @@ function contacts_content(&$a) {
intval($contact_id), intval($contact_id),
intval(local_user()) intval(local_user())
); );
if ($archived) {
q("UPDATE `item` SET `private` = 2 WHERE `contact-id` = %d AND `uid` = %d", intval($contact_id), intval(local_user()));
}
if($r) { if($r) {
//notice( t('Contact has been ') . (($archived) ? t('archived') : t('unarchived')) . EOL ); //notice( t('Contact has been ') . (($archived) ? t('archived') : t('unarchived')) . EOL );
info( (($archived) ? t('Contact has been archived') : t('Contact has been unarchived')) . EOL ); info( (($archived) ? t('Contact has been archived') : t('Contact has been unarchived')) . EOL );

View file

@ -701,7 +701,8 @@ function render_content(&$a, $items, $mode, $update, $preview = false) {
'$edvideo' => t('Video'), '$edvideo' => t('Video'),
'$preview' => t('Preview'), '$preview' => t('Preview'),
'$sourceapp' => t($a->sourcename), '$sourceapp' => t($a->sourcename),
'$ww' => (($mode === 'network') ? $commentww : '') '$ww' => (($mode === 'network') ? $commentww : ''),
'$rand_num' => random_digits(12)
)); ));
} }
} }

View file

@ -77,7 +77,7 @@ function dfrn_notify_post(&$a) {
FROM `contact` FROM `contact`
LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0 WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0
AND `user`.`nickname` = '%s' AND `user`.`account_expired` = 0 $sql_extra LIMIT 1", AND `user`.`nickname` = '%s' AND `user`.`account_expired` = 0 AND `user`.`account_removed` = 0 $sql_extra LIMIT 1",
dbesc($a->argv[1]) dbesc($a->argv[1])
); );
@ -220,7 +220,7 @@ function dfrn_notify_content(&$a) {
$r = q("SELECT `contact`.*, `user`.`nickname`, `user`.`page-flags` FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid` $r = q("SELECT `contact`.*, `user`.`nickname`, `user`.`page-flags` FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid`
WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `user`.`nickname` = '%s' WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `user`.`nickname` = '%s'
AND `user`.`account_expired` = 0 $sql_extra LIMIT 1", AND `user`.`account_expired` = 0 AND `user`.`account_removed` = 0 $sql_extra LIMIT 1",
dbesc($a->argv[1]) dbesc($a->argv[1])
); );

View file

@ -96,7 +96,7 @@ function dfrn_poll_init(&$a) {
$_SESSION['visitor_home'] = $r[0]['url']; $_SESSION['visitor_home'] = $r[0]['url'];
$_SESSION['visitor_handle'] = $r[0]['addr']; $_SESSION['visitor_handle'] = $r[0]['addr'];
$_SESSION['visitor_visiting'] = $r[0]['uid']; $_SESSION['visitor_visiting'] = $r[0]['uid'];
info( sprintf(t('%s welcomes %s'), $r[0]['username'] , $r[0]['name']) . EOL); info( sprintf(t('%1$s welcomes %2$s'), $r[0]['username'] , $r[0]['name']) . EOL);
// Visitors get 1 day session. // Visitors get 1 day session.
$session_id = session_id(); $session_id = session_id();
$expire = time() + 86400; $expire = time() + 86400;
@ -527,7 +527,7 @@ function dfrn_poll_content(&$a) {
$_SESSION['visitor_id'] = $r[0]['id']; $_SESSION['visitor_id'] = $r[0]['id'];
$_SESSION['visitor_home'] = $r[0]['url']; $_SESSION['visitor_home'] = $r[0]['url'];
$_SESSION['visitor_visiting'] = $r[0]['uid']; $_SESSION['visitor_visiting'] = $r[0]['uid'];
info( sprintf(t('%s welcomes %s'), $r[0]['username'] , $r[0]['name']) . EOL); info( sprintf(t('%1$s welcomes %2$s'), $r[0]['username'] , $r[0]['name']) . EOL);
// Visitors get 1 day session. // Visitors get 1 day session.
$session_id = session_id(); $session_id = session_id();
$expire = time() + 86400; $expire = time() + 86400;

View file

@ -1,7 +1,7 @@
<?php <?php
function display_content(&$a) { function display_content(&$a, $update = 0) {
if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
notice( t('Public access denied.') . EOL); notice( t('Public access denied.') . EOL);
@ -19,10 +19,20 @@ function display_content(&$a) {
$a->page['htmlhead'] .= get_markup_template('display-head.tpl'); $a->page['htmlhead'] .= get_markup_template('display-head.tpl');
$nick = (($a->argc > 1) ? $a->argv[1] : ''); if($update) {
$nick = $_REQUEST['nick'];
}
else {
$nick = (($a->argc > 1) ? $a->argv[1] : '');
}
profile_load($a,$nick); profile_load($a,$nick);
$item_id = (($a->argc > 2) ? intval($a->argv[2]) : 0); if($update) {
$item_id = $_REQUEST['item_id'];
}
else {
$item_id = (($a->argc > 2) ? intval($a->argv[2]) : 0);
}
if(! $item_id) { if(! $item_id) {
$a->error = 404; $a->error = 404;
@ -97,6 +107,18 @@ function display_content(&$a) {
$sql_extra = item_permissions_sql($a->profile['uid'],$remote_contact,$groups); $sql_extra = item_permissions_sql($a->profile['uid'],$remote_contact,$groups);
if($update) {
$r = q("SELECT id FROM item WHERE item.uid = %d
AND `item`.`parent` = ( SELECT `parent` FROM `item` WHERE ( `id` = '%s' OR `uri` = '%s' ))
$sql_extra AND unseen = 1",
intval($a->profile['uid']),
dbesc($item_id),
dbesc($item_id)
);
if(!$r)
return '';
}
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, $r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
`contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`, `contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
@ -124,8 +146,10 @@ function display_content(&$a) {
} }
$items = conv_sort($r,"`commented`"); $items = conv_sort($r,"`commented`");
$o .= conversation($a,$items,'display', false); if(!$update)
$o .= "<script> var netargs = '?f=&nick=" . $nick . "&item_id=" . $item_id . "'; </script>";
$o .= conversation($a,$items,'display', $update);
} }
else { else {

View file

@ -139,7 +139,8 @@ function editpost_content(&$a) {
'$preview' => t('Preview'), '$preview' => t('Preview'),
'$jotplugins' => $jotplugins, '$jotplugins' => $jotplugins,
'$sourceapp' => t($a->sourcename), '$sourceapp' => t($a->sourcename),
'$cancel' => t('Cancel') '$cancel' => t('Cancel'),
'$rand_num' => random_digits(12)
)); ));
return $o; return $o;

View file

@ -25,9 +25,10 @@ function home_content(&$a) {
if(x($_SESSION,'mobile-theme')) if(x($_SESSION,'mobile-theme'))
unset($_SESSION['mobile-theme']); unset($_SESSION['mobile-theme']);
$o .= '<h1>' . ((x($a->config,'sitename')) ? sprintf( t("Welcome to %s") ,$a->config['sitename']) : "" ) . '</h1>';
if(file_exists('home.html')) if(file_exists('home.html'))
$o .= file_get_contents('home.html'); $o .= file_get_contents('home.html');
else $o .= '<h1>' . ((x($a->config,'sitename')) ? sprintf( t("Welcome to %s") ,$a->config['sitename']) : "" ) . '</h1>';
$o .= login(($a->config['register_policy'] == REGISTER_CLOSED) ? 0 : 1); $o .= login(($a->config['register_policy'] == REGISTER_CLOSED) ? 0 : 1);

View file

@ -46,6 +46,19 @@ function item_post(&$a) {
$return_path = ((x($_REQUEST,'return')) ? $_REQUEST['return'] : ''); $return_path = ((x($_REQUEST,'return')) ? $_REQUEST['return'] : '');
$preview = ((x($_REQUEST,'preview')) ? intval($_REQUEST['preview']) : 0); $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? * 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 // multi-level threading - preserve the info but re-parent to our single level threading
//if(($parid) && ($parid != $parent)) //if(($parid) && ($parid != $parent))
$thr_parent = $parent_uri; $thr_parent = $parent_uri;
if($parent_item['contact-id'] && $uid) { if($parent_item['contact-id'] && $uid) {
$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
@ -873,30 +886,32 @@ function item_post(&$a) {
logger('post_complete'); 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 // figure out how to return, depending on from whence we came
if($api_source) if($api_source)
return; return;
if($return_path) { if($return_path) {
goaway($a->get_baseurl() . "/" . $return_path); goaway($baseurl . "/" . $return_path);
} }
$json = array('success' => 1); $json = array('success' => 1);
if(x($_REQUEST,'jsreload') && strlen($_REQUEST['jsreload'])) 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); logger('post_json: ' . print_r($json,true), LOGGER_DEBUG);
echo json_encode($json); echo json_encode($json);
killme(); killme();
// NOTREACHED
} }
function item_content(&$a) { function item_content(&$a) {
if((! local_user()) && (! remote_user())) if((! local_user()) && (! remote_user()))

View file

@ -245,7 +245,7 @@ function notifications_content(&$a) {
$notif_content = ''; $notif_content = '';
if (count($r) > 0) { if ($r) {
foreach ($r as $it) { foreach ($r as $it) {
switch($it['verb']){ switch($it['verb']){

View file

@ -27,7 +27,7 @@ function openid_content(&$a) {
$r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey` $r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey`
FROM `user` WHERE `openid` = '%s' AND `blocked` = 0 FROM `user` WHERE `openid` = '%s' AND `blocked` = 0
AND `account_expired` = 0 AND `verified` = 1 LIMIT 1", AND `account_expired` = 0 AND `account_removed` = 0 AND `verified` = 1 LIMIT 1",
dbesc($authid) dbesc($authid)
); );

View file

@ -27,6 +27,11 @@ function photos_init(&$a) {
if(! count($r)) if(! count($r))
return; return;
$o .= '<div class="vcard">';
$o .= '<div class="fn">' . $a->data['user']['username'] . '</div>';
$o .= '<div id="profile-photo-wrapper"><img class="photo" style="width: 175px; height: 175px;" src="' . $a->get_cached_avatar_image($a->get_baseurl() . '/photo/profile/' . $a->data['user']['uid'] . '.jpg') . '" alt="' . $a->data['user']['username'] . '" /></div>';
$o .= '</div>';
$a->data['user'] = $r[0]; $a->data['user'] = $r[0];
$sql_extra = permissions_sql($a->data['user']['uid']); $sql_extra = permissions_sql($a->data['user']['uid']);
@ -38,11 +43,6 @@ function photos_init(&$a) {
if(count($albums)) { if(count($albums)) {
$a->data['albums'] = $albums; $a->data['albums'] = $albums;
$o .= '<div class="vcard">';
$o .= '<div class="fn">' . $a->data['user']['username'] . '</div>';
$o .= '<div id="profile-photo-wrapper"><img class="photo" style="width: 175px; height: 175px;" src="' . $a->get_cached_avatar_image($a->get_baseurl() . '/photo/profile/' . $a->data['user']['uid'] . '.jpg') . '" alt="' . $a->data['user']['username'] . '" /></div>';
$o .= '</div>';
$albums_visible = ((intval($a->data['user']['hidewall']) && (! local_user()) && (! remote_user())) ? false : true); $albums_visible = ((intval($a->data['user']['hidewall']) && (! local_user()) && (! remote_user())) ? false : true);
if($albums_visible) { if($albums_visible) {
@ -603,7 +603,7 @@ function photos_post(&$a) {
$arr['tag'] = $tagged[4]; $arr['tag'] = $tagged[4];
$arr['inform'] = $tagged[2]; $arr['inform'] = $tagged[2];
$arr['origin'] = 1; $arr['origin'] = 1;
$arr['body'] = '[url=' . $tagged[1] . ']' . $tagged[0] . '[/url]' . ' ' . t('was tagged in a') . ' ' . '[url=' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . t('photo') . '[/url]' . ' ' . t('by') . ' ' . '[url=' . $owner_record['url'] . ']' . $owner_record['name'] . '[/url]' ; $arr['body'] = sprintf( t('%1$s was tagged in %2$s by %3$s'), '[url=' . $tagged[1] . ']' . $tagged[0] . '[/url]', '[url=' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . t('a photo') . '[/url]', '[url=' . $owner_record['url'] . ']' . $owner_record['name'] . '[/url]') ;
$arr['body'] .= "\n\n" . '[url=' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . '[img]' . $a->get_baseurl() . "/photo/" . $p[0]['resource-id'] . '-' . $best . '.' . $ext . '[/img][/url]' . "\n" ; $arr['body'] .= "\n\n" . '[url=' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . '[img]' . $a->get_baseurl() . "/photo/" . $p[0]['resource-id'] . '-' . $best . '.' . $ext . '[/img][/url]' . "\n" ;
$arr['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $tagged[0] . '</title><id>' . $tagged[1] . '/' . $tagged[0] . '</id>'; $arr['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $tagged[0] . '</title><id>' . $tagged[1] . '/' . $tagged[0] . '</id>';
@ -1406,7 +1406,8 @@ function photos_content(&$a) {
'$submit' => t('Submit'), '$submit' => t('Submit'),
'$preview' => t('Preview'), '$preview' => t('Preview'),
'$sourceapp' => t($a->sourcename), '$sourceapp' => t($a->sourcename),
'$ww' => '' '$ww' => '',
'$rand_num' => random_digits(12)
)); ));
} }
} }
@ -1449,7 +1450,8 @@ function photos_content(&$a) {
'$submit' => t('Submit'), '$submit' => t('Submit'),
'$preview' => t('Preview'), '$preview' => t('Preview'),
'$sourceapp' => t($a->sourcename), '$sourceapp' => t($a->sourcename),
'$ww' => '' '$ww' => '',
'$rand_num' => random_digits(12)
)); ));
} }
} }
@ -1520,7 +1522,8 @@ function photos_content(&$a) {
'$submit' => t('Submit'), '$submit' => t('Submit'),
'$preview' => t('Preview'), '$preview' => t('Preview'),
'$sourceapp' => t($a->sourcename), '$sourceapp' => t($a->sourcename),
'$ww' => '' '$ww' => '',
'$rand_num' => random_digits(12)
)); ));
} }
} }

View file

@ -56,7 +56,7 @@ function poco_init(&$a) {
and uid in (select uid from pconfig where cat = 'system' and k = 'suggestme' and v = 1) "); and uid in (select uid from pconfig where cat = 'system' and k = 'suggestme' and v = 1) ");
} }
else { 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 ", $sql_extra ",
intval($user['uid']) intval($user['uid'])
); );
@ -81,7 +81,7 @@ function poco_init(&$a) {
} }
else { 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", $sql_extra LIMIT %d, %d",
intval($user['uid']), intval($user['uid']),
intval($startIndex), intval($startIndex),

View file

@ -20,7 +20,7 @@ function post_post(&$a) {
else { else {
$nickname = $a->argv[2]; $nickname = $a->argv[2];
$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' $r = q("SELECT * FROM `user` WHERE `nickname` = '%s'
AND `account_expired` = 0 LIMIT 1", AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
dbesc($nickname) dbesc($nickname)
); );
if(! count($r)) if(! count($r))

View file

@ -12,7 +12,7 @@ function profile_init(&$a) {
if($a->argc > 1) if($a->argc > 1)
$which = $a->argv[1]; $which = $a->argv[1];
else { else {
$r = q("select nickname from user where blocked = 0 and account_expired = 0 and verified = 1 order by rand() limit 1"); $r = q("select nickname from user where blocked = 0 and account_expired = 0 and account_removed = 0 and verified = 1 order by rand() limit 1");
if(count($r)) { if(count($r)) {
goaway($a->get_baseurl() . '/profile/' . $r[0]['nickname']); goaway($a->get_baseurl() . '/profile/' . $r[0]['nickname']);
} }

View file

@ -44,7 +44,7 @@ function pubsub_init(&$a) {
$subscribe = (($hub_mode === 'subscribe') ? 1 : 0); $subscribe = (($hub_mode === 'subscribe') ? 1 : 0);
$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 LIMIT 1", $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
dbesc($nick) dbesc($nick)
); );
if(! count($r)) { if(! count($r)) {
@ -112,7 +112,7 @@ function pubsub_post(&$a) {
$nick = (($a->argc > 1) ? notags(trim($a->argv[1])) : ''); $nick = (($a->argc > 1) ? notags(trim($a->argv[1])) : '');
$contact_id = (($a->argc > 2) ? intval($a->argv[2]) : 0 ); $contact_id = (($a->argc > 2) ? intval($a->argv[2]) : 0 );
$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 LIMIT 1", $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
dbesc($nick) dbesc($nick)
); );
if(! count($r)) if(! count($r))

View file

@ -31,7 +31,7 @@ function receive_post(&$a) {
$guid = $a->argv[2]; $guid = $a->argv[2];
$r = q("SELECT * FROM `user` WHERE `guid` = '%s' AND `account_expired` = 0 LIMIT 1", $r = q("SELECT * FROM `user` WHERE `guid` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
dbesc($guid) dbesc($guid)
); );
if(! count($r)) if(! count($r))

View file

@ -30,7 +30,7 @@ function salmon_post(&$a) {
$nick = (($a->argc > 1) ? notags(trim($a->argv[1])) : ''); $nick = (($a->argc > 1) ? notags(trim($a->argv[1])) : '');
$mentions = (($a->argc > 2 && $a->argv[2] === 'mention') ? true : false); $mentions = (($a->argc > 2 && $a->argv[2] === 'mention') ? true : false);
$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 LIMIT 1", $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
dbesc($nick) dbesc($nick)
); );
if(! count($r)) if(! count($r))

38
mod/update_display.php Normal file
View file

@ -0,0 +1,38 @@
<?php
// See update_profile.php for documentation
require_once('mod/display.php');
require_once('include/group.php');
function update_display_content(&$a) {
$profile_uid = intval($_GET['p']);
header("Content-type: text/html");
echo "<!DOCTYPE html><html><body>\r\n";
echo (($_GET['msie'] == 1) ? '<div>' : '<section>');
$text = display_content($a,$profile_uid);
$pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
$replace = "<img\${1} dst=\"\${2}\"";
$text = preg_replace($pattern, $replace, $text);
$replace = '<br />' . t('[Embedded content - reload page to view]') . '<br />';
$pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i";
$text = preg_replace($pattern, $replace, $text);
$pattern = "/<\s*video[^>]*>(.*?)<\s*\/\s*video>/i";
$text = preg_replace($pattern, $replace, $text);
$pattern = "/<\s*embed[^>]*>(.*?)<\s*\/\s*embed>/i";
$text = preg_replace($pattern, $replace, $text);
$pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i";
$text = preg_replace($pattern, $replace, $text);
echo str_replace("\t",' ',$text);
echo (($_GET['msie'] == 1) ? '</div>' : '</section>');
echo "</body></html>\r\n";
killme();
}

View file

@ -14,25 +14,25 @@ function update_network_content(&$a) {
echo (($_GET['msie'] == 1) ? '<div>' : '<section>'); echo (($_GET['msie'] == 1) ? '<div>' : '<section>');
$text = network_content($a,$profile_uid); $text = network_content($a,$profile_uid);
$pattern = "/<img([^>]*) src=\"([^\"]*)\"/"; $pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
$replace = "<img\${1} dst=\"\${2}\""; $replace = "<img\${1} dst=\"\${2}\"";
$text = preg_replace($pattern, $replace, $text); $text = preg_replace($pattern, $replace, $text);
$replace = '<br />' . t('[Embedded content - reload page to view]') . '<br />'; $replace = '<br />' . t('[Embedded content - reload page to view]') . '<br />';
$pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i"; $pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i";
$text = preg_replace($pattern, $replace, $text); $text = preg_replace($pattern, $replace, $text);
$pattern = "/<\s*video[^>]*>(.*?)<\s*\/\s*video>/i"; $pattern = "/<\s*video[^>]*>(.*?)<\s*\/\s*video>/i";
$text = preg_replace($pattern, $replace, $text); $text = preg_replace($pattern, $replace, $text);
$pattern = "/<\s*embed[^>]*>(.*?)<\s*\/\s*embed>/i"; $pattern = "/<\s*embed[^>]*>(.*?)<\s*\/\s*embed>/i";
$text = preg_replace($pattern, $replace, $text); $text = preg_replace($pattern, $replace, $text);
$pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i"; $pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i";
$text = preg_replace($pattern, $replace, $text); $text = preg_replace($pattern, $replace, $text);
echo str_replace("\t",' ',$text); echo str_replace("\t",' ',$text);
echo (($_GET['msie'] == 1) ? '</div>' : '</section>'); echo (($_GET['msie'] == 1) ? '</div>' : '</section>');
echo "</body></html>\r\n"; echo "</body></html>\r\n";
killme(); killme();
} }

View file

@ -519,7 +519,8 @@ class Item extends BaseObject {
* _ false on failure * _ false on failure
*/ */
private function get_comment_box($indent) { 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 ''; return '';
} }
@ -531,7 +532,6 @@ class Item extends BaseObject {
$ww = 'ww'; $ww = 'ww';
if($conv->is_writable() && $this->is_writable()) { if($conv->is_writable() && $this->is_writable()) {
$a = $this->get_app();
$qc = $qcomment = null; $qc = $qcomment = null;
/* /*
@ -545,7 +545,8 @@ class Item extends BaseObject {
$comment_box = replace_macros($template,array( $comment_box = replace_macros($template,array(
'$return_path' => '', '$return_path' => '',
'$threaded' => $this->is_threaded(), '$threaded' => $this->is_threaded(),
'$jsreload' => (($conv->get_mode() === 'display') ? $_SESSION['return_url'] : ''), // '$jsreload' => (($conv->get_mode() === 'display') ? $_SESSION['return_url'] : ''),
'$jsreload' => '',
'$type' => (($conv->get_mode() === 'profile') ? 'wall-comment' : 'net-comment'), '$type' => (($conv->get_mode() === 'profile') ? 'wall-comment' : 'net-comment'),
'$id' => $this->get_id(), '$id' => $this->get_id(),
'$parent' => $this->get_id(), '$parent' => $this->get_id(),
@ -567,7 +568,8 @@ class Item extends BaseObject {
'$preview' => t('Preview'), '$preview' => t('Preview'),
'$indent' => $indent, '$indent' => $indent,
'$sourceapp' => t($a->sourcename), '$sourceapp' => t($a->sourcename),
'$ww' => (($conv->get_mode() === 'network') ? $ww : '') '$ww' => (($conv->get_mode() === 'network') ? $ww : ''),
'$rand_num' => random_digits(12)
)); ));
} }

View file

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 3.0.1508\n" "Project-Id-Version: 3.0.1517\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-10-26 10:00-0700\n" "POT-Creation-Date: 2012-11-04 10:00-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -23,6 +23,7 @@ msgstr ""
#: ../../mod/update_notes.php:41 ../../mod/update_community.php:18 #: ../../mod/update_notes.php:41 ../../mod/update_community.php:18
#: ../../mod/update_network.php:22 ../../mod/update_profile.php:41 #: ../../mod/update_network.php:22 ../../mod/update_profile.php:41
#: ../../mod/update_display.php:22
msgid "[Embedded content - reload page to view]" msgid "[Embedded content - reload page to view]"
msgstr "" msgstr ""
@ -45,14 +46,14 @@ msgstr ""
#: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79 #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
#: ../../mod/wallmessage.php:103 ../../mod/attach.php:33 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33
#: ../../mod/group.php:19 ../../mod/viewcontacts.php:22 #: ../../mod/group.php:19 ../../mod/viewcontacts.php:22
#: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:126 #: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:139
#: ../../mod/item.php:142 ../../mod/mood.php:114 #: ../../mod/item.php:155 ../../mod/mood.php:114
#: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:169 #: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:169
#: ../../mod/profile_photo.php:180 ../../mod/profile_photo.php:193 #: ../../mod/profile_photo.php:180 ../../mod/profile_photo.php:193
#: ../../mod/message.php:38 ../../mod/message.php:168 #: ../../mod/message.php:38 ../../mod/message.php:168
#: ../../mod/allfriends.php:9 ../../mod/nogroup.php:25 #: ../../mod/allfriends.php:9 ../../mod/nogroup.php:25
#: ../../mod/wall_upload.php:64 ../../mod/follow.php:9 #: ../../mod/wall_upload.php:64 ../../mod/follow.php:9
#: ../../mod/display.php:141 ../../mod/profiles.php:7 #: ../../mod/display.php:165 ../../mod/profiles.php:7
#: ../../mod/profiles.php:424 ../../mod/delegate.php:6 #: ../../mod/profiles.php:424 ../../mod/delegate.php:6
#: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81 #: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81
#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510
@ -131,8 +132,8 @@ msgstr ""
#: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107 #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107
#: ../../mod/events.php:455 ../../mod/photos.php:1027 #: ../../mod/events.php:455 ../../mod/photos.php:1027
#: ../../mod/photos.php:1103 ../../mod/photos.php:1366 #: ../../mod/photos.php:1103 ../../mod/photos.php:1366
#: ../../mod/photos.php:1406 ../../mod/photos.php:1449 #: ../../mod/photos.php:1406 ../../mod/photos.php:1450
#: ../../mod/photos.php:1520 ../../mod/install.php:246 #: ../../mod/photos.php:1522 ../../mod/install.php:246
#: ../../mod/install.php:284 ../../mod/localtime.php:45 ../../mod/poke.php:199 #: ../../mod/install.php:284 ../../mod/localtime.php:45 ../../mod/poke.php:199
#: ../../mod/content.php:693 ../../mod/contacts.php:348 #: ../../mod/content.php:693 ../../mod/contacts.php:348
#: ../../mod/settings.php:543 ../../mod/settings.php:697 #: ../../mod/settings.php:543 ../../mod/settings.php:697
@ -178,10 +179,10 @@ msgstr ""
#: ../../addon/irc/irc.php:55 ../../addon/fromapp/fromapp.php:77 #: ../../addon/irc/irc.php:55 ../../addon/fromapp/fromapp.php:77
#: ../../addon/blogger/blogger.php:102 ../../addon/posterous/posterous.php:103 #: ../../addon/blogger/blogger.php:102 ../../addon/posterous/posterous.php:103
#: ../../view/theme/cleanzero/config.php:80 #: ../../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/diabook/config.php:152
#: ../../view/theme/quattro/config.php:64 ../../view/theme/dispy/config.php:70 #: ../../view/theme/quattro/config.php:64 ../../view/theme/dispy/config.php:70
#: ../../object/Item.php:558 ../../addon.old/fromgplus/fromgplus.php:40 #: ../../object/Item.php:559 ../../addon.old/fromgplus/fromgplus.php:40
#: ../../addon.old/facebook/facebook.php:619 #: ../../addon.old/facebook/facebook.php:619
#: ../../addon.old/snautofollow/snautofollow.php:64 #: ../../addon.old/snautofollow/snautofollow.php:64
#: ../../addon.old/bg/bg.php:90 ../../addon.old/fbpost/fbpost.php:226 #: ../../addon.old/bg/bg.php:90 ../../addon.old/fbpost/fbpost.php:226
@ -285,7 +286,7 @@ msgstr ""
msgid "link to source" msgid "link to source"
msgstr "" 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 #: ../../include/nav.php:52 ../../boot.php:1701
msgid "Events" msgid "Events"
msgstr "" msgstr ""
@ -359,7 +360,7 @@ msgstr ""
#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:142 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:142
#: ../../mod/dfrn_request.php:847 ../../mod/settings.php:544 #: ../../mod/dfrn_request.php:847 ../../mod/settings.php:544
#: ../../mod/settings.php:570 ../../addon/js_upload/js_upload.php:45 #: ../../mod/settings.php:570 ../../addon/js_upload/js_upload.php:45
#: ../../include/conversation.php:995 #: ../../include/conversation.php:1001
#: ../../addon.old/js_upload/js_upload.php:45 #: ../../addon.old/js_upload/js_upload.php:45
msgid "Cancel" msgid "Cancel"
msgstr "" msgstr ""
@ -384,7 +385,7 @@ msgstr ""
#: ../../mod/dfrn_poll.php:99 ../../mod/dfrn_poll.php:530 #: ../../mod/dfrn_poll.php:99 ../../mod/dfrn_poll.php:530
#, php-format #, php-format
msgid "%s welcomes %s" msgid "%1$s welcomes %2$s"
msgstr "" msgstr ""
#: ../../mod/api.php:76 ../../mod/api.php:102 #: ../../mod/api.php:76 ../../mod/api.php:102
@ -435,14 +436,14 @@ msgstr ""
#: ../../mod/photos.php:58 ../../mod/photos.php:153 ../../mod/photos.php:1008 #: ../../mod/photos.php:58 ../../mod/photos.php:153 ../../mod/photos.php:1008
#: ../../mod/photos.php:1095 ../../mod/photos.php:1110 #: ../../mod/photos.php:1095 ../../mod/photos.php:1110
#: ../../mod/photos.php:1562 ../../mod/photos.php:1574 #: ../../mod/photos.php:1565 ../../mod/photos.php:1577
#: ../../addon/communityhome/communityhome.php:110 #: ../../addon/communityhome/communityhome.php:110
#: ../../view/theme/diabook/theme.php:492 #: ../../view/theme/diabook/theme.php:485
#: ../../addon.old/communityhome/communityhome.php:110 #: ../../addon.old/communityhome/communityhome.php:110
msgid "Contact Photos" msgid "Contact Photos"
msgstr "" msgstr ""
#: ../../mod/photos.php:65 ../../mod/photos.php:1126 ../../mod/photos.php:1612 #: ../../mod/photos.php:65 ../../mod/photos.php:1126 ../../mod/photos.php:1615
msgid "Upload New Photos" msgid "Upload New Photos"
msgstr "" msgstr ""
@ -460,7 +461,7 @@ msgstr ""
#: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296 #: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296
#: ../../mod/profile_photo.php:305 #: ../../mod/profile_photo.php:305
#: ../../addon/communityhome/communityhome.php:111 #: ../../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 #: ../../include/user.php:331 ../../include/user.php:338
#: ../../addon.old/communityhome/communityhome.php:111 #: ../../addon.old/communityhome/communityhome.php:111
msgid "Profile Photos" msgid "Profile Photos"
@ -479,20 +480,12 @@ msgid "Delete Photo"
msgstr "" msgstr ""
#: ../../mod/photos.php:606 #: ../../mod/photos.php:606
msgid "was tagged in a" #, php-format
msgstr "" msgid "%1$s was tagged in %2$s by %3$s"
#: ../../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
#: ../../include/diaspora.php:1835 ../../include/conversation.php:125
#: ../../include/conversation.php:253
#: ../../addon.old/communityhome/communityhome.php:163
msgid "photo"
msgstr "" msgstr ""
#: ../../mod/photos.php:606 #: ../../mod/photos.php:606
msgid "by" msgid "a photo"
msgstr "" msgstr ""
#: ../../mod/photos.php:711 ../../addon/js_upload/js_upload.php:315 #: ../../mod/photos.php:711 ../../addon/js_upload/js_upload.php:315
@ -570,7 +563,7 @@ msgstr ""
msgid "Show Oldest First" msgid "Show Oldest First"
msgstr "" msgstr ""
#: ../../mod/photos.php:1146 ../../mod/photos.php:1595 #: ../../mod/photos.php:1146 ../../mod/photos.php:1598
msgid "View Photo" msgid "View Photo"
msgstr "" msgstr ""
@ -645,49 +638,49 @@ msgstr ""
msgid "I don't like this (toggle)" msgid "I don't like this (toggle)"
msgstr "" msgstr ""
#: ../../mod/photos.php:1386 ../../include/conversation.php:956 #: ../../mod/photos.php:1386 ../../include/conversation.php:962
msgid "Share" msgid "Share"
msgstr "" msgstr ""
#: ../../mod/photos.php:1387 ../../mod/editpost.php:118 #: ../../mod/photos.php:1387 ../../mod/editpost.php:118
#: ../../mod/content.php:482 ../../mod/content.php:845 #: ../../mod/content.php:482 ../../mod/content.php:846
#: ../../mod/wallmessage.php:152 ../../mod/message.php:293 #: ../../mod/wallmessage.php:152 ../../mod/message.php:293
#: ../../mod/message.php:481 ../../include/conversation.php:619 #: ../../mod/message.php:481 ../../include/conversation.php:624
#: ../../include/conversation.php:975 ../../object/Item.php:258 #: ../../include/conversation.php:981 ../../object/Item.php:258
msgid "Please wait" msgid "Please wait"
msgstr "" msgstr ""
#: ../../mod/photos.php:1403 ../../mod/photos.php:1446 #: ../../mod/photos.php:1403 ../../mod/photos.php:1447
#: ../../mod/photos.php:1517 ../../mod/content.php:690 #: ../../mod/photos.php:1519 ../../mod/content.php:690
#: ../../object/Item.php:555 #: ../../object/Item.php:556
msgid "This is you" msgid "This is you"
msgstr "" msgstr ""
#: ../../mod/photos.php:1405 ../../mod/photos.php:1448 #: ../../mod/photos.php:1405 ../../mod/photos.php:1449
#: ../../mod/photos.php:1519 ../../mod/content.php:692 ../../boot.php:585 #: ../../mod/photos.php:1521 ../../mod/content.php:692 ../../boot.php:585
#: ../../object/Item.php:557 #: ../../object/Item.php:558
msgid "Comment" msgid "Comment"
msgstr "" msgstr ""
#: ../../mod/photos.php:1407 ../../mod/photos.php:1450 #: ../../mod/photos.php:1407 ../../mod/photos.php:1451
#: ../../mod/photos.php:1521 ../../mod/editpost.php:139 #: ../../mod/photos.php:1523 ../../mod/editpost.php:139
#: ../../mod/content.php:702 ../../include/conversation.php:993 #: ../../mod/content.php:702 ../../include/conversation.php:999
#: ../../object/Item.php:567 #: ../../object/Item.php:568
msgid "Preview" msgid "Preview"
msgstr "" msgstr ""
#: ../../mod/photos.php:1489 ../../mod/content.php:439 #: ../../mod/photos.php:1491 ../../mod/content.php:439
#: ../../mod/content.php:723 ../../mod/settings.php:606 #: ../../mod/content.php:724 ../../mod/settings.php:606
#: ../../mod/group.php:168 ../../mod/admin.php:696 #: ../../mod/group.php:168 ../../mod/admin.php:696
#: ../../include/conversation.php:564 ../../object/Item.php:117 #: ../../include/conversation.php:569 ../../object/Item.php:117
msgid "Delete" msgid "Delete"
msgstr "" msgstr ""
#: ../../mod/photos.php:1601 #: ../../mod/photos.php:1604
msgid "View Album" msgid "View Album"
msgstr "" msgstr ""
#: ../../mod/photos.php:1610 #: ../../mod/photos.php:1613
msgid "Recent Photos" msgid "Recent Photos"
msgstr "" msgstr ""
@ -695,7 +688,7 @@ msgstr ""
msgid "Not available." msgid "Not available."
msgstr "" 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 #: ../../include/nav.php:101
msgid "Community" msgid "Community"
msgstr "" msgstr ""
@ -745,96 +738,96 @@ msgstr ""
msgid "Edit post" msgid "Edit post"
msgstr "" msgstr ""
#: ../../mod/editpost.php:88 ../../include/conversation.php:942 #: ../../mod/editpost.php:88 ../../include/conversation.php:948
msgid "Post to Email" msgid "Post to Email"
msgstr "" msgstr ""
#: ../../mod/editpost.php:103 ../../mod/content.php:710 #: ../../mod/editpost.php:103 ../../mod/content.php:711
#: ../../mod/settings.php:605 ../../object/Item.php:107 #: ../../mod/settings.php:605 ../../object/Item.php:107
msgid "Edit" msgid "Edit"
msgstr "" msgstr ""
#: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150 #: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150
#: ../../mod/message.php:291 ../../mod/message.php:478 #: ../../mod/message.php:291 ../../mod/message.php:478
#: ../../include/conversation.php:957 #: ../../include/conversation.php:963
msgid "Upload photo" msgid "Upload photo"
msgstr "" msgstr ""
#: ../../mod/editpost.php:105 ../../include/conversation.php:958 #: ../../mod/editpost.php:105 ../../include/conversation.php:964
msgid "upload photo" msgid "upload photo"
msgstr "" msgstr ""
#: ../../mod/editpost.php:106 ../../include/conversation.php:959 #: ../../mod/editpost.php:106 ../../include/conversation.php:965
msgid "Attach file" msgid "Attach file"
msgstr "" msgstr ""
#: ../../mod/editpost.php:107 ../../include/conversation.php:960 #: ../../mod/editpost.php:107 ../../include/conversation.php:966
msgid "attach file" msgid "attach file"
msgstr "" msgstr ""
#: ../../mod/editpost.php:108 ../../mod/wallmessage.php:151 #: ../../mod/editpost.php:108 ../../mod/wallmessage.php:151
#: ../../mod/message.php:292 ../../mod/message.php:479 #: ../../mod/message.php:292 ../../mod/message.php:479
#: ../../include/conversation.php:961 #: ../../include/conversation.php:967
msgid "Insert web link" msgid "Insert web link"
msgstr "" msgstr ""
#: ../../mod/editpost.php:109 ../../include/conversation.php:962 #: ../../mod/editpost.php:109 ../../include/conversation.php:968
msgid "web link" msgid "web link"
msgstr "" msgstr ""
#: ../../mod/editpost.php:110 ../../include/conversation.php:963 #: ../../mod/editpost.php:110 ../../include/conversation.php:969
msgid "Insert video link" msgid "Insert video link"
msgstr "" msgstr ""
#: ../../mod/editpost.php:111 ../../include/conversation.php:964 #: ../../mod/editpost.php:111 ../../include/conversation.php:970
msgid "video link" msgid "video link"
msgstr "" msgstr ""
#: ../../mod/editpost.php:112 ../../include/conversation.php:965 #: ../../mod/editpost.php:112 ../../include/conversation.php:971
msgid "Insert audio link" msgid "Insert audio link"
msgstr "" msgstr ""
#: ../../mod/editpost.php:113 ../../include/conversation.php:966 #: ../../mod/editpost.php:113 ../../include/conversation.php:972
msgid "audio link" msgid "audio link"
msgstr "" msgstr ""
#: ../../mod/editpost.php:114 ../../include/conversation.php:967 #: ../../mod/editpost.php:114 ../../include/conversation.php:973
msgid "Set your location" msgid "Set your location"
msgstr "" msgstr ""
#: ../../mod/editpost.php:115 ../../include/conversation.php:968 #: ../../mod/editpost.php:115 ../../include/conversation.php:974
msgid "set location" msgid "set location"
msgstr "" msgstr ""
#: ../../mod/editpost.php:116 ../../include/conversation.php:969 #: ../../mod/editpost.php:116 ../../include/conversation.php:975
msgid "Clear browser location" msgid "Clear browser location"
msgstr "" msgstr ""
#: ../../mod/editpost.php:117 ../../include/conversation.php:970 #: ../../mod/editpost.php:117 ../../include/conversation.php:976
msgid "clear location" msgid "clear location"
msgstr "" msgstr ""
#: ../../mod/editpost.php:119 ../../include/conversation.php:976 #: ../../mod/editpost.php:119 ../../include/conversation.php:982
msgid "Permission settings" msgid "Permission settings"
msgstr "" msgstr ""
#: ../../mod/editpost.php:127 ../../include/conversation.php:985 #: ../../mod/editpost.php:127 ../../include/conversation.php:991
msgid "CC: email addresses" msgid "CC: email addresses"
msgstr "" msgstr ""
#: ../../mod/editpost.php:128 ../../include/conversation.php:986 #: ../../mod/editpost.php:128 ../../include/conversation.php:992
msgid "Public post" msgid "Public post"
msgstr "" msgstr ""
#: ../../mod/editpost.php:131 ../../include/conversation.php:972 #: ../../mod/editpost.php:131 ../../include/conversation.php:978
msgid "Set title" msgid "Set title"
msgstr "" msgstr ""
#: ../../mod/editpost.php:133 ../../include/conversation.php:974 #: ../../mod/editpost.php:133 ../../include/conversation.php:980
msgid "Categories (comma-separated list)" msgid "Categories (comma-separated list)"
msgstr "" msgstr ""
#: ../../mod/editpost.php:134 ../../include/conversation.php:988 #: ../../mod/editpost.php:134 ../../include/conversation.php:994
msgid "Example: bob@example.com, mary@example.com" msgid "Example: bob@example.com, mary@example.com"
msgstr "" msgstr ""
@ -1376,25 +1369,25 @@ msgstr ""
msgid "Group: " msgid "Group: "
msgstr "" msgstr ""
#: ../../mod/content.php:438 ../../mod/content.php:722 #: ../../mod/content.php:438 ../../mod/content.php:723
#: ../../include/conversation.php:563 ../../object/Item.php:116 #: ../../include/conversation.php:568 ../../object/Item.php:116
msgid "Select" msgid "Select"
msgstr "" msgstr ""
#: ../../mod/content.php:455 ../../mod/content.php:815 #: ../../mod/content.php:455 ../../mod/content.php:816
#: ../../mod/content.php:816 ../../include/conversation.php:582 #: ../../mod/content.php:817 ../../include/conversation.php:587
#: ../../object/Item.php:227 ../../object/Item.php:228 #: ../../object/Item.php:227 ../../object/Item.php:228
#, php-format #, php-format
msgid "View %s's profile @ %s" msgid "View %s's profile @ %s"
msgstr "" msgstr ""
#: ../../mod/content.php:465 ../../mod/content.php:827 #: ../../mod/content.php:465 ../../mod/content.php:828
#: ../../include/conversation.php:602 ../../object/Item.php:240 #: ../../include/conversation.php:607 ../../object/Item.php:240
#, php-format #, php-format
msgid "%s from %s" msgid "%s from %s"
msgstr "" msgstr ""
#: ../../mod/content.php:480 ../../include/conversation.php:617 #: ../../mod/content.php:480 ../../include/conversation.php:622
msgid "View in context" msgid "View in context"
msgstr "" msgstr ""
@ -1436,71 +1429,71 @@ msgstr ""
msgid "share" msgid "share"
msgstr "" msgstr ""
#: ../../mod/content.php:694 ../../object/Item.php:559 #: ../../mod/content.php:694 ../../object/Item.php:560
msgid "Bold" msgid "Bold"
msgstr "" msgstr ""
#: ../../mod/content.php:695 ../../object/Item.php:560 #: ../../mod/content.php:695 ../../object/Item.php:561
msgid "Italic" msgid "Italic"
msgstr "" msgstr ""
#: ../../mod/content.php:696 ../../object/Item.php:561 #: ../../mod/content.php:696 ../../object/Item.php:562
msgid "Underline" msgid "Underline"
msgstr "" msgstr ""
#: ../../mod/content.php:697 ../../object/Item.php:562 #: ../../mod/content.php:697 ../../object/Item.php:563
msgid "Quote" msgid "Quote"
msgstr "" msgstr ""
#: ../../mod/content.php:698 ../../object/Item.php:563 #: ../../mod/content.php:698 ../../object/Item.php:564
msgid "Code" msgid "Code"
msgstr "" msgstr ""
#: ../../mod/content.php:699 ../../object/Item.php:564 #: ../../mod/content.php:699 ../../object/Item.php:565
msgid "Image" msgid "Image"
msgstr "" msgstr ""
#: ../../mod/content.php:700 ../../object/Item.php:565 #: ../../mod/content.php:700 ../../object/Item.php:566
msgid "Link" msgid "Link"
msgstr "" msgstr ""
#: ../../mod/content.php:701 ../../object/Item.php:566 #: ../../mod/content.php:701 ../../object/Item.php:567
msgid "Video" msgid "Video"
msgstr "" msgstr ""
#: ../../mod/content.php:735 ../../object/Item.php:180 #: ../../mod/content.php:736 ../../object/Item.php:180
msgid "add star" msgid "add star"
msgstr "" msgstr ""
#: ../../mod/content.php:736 ../../object/Item.php:181 #: ../../mod/content.php:737 ../../object/Item.php:181
msgid "remove star" msgid "remove star"
msgstr "" msgstr ""
#: ../../mod/content.php:737 ../../object/Item.php:182 #: ../../mod/content.php:738 ../../object/Item.php:182
msgid "toggle star status" msgid "toggle star status"
msgstr "" msgstr ""
#: ../../mod/content.php:740 ../../object/Item.php:185 #: ../../mod/content.php:741 ../../object/Item.php:185
msgid "starred" msgid "starred"
msgstr "" msgstr ""
#: ../../mod/content.php:741 ../../object/Item.php:186 #: ../../mod/content.php:742 ../../object/Item.php:186
msgid "add tag" msgid "add tag"
msgstr "" msgstr ""
#: ../../mod/content.php:745 ../../object/Item.php:120 #: ../../mod/content.php:746 ../../object/Item.php:120
msgid "save to folder" msgid "save to folder"
msgstr "" msgstr ""
#: ../../mod/content.php:817 ../../object/Item.php:229 #: ../../mod/content.php:818 ../../object/Item.php:229
msgid "to" msgid "to"
msgstr "" msgstr ""
#: ../../mod/content.php:818 ../../object/Item.php:230 #: ../../mod/content.php:819 ../../object/Item.php:230
msgid "Wall-to-Wall" msgid "Wall-to-Wall"
msgstr "" msgstr ""
#: ../../mod/content.php:819 ../../object/Item.php:231 #: ../../mod/content.php:820 ../../object/Item.php:231
msgid "via Wall-To-Wall:" msgid "via Wall-To-Wall:"
msgstr "" msgstr ""
@ -1537,7 +1530,7 @@ msgstr ""
msgid "Personal" msgid "Personal"
msgstr "" 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 #: ../../include/nav.php:77 ../../include/nav.php:115
msgid "Home" msgid "Home"
msgstr "" msgstr ""
@ -1982,7 +1975,7 @@ msgstr ""
msgid "Edit contact" msgid "Edit contact"
msgstr "" 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 #: ../../include/nav.php:139
msgid "Contacts" msgid "Contacts"
msgstr "" msgstr ""
@ -2109,9 +2102,8 @@ msgstr ""
#: ../../mod/settings.php:69 ../../mod/newmember.php:22 #: ../../mod/settings.php:69 ../../mod/newmember.php:22
#: ../../mod/admin.php:785 ../../mod/admin.php:990 #: ../../mod/admin.php:785 ../../mod/admin.php:990
#: ../../addon/dav/friendica/layout.fnk.php:225 #: ../../addon/dav/friendica/layout.fnk.php:225
#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:537 #: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:614
#: ../../view/theme/diabook/theme.php:658 ../../include/nav.php:137 #: ../../include/nav.php:137 ../../addon.old/dav/friendica/layout.fnk.php:225
#: ../../addon.old/dav/friendica/layout.fnk.php:225
#: ../../addon.old/mathjax/mathjax.php:36 #: ../../addon.old/mathjax/mathjax.php:36
msgid "Settings" msgid "Settings"
msgstr "" msgstr ""
@ -2774,7 +2766,7 @@ msgstr ""
#: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131 #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131
#: ../../mod/message.php:242 ../../mod/message.php:250 #: ../../mod/message.php:242 ../../mod/message.php:250
#: ../../include/conversation.php:893 ../../include/conversation.php:910 #: ../../include/conversation.php:898 ../../include/conversation.php:916
msgid "Please enter a link URL:" msgid "Please enter a link URL:"
msgstr "" msgstr ""
@ -2855,7 +2847,7 @@ msgid ""
msgstr "" msgstr ""
#: ../../mod/newmember.php:32 ../../mod/profperm.php:103 #: ../../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 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50
#: ../../boot.php:1684 #: ../../boot.php:1684
msgid "Profile" msgid "Profile"
@ -3176,12 +3168,21 @@ msgstr ""
msgid "People Search" msgid "People Search"
msgstr "" msgstr ""
#: ../../mod/like.php:145 ../../mod/subthread.php:87 ../../mod/tagger.php:62
#: ../../addon/communityhome/communityhome.php:163
#: ../../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
msgid "photo"
msgstr ""
#: ../../mod/like.php:145 ../../mod/like.php:298 ../../mod/subthread.php:87 #: ../../mod/like.php:145 ../../mod/like.php:298 ../../mod/subthread.php:87
#: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1598 #: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1598
#: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:158
#: ../../addon/communityhome/communityhome.php:167 #: ../../addon/communityhome/communityhome.php:167
#: ../../view/theme/diabook/theme.php:459 #: ../../view/theme/diabook/theme.php:452
#: ../../view/theme/diabook/theme.php:468 ../../include/diaspora.php:1835 #: ../../view/theme/diabook/theme.php:461 ../../include/diaspora.php:1835
#: ../../include/conversation.php:120 ../../include/conversation.php:129 #: ../../include/conversation.php:120 ../../include/conversation.php:129
#: ../../include/conversation.php:248 ../../include/conversation.php:257 #: ../../include/conversation.php:248 ../../include/conversation.php:257
#: ../../addon.old/facebook/facebook.php:1598 #: ../../addon.old/facebook/facebook.php:1598
@ -3192,7 +3193,7 @@ msgstr ""
#: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602 #: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602
#: ../../addon/communityhome/communityhome.php:172 #: ../../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 #: ../../include/conversation.php:136
#: ../../addon.old/facebook/facebook.php:1602 #: ../../addon.old/facebook/facebook.php:1602
#: ../../addon.old/communityhome/communityhome.php:172 #: ../../addon.old/communityhome/communityhome.php:172
@ -3206,8 +3207,8 @@ msgid "%1$s doesn't like %2$s's %3$s"
msgstr "" msgstr ""
#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159 #: ../../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/admin.php:734 ../../mod/admin.php:933 ../../mod/display.php:39
#: ../../mod/display.php:145 ../../include/items.php:3780 #: ../../mod/display.php:169 ../../include/items.php:3780
msgid "Item not found." msgid "Item not found."
msgstr "" msgstr ""
@ -3215,7 +3216,7 @@ msgstr ""
msgid "Access denied." msgid "Access denied."
msgstr "" 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 #: ../../include/nav.php:51 ../../boot.php:1691
msgid "Photos" msgid "Photos"
msgstr "" msgstr ""
@ -3237,42 +3238,42 @@ msgstr ""
msgid "Please login." msgid "Please login."
msgstr "" msgstr ""
#: ../../mod/item.php:91 #: ../../mod/item.php:104
msgid "Unable to locate original post." msgid "Unable to locate original post."
msgstr "" msgstr ""
#: ../../mod/item.php:275 #: ../../mod/item.php:288
msgid "Empty post discarded." msgid "Empty post discarded."
msgstr "" msgstr ""
#: ../../mod/item.php:407 ../../mod/wall_upload.php:133 #: ../../mod/item.php:420 ../../mod/wall_upload.php:133
#: ../../mod/wall_upload.php:142 ../../mod/wall_upload.php:149 #: ../../mod/wall_upload.php:142 ../../mod/wall_upload.php:149
#: ../../include/message.php:144 #: ../../include/message.php:144
msgid "Wall Photos" msgid "Wall Photos"
msgstr "" msgstr ""
#: ../../mod/item.php:820 #: ../../mod/item.php:833
msgid "System error. Post not saved." msgid "System error. Post not saved."
msgstr "" msgstr ""
#: ../../mod/item.php:845 #: ../../mod/item.php:858
#, php-format #, php-format
msgid "" msgid ""
"This message was sent to you by %s, a member of the Friendica social network." "This message was sent to you by %s, a member of the Friendica social network."
msgstr "" msgstr ""
#: ../../mod/item.php:847 #: ../../mod/item.php:860
#, php-format #, php-format
msgid "You may visit them online at %s" msgid "You may visit them online at %s"
msgstr "" msgstr ""
#: ../../mod/item.php:848 #: ../../mod/item.php:861
msgid "" msgid ""
"Please contact the sender by replying to this post if you do not wish to " "Please contact the sender by replying to this post if you do not wish to "
"receive these messages." "receive these messages."
msgstr "" msgstr ""
#: ../../mod/item.php:850 #: ../../mod/item.php:863
#, php-format #, php-format
msgid "%s posted an update." msgid "%s posted an update."
msgstr "" msgstr ""
@ -4097,7 +4098,7 @@ msgstr ""
msgid "Requested profile is not available." msgid "Requested profile is not available."
msgstr "" msgstr ""
#: ../../mod/profile.php:155 ../../mod/display.php:77 #: ../../mod/profile.php:155 ../../mod/display.php:87
msgid "Access to this profile has been restricted." msgid "Access to this profile has been restricted."
msgstr "" msgstr ""
@ -4189,7 +4190,7 @@ msgstr ""
msgid "link" msgid "link"
msgstr "" msgstr ""
#: ../../mod/display.php:138 #: ../../mod/display.php:162
msgid "Item has been removed." msgid "Item has been removed."
msgstr "" msgstr ""
@ -4514,8 +4515,8 @@ msgstr ""
msgid "Edit visibility" msgid "Edit visibility"
msgstr "" msgstr ""
#: ../../mod/filer.php:29 ../../include/conversation.php:897 #: ../../mod/filer.php:29 ../../include/conversation.php:902
#: ../../include/conversation.php:914 #: ../../include/conversation.php:920
msgid "Save to Folder:" msgid "Save to Folder:"
msgstr "" msgstr ""
@ -4607,7 +4608,7 @@ msgstr ""
msgid "diaspora2bb: " msgid "diaspora2bb: "
msgstr "" 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 #: ../../include/contact_widgets.php:34
msgid "Friend Suggestions" msgid "Friend Suggestions"
msgstr "" msgstr ""
@ -4622,7 +4623,7 @@ msgstr ""
msgid "Ignore/Hide" msgid "Ignore/Hide"
msgstr "" msgstr ""
#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:518 #: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:511
msgid "Global Directory" msgid "Global Directory"
msgstr "" msgstr ""
@ -5560,7 +5561,7 @@ msgid "Latest likes"
msgstr "" msgstr ""
#: ../../addon/communityhome/communityhome.php:155 #: ../../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 #: ../../include/conversation.php:117 ../../include/conversation.php:245
#: ../../addon.old/communityhome/communityhome.php:155 #: ../../addon.old/communityhome/communityhome.php:155
msgid "event" msgid "event"
@ -7578,137 +7579,135 @@ msgstr ""
msgid "Color scheme" msgid "Color scheme"
msgstr "" 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 #: ../../include/nav.php:115
msgid "Your posts and conversations" msgid "Your posts and conversations"
msgstr "" 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" msgid "Your profile page"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:89 #: ../../view/theme/diabook/theme.php:88
msgid "Your contacts" msgid "Your contacts"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:51 #: ../../view/theme/diabook/theme.php:89 ../../include/nav.php:51
msgid "Your photos" msgid "Your photos"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:52 #: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:52
msgid "Your events" msgid "Your events"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53 #: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:53
msgid "Personal notes" msgid "Personal notes"
msgstr "" 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" msgid "Your personal photos"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:94 #: ../../view/theme/diabook/theme.php:93
#: ../../view/theme/diabook/theme.php:537
#: ../../view/theme/diabook/theme.php:632
#: ../../view/theme/diabook/config.php:163 #: ../../view/theme/diabook/config.php:163
msgid "Community Pages" msgid "Community Pages"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:384 #: ../../view/theme/diabook/theme.php:377
#: ../../view/theme/diabook/theme.php:634 #: ../../view/theme/diabook/theme.php:591
#: ../../view/theme/diabook/config.php:165 #: ../../view/theme/diabook/config.php:165
msgid "Community Profiles" msgid "Community Profiles"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:405 #: ../../view/theme/diabook/theme.php:398
#: ../../view/theme/diabook/theme.php:639 #: ../../view/theme/diabook/theme.php:596
#: ../../view/theme/diabook/config.php:170 #: ../../view/theme/diabook/config.php:170
msgid "Last users" msgid "Last users"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:434 #: ../../view/theme/diabook/theme.php:427
#: ../../view/theme/diabook/theme.php:641 #: ../../view/theme/diabook/theme.php:598
#: ../../view/theme/diabook/config.php:172 #: ../../view/theme/diabook/config.php:172
msgid "Last likes" msgid "Last likes"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:479 #: ../../view/theme/diabook/theme.php:472
#: ../../view/theme/diabook/theme.php:640 #: ../../view/theme/diabook/theme.php:597
#: ../../view/theme/diabook/config.php:171 #: ../../view/theme/diabook/config.php:171
msgid "Last photos" msgid "Last photos"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:516 #: ../../view/theme/diabook/theme.php:509
#: ../../view/theme/diabook/theme.php:637 #: ../../view/theme/diabook/theme.php:594
#: ../../view/theme/diabook/config.php:168 #: ../../view/theme/diabook/config.php:168
msgid "Find Friends" msgid "Find Friends"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:517 #: ../../view/theme/diabook/theme.php:510
msgid "Local Directory" msgid "Local Directory"
msgstr "" 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" msgid "Similar Interests"
msgstr "" 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" msgid "Invite Friends"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:572 #: ../../view/theme/diabook/theme.php:531
#: ../../view/theme/diabook/theme.php:633 #: ../../view/theme/diabook/theme.php:590
#: ../../view/theme/diabook/config.php:164 #: ../../view/theme/diabook/config.php:164
msgid "Earth Layers" msgid "Earth Layers"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:577 #: ../../view/theme/diabook/theme.php:536
msgid "Set zoomfactor for Earth Layers" msgid "Set zoomfactor for Earth Layers"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:578 #: ../../view/theme/diabook/theme.php:537
#: ../../view/theme/diabook/config.php:161 #: ../../view/theme/diabook/config.php:161
msgid "Set longitude (X) for Earth Layers" msgid "Set longitude (X) for Earth Layers"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:579 #: ../../view/theme/diabook/theme.php:538
#: ../../view/theme/diabook/config.php:162 #: ../../view/theme/diabook/config.php:162
msgid "Set latitude (Y) for Earth Layers" msgid "Set latitude (Y) for Earth Layers"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:551
#: ../../view/theme/diabook/theme.php:592 #: ../../view/theme/diabook/theme.php:592
#: ../../view/theme/diabook/theme.php:635
#: ../../view/theme/diabook/config.php:166 #: ../../view/theme/diabook/config.php:166
msgid "Help or @NewHere ?" msgid "Help or @NewHere ?"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:599 #: ../../view/theme/diabook/theme.php:558
#: ../../view/theme/diabook/theme.php:636 #: ../../view/theme/diabook/theme.php:593
#: ../../view/theme/diabook/config.php:167 #: ../../view/theme/diabook/config.php:167
msgid "Connect Services" msgid "Connect Services"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:606 #: ../../view/theme/diabook/theme.php:565
#: ../../view/theme/diabook/theme.php:638 #: ../../view/theme/diabook/theme.php:595
msgid "Last Tweets" msgid "Last Tweets"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:609 #: ../../view/theme/diabook/theme.php:568
#: ../../view/theme/diabook/config.php:159 #: ../../view/theme/diabook/config.php:159
msgid "Set twitter search term" msgid "Set twitter search term"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:629 #: ../../view/theme/diabook/theme.php:587
#: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:288 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:288
msgid "don't show" msgid "don't show"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:629 #: ../../view/theme/diabook/theme.php:587
#: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:287 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:287
msgid "show" msgid "show"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:630 #: ../../view/theme/diabook/theme.php:588
msgid "Show/hide boxes at right-hand column:" msgid "Show/hide boxes at right-hand column:"
msgstr "" msgstr ""
@ -8669,7 +8668,7 @@ msgstr ""
msgid "Happy Birthday %s" msgid "Happy Birthday %s"
msgstr "" msgstr ""
#: ../../include/onepoll.php:409 #: ../../include/onepoll.php:414
msgid "From: " msgid "From: "
msgstr "" msgstr ""
@ -9040,34 +9039,34 @@ msgstr ""
msgid "stopped following" msgid "stopped following"
msgstr "" msgstr ""
#: ../../include/Contact.php:220 ../../include/conversation.php:790 #: ../../include/Contact.php:220 ../../include/conversation.php:795
msgid "Poke" msgid "Poke"
msgstr "" msgstr ""
#: ../../include/Contact.php:221 ../../include/conversation.php:784 #: ../../include/Contact.php:221 ../../include/conversation.php:789
msgid "View Status" msgid "View Status"
msgstr "" msgstr ""
#: ../../include/Contact.php:222 ../../include/conversation.php:785 #: ../../include/Contact.php:222 ../../include/conversation.php:790
msgid "View Profile" msgid "View Profile"
msgstr "" msgstr ""
#: ../../include/Contact.php:223 ../../include/conversation.php:786 #: ../../include/Contact.php:223 ../../include/conversation.php:791
msgid "View Photos" msgid "View Photos"
msgstr "" msgstr ""
#: ../../include/Contact.php:224 ../../include/Contact.php:237 #: ../../include/Contact.php:224 ../../include/Contact.php:237
#: ../../include/conversation.php:787 #: ../../include/conversation.php:792
msgid "Network Posts" msgid "Network Posts"
msgstr "" msgstr ""
#: ../../include/Contact.php:225 ../../include/Contact.php:237 #: ../../include/Contact.php:225 ../../include/Contact.php:237
#: ../../include/conversation.php:788 #: ../../include/conversation.php:793
msgid "Edit Contact" msgid "Edit Contact"
msgstr "" msgstr ""
#: ../../include/Contact.php:226 ../../include/Contact.php:237 #: ../../include/Contact.php:226 ../../include/Contact.php:237
#: ../../include/conversation.php:789 #: ../../include/conversation.php:794
msgid "Send PM" msgid "Send PM"
msgstr "" msgstr ""
@ -9085,86 +9084,90 @@ msgstr ""
msgid "%1$s marked %2$s's %3$s as favorite" msgid "%1$s marked %2$s's %3$s as favorite"
msgstr "" msgstr ""
#: ../../include/conversation.php:594 ../../object/Item.php:218 #: ../../include/conversation.php:599 ../../object/Item.php:218
msgid "Categories:" msgid "Categories:"
msgstr "" msgstr ""
#: ../../include/conversation.php:595 ../../object/Item.php:219 #: ../../include/conversation.php:600 ../../object/Item.php:219
msgid "Filed under:" msgid "Filed under:"
msgstr "" msgstr ""
#: ../../include/conversation.php:680 #: ../../include/conversation.php:685
msgid "remove" msgid "remove"
msgstr "" msgstr ""
#: ../../include/conversation.php:684 #: ../../include/conversation.php:689
msgid "Delete Selected Items" msgid "Delete Selected Items"
msgstr "" msgstr ""
#: ../../include/conversation.php:783 #: ../../include/conversation.php:788
msgid "Follow Thread" msgid "Follow Thread"
msgstr "" msgstr ""
#: ../../include/conversation.php:852 #: ../../include/conversation.php:857
#, php-format #, php-format
msgid "%s likes this." msgid "%s likes this."
msgstr "" msgstr ""
#: ../../include/conversation.php:852 #: ../../include/conversation.php:857
#, php-format #, php-format
msgid "%s doesn't like this." msgid "%s doesn't like this."
msgstr "" msgstr ""
#: ../../include/conversation.php:856 #: ../../include/conversation.php:861
#, php-format #, php-format
msgid "<span %1$s>%2$d people</span> like this." msgid "<span %1$s>%2$d people</span> like this."
msgstr "" msgstr ""
#: ../../include/conversation.php:858 #: ../../include/conversation.php:863
#, php-format #, php-format
msgid "<span %1$s>%2$d people</span> don't like this." msgid "<span %1$s>%2$d people</span> don't like this."
msgstr "" msgstr ""
#: ../../include/conversation.php:864 #: ../../include/conversation.php:869
msgid "and" msgid "and"
msgstr "" msgstr ""
#: ../../include/conversation.php:867 #: ../../include/conversation.php:872
#, php-format #, php-format
msgid ", and %d other people" msgid ", and %d other people"
msgstr "" msgstr ""
#: ../../include/conversation.php:868 #: ../../include/conversation.php:873
#, php-format #, php-format
msgid "%s like this." msgid "%s like this."
msgstr "" msgstr ""
#: ../../include/conversation.php:868 #: ../../include/conversation.php:873
#, php-format #, php-format
msgid "%s don't like this." msgid "%s don't like this."
msgstr "" msgstr ""
#: ../../include/conversation.php:892 ../../include/conversation.php:909 #: ../../include/conversation.php:897 ../../include/conversation.php:915
msgid "Visible to <strong>everybody</strong>" msgid "Visible to <strong>everybody</strong>"
msgstr "" msgstr ""
#: ../../include/conversation.php:894 ../../include/conversation.php:911 #: ../../include/conversation.php:899 ../../include/conversation.php:917
msgid "Please enter a video link/URL:" msgid "Please enter a video link/URL:"
msgstr "" msgstr ""
#: ../../include/conversation.php:895 ../../include/conversation.php:912 #: ../../include/conversation.php:900 ../../include/conversation.php:918
msgid "Please enter an audio link/URL:" msgid "Please enter an audio link/URL:"
msgstr "" msgstr ""
#: ../../include/conversation.php:896 ../../include/conversation.php:913 #: ../../include/conversation.php:901 ../../include/conversation.php:919
msgid "Tag term:" msgid "Tag term:"
msgstr "" msgstr ""
#: ../../include/conversation.php:898 ../../include/conversation.php:915 #: ../../include/conversation.php:903 ../../include/conversation.php:921
msgid "Where are you right now?" msgid "Where are you right now?"
msgstr "" msgstr ""
#: ../../include/conversation.php:977 #: ../../include/conversation.php:904
msgid "Delete item(s)?"
msgstr ""
#: ../../include/conversation.php:983
msgid "permissions" msgid "permissions"
msgstr "" msgstr ""

View file

@ -10,6 +10,7 @@
<input type="hidden" name="return" value="$return_path" /> <input type="hidden" name="return" value="$return_path" />
<input type="hidden" name="jsreload" value="$jsreload" /> <input type="hidden" name="jsreload" value="$jsreload" />
<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" /> <input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
<input type="hidden" name="post_id_random" value="$rand_num" />
<div class="comment-edit-photo" id="comment-edit-photo-$id" > <div class="comment-edit-photo" id="comment-edit-photo-$id" >
<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a> <a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>

File diff suppressed because it is too large Load diff

View file

@ -58,7 +58,7 @@ $a->strings["Tag removed"] = "Tag entfernt";
$a->strings["Remove Item Tag"] = "Gegenstands-Tag entfernen"; $a->strings["Remove Item Tag"] = "Gegenstands-Tag entfernen";
$a->strings["Select a tag to remove: "] = "Wähle ein Tag zum Entfernen aus: "; $a->strings["Select a tag to remove: "] = "Wähle ein Tag zum Entfernen aus: ";
$a->strings["Remove"] = "Entfernen"; $a->strings["Remove"] = "Entfernen";
$a->strings["%s welcomes %s"] = "%s heißt %s herzlich willkommen"; $a->strings["%1\$s welcomes %2\$s"] = "%1\$s heißt %2\$s herzlich willkommen";
$a->strings["Authorize application connection"] = "Verbindung der Applikation autorisieren"; $a->strings["Authorize application connection"] = "Verbindung der Applikation autorisieren";
$a->strings["Return to your app and insert this Securty Code:"] = "Gehe zu deiner Anwendung zurück und trage dort folgenden Sicherheitscode ein:"; $a->strings["Return to your app and insert this Securty Code:"] = "Gehe zu deiner Anwendung zurück und trage dort folgenden Sicherheitscode ein:";
$a->strings["Please login to continue."] = "Bitte melde dich an um fortzufahren."; $a->strings["Please login to continue."] = "Bitte melde dich an um fortzufahren.";
@ -74,9 +74,8 @@ $a->strings["Profile Photos"] = "Profilbilder";
$a->strings["Album not found."] = "Album nicht gefunden."; $a->strings["Album not found."] = "Album nicht gefunden.";
$a->strings["Delete Album"] = "Album löschen"; $a->strings["Delete Album"] = "Album löschen";
$a->strings["Delete Photo"] = "Foto löschen"; $a->strings["Delete Photo"] = "Foto löschen";
$a->strings["was tagged in a"] = "wurde getaggt in einem"; $a->strings["%1\$s was tagged in %2\$s by %3\$s"] = "%1\$s wurde von %3\$s in %2\$s getaggt";
$a->strings["photo"] = "Foto"; $a->strings["a photo"] = "einem Foto";
$a->strings["by"] = "von";
$a->strings["Image exceeds size limit of "] = "Die Bildgröße übersteigt das Limit von "; $a->strings["Image exceeds size limit of "] = "Die Bildgröße übersteigt das Limit von ";
$a->strings["Image file is empty."] = "Bilddatei ist leer."; $a->strings["Image file is empty."] = "Bilddatei ist leer.";
$a->strings["Unable to process image."] = "Konnte das Bild nicht bearbeiten."; $a->strings["Unable to process image."] = "Konnte das Bild nicht bearbeiten.";
@ -253,7 +252,7 @@ $a->strings["The database configuration file \".htconfig.php\" could not be writ
$a->strings["Errors encountered creating database tables."] = "Fehler aufgetreten während der Erzeugung der Datenbanktabellen."; $a->strings["Errors encountered creating database tables."] = "Fehler aufgetreten während der Erzeugung der Datenbanktabellen.";
$a->strings["<h1>What next</h1>"] = "<h1>Wie geht es weiter?</h1>"; $a->strings["<h1>What next</h1>"] = "<h1>Wie geht es weiter?</h1>";
$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "WICHTIG: Du musst [manuell] einen Cronjob (o.ä.) für den Poller einrichten."; $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "WICHTIG: Du musst [manuell] einen Cronjob (o.ä.) für den Poller einrichten.";
$a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A"; $a->strings["l F d, Y \\@ g:i A"] = "l, d. F Y\\, H:i";
$a->strings["Time Conversion"] = "Zeitumrechnung"; $a->strings["Time Conversion"] = "Zeitumrechnung";
$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica bietet diese Funktion an, um das Teilen von Events mit Kontakten zu vereinfachen, deren Zeitzone nicht ermittelt werden kann."; $a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica bietet diese Funktion an, um das Teilen von Events mit Kontakten zu vereinfachen, deren Zeitzone nicht ermittelt werden kann.";
$a->strings["UTC time: %s"] = "UTC Zeit: %s"; $a->strings["UTC time: %s"] = "UTC Zeit: %s";
@ -689,6 +688,7 @@ $a->strings["Choose a profile nickname. This must begin with a text character. Y
$a->strings["Choose a nickname: "] = "Spitznamen wählen: "; $a->strings["Choose a nickname: "] = "Spitznamen wählen: ";
$a->strings["Register"] = "Registrieren"; $a->strings["Register"] = "Registrieren";
$a->strings["People Search"] = "Personensuche"; $a->strings["People Search"] = "Personensuche";
$a->strings["photo"] = "Foto";
$a->strings["status"] = "Status"; $a->strings["status"] = "Status";
$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s mag %2\$ss %3\$s"; $a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s mag %2\$ss %3\$s";
$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s mag %2\$ss %3\$s nicht"; $a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s mag %2\$ss %3\$s nicht";
@ -826,7 +826,7 @@ $a->strings["Use PHP UTF8 regular expressions"] = "PHP UTF8 Ausdrücke verwenden
$a->strings["Show Community Page"] = "Gemeinschaftsseite anzeigen"; $a->strings["Show Community Page"] = "Gemeinschaftsseite anzeigen";
$a->strings["Display a Community page showing all recent public postings on this site."] = "Zeige die Gemeinschaftsseite mit allen öffentlichen Beiträgen auf diesem Server."; $a->strings["Display a Community page showing all recent public postings on this site."] = "Zeige die Gemeinschaftsseite mit allen öffentlichen Beiträgen auf diesem Server.";
$a->strings["Enable OStatus support"] = "OStatus Unterstützung aktivieren"; $a->strings["Enable OStatus support"] = "OStatus Unterstützung aktivieren";
$a->strings["Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."] = "Biete die eingebaute OStatus (identi.ca, status.net, etc.) Unterstützung an. Jede Kommunikation in OStatus ist öffentlich, so Privatsphäre Warnungen werden bei Bedarf angezeigt."; $a->strings["Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."] = "Biete die eingebaute OStatus (identi.ca, status.net, etc.) Unterstützung an. Jede Kommunikation in OStatus ist öffentlich, Privatsphäre Warnungen werden nur bei Bedarf angezeigt.";
$a->strings["Enable Diaspora support"] = "Diaspora-Support aktivieren"; $a->strings["Enable Diaspora support"] = "Diaspora-Support aktivieren";
$a->strings["Provide built-in Diaspora network compatibility."] = "Verwende die eingebaute Diaspora-Verknüpfung."; $a->strings["Provide built-in Diaspora network compatibility."] = "Verwende die eingebaute Diaspora-Verknüpfung.";
$a->strings["Only allow Friendica contacts"] = "Nur Friendica-Kontakte erlauben"; $a->strings["Only allow Friendica contacts"] = "Nur Friendica-Kontakte erlauben";
@ -1973,6 +1973,7 @@ $a->strings["Please enter a video link/URL:"] = "Bitte Link/URL zum Video einfü
$a->strings["Please enter an audio link/URL:"] = "Bitte Link/URL zum Audio einfügen:"; $a->strings["Please enter an audio link/URL:"] = "Bitte Link/URL zum Audio einfügen:";
$a->strings["Tag term:"] = "Tag:"; $a->strings["Tag term:"] = "Tag:";
$a->strings["Where are you right now?"] = "Wo hältst du dich jetzt gerade auf?"; $a->strings["Where are you right now?"] = "Wo hältst du dich jetzt gerade auf?";
$a->strings["Delete item(s)?"] = "Einträge löschen?";
$a->strings["permissions"] = "Zugriffsrechte"; $a->strings["permissions"] = "Zugriffsrechte";
$a->strings["Click here to upgrade."] = "Zum Upgraden hier klicken."; $a->strings["Click here to upgrade."] = "Zum Upgraden hier klicken.";
$a->strings["This action exceeds the limits set by your subscription plan."] = "Diese Aktion überschreitet die Obergrenze deines Abonnements."; $a->strings["This action exceeds the limits set by your subscription plan."] = "Diese Aktion überschreitet die Obergrenze deines Abonnements.";

View file

@ -10,13 +10,14 @@
# Manuel Pérez <blackhalo@member.fsf.org>, 2011-2012. # Manuel Pérez <blackhalo@member.fsf.org>, 2011-2012.
# Manuel Pérez Monís, 2011. # Manuel Pérez Monís, 2011.
# Mike Macgirvin, 2010. # Mike Macgirvin, 2010.
# <tobias.diekershoff@gmx.net>, 2012.
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: friendica\n" "Project-Id-Version: friendica\n"
"Report-Msgid-Bugs-To: http://bugs.friendica.com/\n" "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
"POT-Creation-Date: 2012-10-18 10:00-0700\n" "POT-Creation-Date: 2012-10-30 10:00-0700\n"
"PO-Revision-Date: 2012-10-15 08:33+0000\n" "PO-Revision-Date: 2012-11-01 12:11+0000\n"
"Last-Translator: Carlos Solís <csolisr@gmail.com>\n" "Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/friendica/language/es/)\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/friendica/language/es/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
@ -65,7 +66,7 @@ msgstr "Error al actualizar el Contacto."
#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510
#: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:159 #: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:159
#: ../../addon/fbpost/fbpost.php:165 #: ../../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 #: ../../index.php:319 ../../addon.old/facebook/facebook.php:510
#: ../../addon.old/facebook/facebook.php:516 #: ../../addon.old/facebook/facebook.php:516
#: ../../addon.old/fbpost/fbpost.php:159 ../../addon.old/fbpost/fbpost.php:165 #: ../../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/irc/irc.php:55 ../../addon/fromapp/fromapp.php:77
#: ../../addon/blogger/blogger.php:102 ../../addon/posterous/posterous.php:103 #: ../../addon/blogger/blogger.php:102 ../../addon/posterous/posterous.php:103
#: ../../view/theme/cleanzero/config.php:80 #: ../../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/diabook/config.php:152
#: ../../view/theme/quattro/config.php:64 ../../view/theme/dispy/config.php:70 #: ../../view/theme/quattro/config.php:64 ../../view/theme/dispy/config.php:70
#: ../../object/Item.php:558 ../../addon.old/fromgplus/fromgplus.php:40 #: ../../object/Item.php:558 ../../addon.old/fromgplus/fromgplus.php:40
@ -288,11 +289,11 @@ msgstr "l, F j"
msgid "Edit event" msgid "Edit event"
msgstr "Editar evento" msgstr "Editar evento"
#: ../../mod/events.php:323 ../../include/text.php:1187 #: ../../mod/events.php:323 ../../include/text.php:1185
msgid "link to source" msgid "link to source"
msgstr "Enlace al original" 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 #: ../../include/nav.php:52 ../../boot.php:1701
msgid "Events" msgid "Events"
msgstr "Eventos" msgstr "Eventos"
@ -366,7 +367,7 @@ msgstr "Comparte este evento"
#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:142 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:142
#: ../../mod/dfrn_request.php:847 ../../mod/settings.php:544 #: ../../mod/dfrn_request.php:847 ../../mod/settings.php:544
#: ../../mod/settings.php:570 ../../addon/js_upload/js_upload.php:45 #: ../../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 #: ../../addon.old/js_upload/js_upload.php:45
msgid "Cancel" msgid "Cancel"
msgstr "Cancelar" msgstr "Cancelar"
@ -444,7 +445,7 @@ msgstr "Álbum de Fotos"
#: ../../mod/photos.php:1095 ../../mod/photos.php:1110 #: ../../mod/photos.php:1095 ../../mod/photos.php:1110
#: ../../mod/photos.php:1562 ../../mod/photos.php:1574 #: ../../mod/photos.php:1562 ../../mod/photos.php:1574
#: ../../addon/communityhome/communityhome.php:110 #: ../../addon/communityhome/communityhome.php:110
#: ../../view/theme/diabook/theme.php:492 #: ../../view/theme/diabook/theme.php:485
#: ../../addon.old/communityhome/communityhome.php:110 #: ../../addon.old/communityhome/communityhome.php:110
msgid "Contact Photos" msgid "Contact Photos"
msgstr "Foto del contacto" 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:204 ../../mod/profile_photo.php:296
#: ../../mod/profile_photo.php:305 #: ../../mod/profile_photo.php:305
#: ../../addon/communityhome/communityhome.php:111 #: ../../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 #: ../../include/user.php:331 ../../include/user.php:338
#: ../../addon.old/communityhome/communityhome.php:111 #: ../../addon.old/communityhome/communityhome.php:111
msgid "Profile Photos" 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/photos.php:606 ../../mod/like.php:145 ../../mod/subthread.php:87
#: ../../mod/tagger.php:62 ../../addon/communityhome/communityhome.php:163 #: ../../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/diaspora.php:1835 ../../include/conversation.php:125
#: ../../include/conversation.php:253 #: ../../include/conversation.php:253
#: ../../addon.old/communityhome/communityhome.php:163 #: ../../addon.old/communityhome/communityhome.php:163
@ -653,15 +654,15 @@ msgstr "Me gusta esto (cambiar)"
msgid "I don't like this (toggle)" msgid "I don't like this (toggle)"
msgstr "No me gusta esto (cambiar)" msgstr "No me gusta esto (cambiar)"
#: ../../mod/photos.php:1386 ../../include/conversation.php:956 #: ../../mod/photos.php:1386 ../../include/conversation.php:957
msgid "Share" msgid "Share"
msgstr "Compartir" msgstr "Compartir"
#: ../../mod/photos.php:1387 ../../mod/editpost.php:118 #: ../../mod/photos.php:1387 ../../mod/editpost.php:118
#: ../../mod/content.php:482 ../../mod/content.php:845 #: ../../mod/content.php:482 ../../mod/content.php:845
#: ../../mod/wallmessage.php:152 ../../mod/message.php:293 #: ../../mod/wallmessage.php:152 ../../mod/message.php:293
#: ../../mod/message.php:481 ../../include/conversation.php:619 #: ../../mod/message.php:481 ../../include/conversation.php:620
#: ../../include/conversation.php:975 ../../object/Item.php:258 #: ../../include/conversation.php:976 ../../object/Item.php:258
msgid "Please wait" msgid "Please wait"
msgstr "Por favor, espera" msgstr "Por favor, espera"
@ -679,7 +680,7 @@ msgstr "Comentar"
#: ../../mod/photos.php:1407 ../../mod/photos.php:1450 #: ../../mod/photos.php:1407 ../../mod/photos.php:1450
#: ../../mod/photos.php:1521 ../../mod/editpost.php:139 #: ../../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 #: ../../object/Item.php:567
msgid "Preview" msgid "Preview"
msgstr "Vista previa" msgstr "Vista previa"
@ -687,7 +688,7 @@ msgstr "Vista previa"
#: ../../mod/photos.php:1489 ../../mod/content.php:439 #: ../../mod/photos.php:1489 ../../mod/content.php:439
#: ../../mod/content.php:723 ../../mod/settings.php:606 #: ../../mod/content.php:723 ../../mod/settings.php:606
#: ../../mod/group.php:168 ../../mod/admin.php:696 #: ../../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" msgid "Delete"
msgstr "Eliminar" msgstr "Eliminar"
@ -703,7 +704,7 @@ msgstr "Fotos recientes"
msgid "Not available." msgid "Not available."
msgstr "No disponible" 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 #: ../../include/nav.php:101
msgid "Community" msgid "Community"
msgstr "Comunidad" msgstr "Comunidad"
@ -753,7 +754,7 @@ msgstr "Elemento no encontrado"
msgid "Edit post" msgid "Edit post"
msgstr "Editar publicación" msgstr "Editar publicación"
#: ../../mod/editpost.php:88 ../../include/conversation.php:942 #: ../../mod/editpost.php:88 ../../include/conversation.php:943
msgid "Post to Email" msgid "Post to Email"
msgstr "Publicar mediante correo electrónico" msgstr "Publicar mediante correo electrónico"
@ -764,85 +765,85 @@ msgstr "Editar"
#: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150 #: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150
#: ../../mod/message.php:291 ../../mod/message.php:478 #: ../../mod/message.php:291 ../../mod/message.php:478
#: ../../include/conversation.php:957 #: ../../include/conversation.php:958
msgid "Upload photo" msgid "Upload photo"
msgstr "Subir foto" msgstr "Subir foto"
#: ../../mod/editpost.php:105 ../../include/conversation.php:958 #: ../../mod/editpost.php:105 ../../include/conversation.php:959
msgid "upload photo" msgid "upload photo"
msgstr "subir imagen" msgstr "subir imagen"
#: ../../mod/editpost.php:106 ../../include/conversation.php:959 #: ../../mod/editpost.php:106 ../../include/conversation.php:960
msgid "Attach file" msgid "Attach file"
msgstr "Adjuntar archivo" msgstr "Adjuntar archivo"
#: ../../mod/editpost.php:107 ../../include/conversation.php:960 #: ../../mod/editpost.php:107 ../../include/conversation.php:961
msgid "attach file" msgid "attach file"
msgstr "adjuntar archivo" msgstr "adjuntar archivo"
#: ../../mod/editpost.php:108 ../../mod/wallmessage.php:151 #: ../../mod/editpost.php:108 ../../mod/wallmessage.php:151
#: ../../mod/message.php:292 ../../mod/message.php:479 #: ../../mod/message.php:292 ../../mod/message.php:479
#: ../../include/conversation.php:961 #: ../../include/conversation.php:962
msgid "Insert web link" msgid "Insert web link"
msgstr "Insertar enlace" msgstr "Insertar enlace"
#: ../../mod/editpost.php:109 ../../include/conversation.php:962 #: ../../mod/editpost.php:109 ../../include/conversation.php:963
msgid "web link" msgid "web link"
msgstr "enlace web" msgstr "enlace web"
#: ../../mod/editpost.php:110 ../../include/conversation.php:963 #: ../../mod/editpost.php:110 ../../include/conversation.php:964
msgid "Insert video link" msgid "Insert video link"
msgstr "Insertar enlace del vídeo" 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" msgid "video link"
msgstr "enlace de video" msgstr "enlace de video"
#: ../../mod/editpost.php:112 ../../include/conversation.php:965 #: ../../mod/editpost.php:112 ../../include/conversation.php:966
msgid "Insert audio link" msgid "Insert audio link"
msgstr "Insertar vínculo del audio" 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" msgid "audio link"
msgstr "enlace de audio" msgstr "enlace de audio"
#: ../../mod/editpost.php:114 ../../include/conversation.php:967 #: ../../mod/editpost.php:114 ../../include/conversation.php:968
msgid "Set your location" msgid "Set your location"
msgstr "Configurar tu localización" msgstr "Configurar tu localización"
#: ../../mod/editpost.php:115 ../../include/conversation.php:968 #: ../../mod/editpost.php:115 ../../include/conversation.php:969
msgid "set location" msgid "set location"
msgstr "establecer tu ubicación" 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" msgid "Clear browser location"
msgstr "Borrar la localización del navegador" 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" msgid "clear location"
msgstr "limpiar la localización" msgstr "limpiar la localización"
#: ../../mod/editpost.php:119 ../../include/conversation.php:976 #: ../../mod/editpost.php:119 ../../include/conversation.php:977
msgid "Permission settings" msgid "Permission settings"
msgstr "Configuración de permisos" 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" msgid "CC: email addresses"
msgstr "CC: dirección de correo electrónico" 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" msgid "Public post"
msgstr "Publicación pública" msgstr "Publicación pública"
#: ../../mod/editpost.php:131 ../../include/conversation.php:972 #: ../../mod/editpost.php:131 ../../include/conversation.php:973
msgid "Set title" msgid "Set title"
msgstr "Establecer el título" 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)" msgid "Categories (comma-separated list)"
msgstr "Categorías (lista separada por comas)" 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" msgid "Example: bob@example.com, mary@example.com"
msgstr "Ejemplo: juan@ejemplo.com, sofia@ejemplo.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" msgid "Confirm"
msgstr "Confirmar" msgstr "Confirmar"
#: ../../mod/dfrn_request.php:715 ../../include/items.php:3292 #: ../../mod/dfrn_request.php:715 ../../include/items.php:3293
msgid "[Name Withheld]" msgid "[Name Withheld]"
msgstr "[Nombre oculto]" msgstr "[Nombre oculto]"
@ -1300,9 +1301,9 @@ msgstr "Conversión horária"
#: ../../mod/localtime.php:26 #: ../../mod/localtime.php:26
msgid "" 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." "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 #: ../../mod/localtime.php:30
#, php-format #, php-format
@ -1386,24 +1387,24 @@ msgid "Group: "
msgstr "Grupo: " msgstr "Grupo: "
#: ../../mod/content.php:438 ../../mod/content.php:722 #: ../../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" msgid "Select"
msgstr "Seleccionar" msgstr "Seleccionar"
#: ../../mod/content.php:455 ../../mod/content.php:815 #: ../../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 #: ../../object/Item.php:227 ../../object/Item.php:228
#, php-format #, php-format
msgid "View %s's profile @ %s" msgid "View %s's profile @ %s"
msgstr "Ver perfil de %s @ %s" msgstr "Ver perfil de %s @ %s"
#: ../../mod/content.php:465 ../../mod/content.php:827 #: ../../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 #, php-format
msgid "%s from %s" msgid "%s from %s"
msgstr "%s de %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" msgid "View in context"
msgstr "Verlo en contexto" msgstr "Verlo en contexto"
@ -1414,7 +1415,7 @@ msgid_plural "%d comments"
msgstr[0] "%d comentario" msgstr[0] "%d comentario"
msgstr[1] "%d comentarios" 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 #: ../../object/Item.php:279 ../../object/Item.php:292
msgid "comment" msgid "comment"
msgid_plural "comments" msgid_plural "comments"
@ -1546,7 +1547,7 @@ msgstr "Red"
msgid "Personal" msgid "Personal"
msgstr "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 #: ../../include/nav.php:77 ../../include/nav.php:115
msgid "Home" msgid "Home"
msgstr "Inicio" msgstr "Inicio"
@ -1991,7 +1992,7 @@ msgstr "eres fan de"
msgid "Edit contact" msgid "Edit contact"
msgstr "Modificar contacto" 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 #: ../../include/nav.php:139
msgid "Contacts" msgid "Contacts"
msgstr "Contactos" msgstr "Contactos"
@ -2028,7 +2029,7 @@ msgstr "Contraseña restablecida enviada a %s"
#: ../../addon/facebook/facebook.php:702 #: ../../addon/facebook/facebook.php:702
#: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661 #: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661
#: ../../addon/public_server/public_server.php:62 #: ../../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 #: ../../boot.php:799 ../../addon.old/facebook/facebook.php:702
#: ../../addon.old/facebook/facebook.php:1200 #: ../../addon.old/facebook/facebook.php:1200
#: ../../addon.old/fbpost/fbpost.php:661 #: ../../addon.old/fbpost/fbpost.php:661
@ -2093,7 +2094,7 @@ msgstr "Configuración de tu cuenta"
#: ../../mod/settings.php:35 #: ../../mod/settings.php:35
msgid "Display settings" msgid "Display settings"
msgstr "Mostrar configuración" msgstr "Configuración Tema/Visualización"
#: ../../mod/settings.php:41 #: ../../mod/settings.php:41
msgid "Connector settings" msgid "Connector settings"
@ -2118,9 +2119,8 @@ msgstr "Eliminar cuenta"
#: ../../mod/settings.php:69 ../../mod/newmember.php:22 #: ../../mod/settings.php:69 ../../mod/newmember.php:22
#: ../../mod/admin.php:785 ../../mod/admin.php:990 #: ../../mod/admin.php:785 ../../mod/admin.php:990
#: ../../addon/dav/friendica/layout.fnk.php:225 #: ../../addon/dav/friendica/layout.fnk.php:225
#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:537 #: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:614
#: ../../view/theme/diabook/theme.php:658 ../../include/nav.php:137 #: ../../include/nav.php:137 ../../addon.old/dav/friendica/layout.fnk.php:225
#: ../../addon.old/dav/friendica/layout.fnk.php:225
#: ../../addon.old/mathjax/mathjax.php:36 #: ../../addon.old/mathjax/mathjax.php:36
msgid "Settings" msgid "Settings"
msgstr "Configuración" msgstr "Configuración"
@ -2346,7 +2346,7 @@ msgstr "No hay tema especial para dispositivos móviles"
#: ../../mod/settings.php:767 #: ../../mod/settings.php:767
msgid "Display Settings" msgid "Display Settings"
msgstr "Mostrar Configuración" msgstr "Configuración Tema/Visualización"
#: ../../mod/settings.php:773 ../../mod/settings.php:784 #: ../../mod/settings.php:773 ../../mod/settings.php:784
msgid "Display Theme:" msgid "Display Theme:"
@ -2784,7 +2784,7 @@ msgstr "Sin receptor."
#: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131 #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131
#: ../../mod/message.php:242 ../../mod/message.php:250 #: ../../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:" msgid "Please enter a link URL:"
msgstr "Introduce la dirección del enlace:" 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." 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 #: ../../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 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50
#: ../../boot.php:1684 #: ../../boot.php:1684
msgid "Profile" msgid "Profile"
@ -3190,8 +3190,8 @@ msgstr "Buscar personas"
#: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1598 #: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1598
#: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:158
#: ../../addon/communityhome/communityhome.php:167 #: ../../addon/communityhome/communityhome.php:167
#: ../../view/theme/diabook/theme.php:459 #: ../../view/theme/diabook/theme.php:452
#: ../../view/theme/diabook/theme.php:468 ../../include/diaspora.php:1835 #: ../../view/theme/diabook/theme.php:461 ../../include/diaspora.php:1835
#: ../../include/conversation.php:120 ../../include/conversation.php:129 #: ../../include/conversation.php:120 ../../include/conversation.php:129
#: ../../include/conversation.php:248 ../../include/conversation.php:257 #: ../../include/conversation.php:248 ../../include/conversation.php:257
#: ../../addon.old/facebook/facebook.php:1598 #: ../../addon.old/facebook/facebook.php:1598
@ -3202,7 +3202,7 @@ msgstr "estado"
#: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602 #: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602
#: ../../addon/communityhome/communityhome.php:172 #: ../../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 #: ../../include/conversation.php:136
#: ../../addon.old/facebook/facebook.php:1602 #: ../../addon.old/facebook/facebook.php:1602
#: ../../addon.old/communityhome/communityhome.php:172 #: ../../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/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159
#: ../../mod/admin.php:734 ../../mod/admin.php:933 ../../mod/display.php:29 #: ../../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." msgid "Item not found."
msgstr "Elemento no encontrado." msgstr "Elemento no encontrado."
@ -3225,7 +3225,7 @@ msgstr "Elemento no encontrado."
msgid "Access denied." msgid "Access denied."
msgstr "Acceso denegado." 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 #: ../../include/nav.php:51 ../../boot.php:1691
msgid "Photos" msgid "Photos"
msgstr "Fotografías" msgstr "Fotografías"
@ -4525,8 +4525,8 @@ msgstr "Visible para todos"
msgid "Edit visibility" msgid "Edit visibility"
msgstr "Editar visibilidad" msgstr "Editar visibilidad"
#: ../../mod/filer.php:29 ../../include/conversation.php:897 #: ../../mod/filer.php:29 ../../include/conversation.php:898
#: ../../include/conversation.php:914 #: ../../include/conversation.php:915
msgid "Save to Folder:" msgid "Save to Folder:"
msgstr "Guardar en directorio:" msgstr "Guardar en directorio:"
@ -4618,7 +4618,7 @@ msgstr "Fuente (formato Diaspora): "
msgid "diaspora2bb: " msgid "diaspora2bb: "
msgstr "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 #: ../../include/contact_widgets.php:34
msgid "Friend Suggestions" msgid "Friend Suggestions"
msgstr "Sugerencias de amigos" 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" msgid "Ignore/Hide"
msgstr "Ignorar/Ocultar" 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" msgid "Global Directory"
msgstr "Directorio global" msgstr "Directorio global"
@ -5570,7 +5570,7 @@ msgid "Latest likes"
msgstr "Últimos me gusta" msgstr "Últimos me gusta"
#: ../../addon/communityhome/communityhome.php:155 #: ../../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 #: ../../include/conversation.php:117 ../../include/conversation.php:245
#: ../../addon.old/communityhome/communityhome.php:155 #: ../../addon.old/communityhome/communityhome.php:155
msgid "event" msgid "event"
@ -5724,7 +5724,7 @@ msgstr "Días"
#: ../../addon/dav/common/wdcal_edit.inc.php:254 #: ../../addon/dav/common/wdcal_edit.inc.php:254
#: ../../addon/dav/common/wdcal_edit.inc.php:270 #: ../../addon/dav/common/wdcal_edit.inc.php:270
#: ../../addon/dav/common/wdcal_edit.inc.php:293 #: ../../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:231
#: ../../addon.old/dav/common/wdcal_edit.inc.php:254 #: ../../addon.old/dav/common/wdcal_edit.inc.php:254
#: ../../addon.old/dav/common/wdcal_edit.inc.php:270 #: ../../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:235
#: ../../addon/dav/common/wdcal_edit.inc.php:274 #: ../../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:235
#: ../../addon.old/dav/common/wdcal_edit.inc.php:274 #: ../../addon.old/dav/common/wdcal_edit.inc.php:274
#: ../../addon.old/dav/common/wdcal_edit.inc.php:308 #: ../../addon.old/dav/common/wdcal_edit.inc.php:308
@ -5743,35 +5743,35 @@ msgid "Monday"
msgstr "Lunes" msgstr "Lunes"
#: ../../addon/dav/common/wdcal_edit.inc.php:238 #: ../../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:238
#: ../../addon.old/dav/common/wdcal_edit.inc.php:277 #: ../../addon.old/dav/common/wdcal_edit.inc.php:277
msgid "Tuesday" msgid "Tuesday"
msgstr "Martes" msgstr "Martes"
#: ../../addon/dav/common/wdcal_edit.inc.php:241 #: ../../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:241
#: ../../addon.old/dav/common/wdcal_edit.inc.php:280 #: ../../addon.old/dav/common/wdcal_edit.inc.php:280
msgid "Wednesday" msgid "Wednesday"
msgstr "Miércoles" msgstr "Miércoles"
#: ../../addon/dav/common/wdcal_edit.inc.php:244 #: ../../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:244
#: ../../addon.old/dav/common/wdcal_edit.inc.php:283 #: ../../addon.old/dav/common/wdcal_edit.inc.php:283
msgid "Thursday" msgid "Thursday"
msgstr "Jueves" msgstr "Jueves"
#: ../../addon/dav/common/wdcal_edit.inc.php:247 #: ../../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:247
#: ../../addon.old/dav/common/wdcal_edit.inc.php:286 #: ../../addon.old/dav/common/wdcal_edit.inc.php:286
msgid "Friday" msgid "Friday"
msgstr "Viernes" msgstr "Viernes"
#: ../../addon/dav/common/wdcal_edit.inc.php:250 #: ../../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:250
#: ../../addon.old/dav/common/wdcal_edit.inc.php:289 #: ../../addon.old/dav/common/wdcal_edit.inc.php:289
msgid "Saturday" msgid "Saturday"
@ -7584,137 +7584,135 @@ msgstr "Establecer el ancho para el tema"
msgid "Color scheme" msgid "Color scheme"
msgstr "Esquema de color" 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 #: ../../include/nav.php:115
msgid "Your posts and conversations" msgid "Your posts and conversations"
msgstr "Tus publicaciones y conversaciones" 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" msgid "Your profile page"
msgstr "Tu página de perfil" msgstr "Tu página de perfil"
#: ../../view/theme/diabook/theme.php:89 #: ../../view/theme/diabook/theme.php:88
msgid "Your contacts" msgid "Your contacts"
msgstr "Tus contactos" 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" msgid "Your photos"
msgstr "Tus fotos" 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" msgid "Your events"
msgstr "Tus eventos" 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" msgid "Personal notes"
msgstr "Notas personales" 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" msgid "Your personal photos"
msgstr "Tus fotos personales" msgstr "Tus fotos personales"
#: ../../view/theme/diabook/theme.php:94 #: ../../view/theme/diabook/theme.php:93
#: ../../view/theme/diabook/theme.php:537
#: ../../view/theme/diabook/theme.php:632
#: ../../view/theme/diabook/config.php:163 #: ../../view/theme/diabook/config.php:163
msgid "Community Pages" msgid "Community Pages"
msgstr "Páginas de Comunidad" msgstr "Páginas de Comunidad"
#: ../../view/theme/diabook/theme.php:384 #: ../../view/theme/diabook/theme.php:377
#: ../../view/theme/diabook/theme.php:634 #: ../../view/theme/diabook/theme.php:591
#: ../../view/theme/diabook/config.php:165 #: ../../view/theme/diabook/config.php:165
msgid "Community Profiles" msgid "Community Profiles"
msgstr "Perfiles de la Comunidad" msgstr "Perfiles de la Comunidad"
#: ../../view/theme/diabook/theme.php:405 #: ../../view/theme/diabook/theme.php:398
#: ../../view/theme/diabook/theme.php:639 #: ../../view/theme/diabook/theme.php:596
#: ../../view/theme/diabook/config.php:170 #: ../../view/theme/diabook/config.php:170
msgid "Last users" msgid "Last users"
msgstr "Últimos usuarios" msgstr "Últimos usuarios"
#: ../../view/theme/diabook/theme.php:434 #: ../../view/theme/diabook/theme.php:427
#: ../../view/theme/diabook/theme.php:641 #: ../../view/theme/diabook/theme.php:598
#: ../../view/theme/diabook/config.php:172 #: ../../view/theme/diabook/config.php:172
msgid "Last likes" msgid "Last likes"
msgstr "Últimos \"me gusta\"" msgstr "Últimos \"me gusta\""
#: ../../view/theme/diabook/theme.php:479 #: ../../view/theme/diabook/theme.php:472
#: ../../view/theme/diabook/theme.php:640 #: ../../view/theme/diabook/theme.php:597
#: ../../view/theme/diabook/config.php:171 #: ../../view/theme/diabook/config.php:171
msgid "Last photos" msgid "Last photos"
msgstr "Últimas fotos" msgstr "Últimas fotos"
#: ../../view/theme/diabook/theme.php:516 #: ../../view/theme/diabook/theme.php:509
#: ../../view/theme/diabook/theme.php:637 #: ../../view/theme/diabook/theme.php:594
#: ../../view/theme/diabook/config.php:168 #: ../../view/theme/diabook/config.php:168
msgid "Find Friends" msgid "Find Friends"
msgstr "Buscar amigos" msgstr "Buscar amigos"
#: ../../view/theme/diabook/theme.php:517 #: ../../view/theme/diabook/theme.php:510
msgid "Local Directory" msgid "Local Directory"
msgstr "Directorio local" 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" msgid "Similar Interests"
msgstr "Intereses similares" 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" msgid "Invite Friends"
msgstr "Invitar amigos" msgstr "Invitar amigos"
#: ../../view/theme/diabook/theme.php:572 #: ../../view/theme/diabook/theme.php:531
#: ../../view/theme/diabook/theme.php:633 #: ../../view/theme/diabook/theme.php:590
#: ../../view/theme/diabook/config.php:164 #: ../../view/theme/diabook/config.php:164
msgid "Earth Layers" msgid "Earth Layers"
msgstr "Minimapa" msgstr "Minimapa"
#: ../../view/theme/diabook/theme.php:577 #: ../../view/theme/diabook/theme.php:536
msgid "Set zoomfactor for Earth Layers" msgid "Set zoomfactor for Earth Layers"
msgstr "Configurar zoom en Minimapa" msgstr "Configurar zoom en Minimapa"
#: ../../view/theme/diabook/theme.php:578 #: ../../view/theme/diabook/theme.php:537
#: ../../view/theme/diabook/config.php:161 #: ../../view/theme/diabook/config.php:161
msgid "Set longitude (X) for Earth Layers" msgid "Set longitude (X) for Earth Layers"
msgstr "Configurar longitud (X) en Minimapa" msgstr "Configurar longitud (X) en Minimapa"
#: ../../view/theme/diabook/theme.php:579 #: ../../view/theme/diabook/theme.php:538
#: ../../view/theme/diabook/config.php:162 #: ../../view/theme/diabook/config.php:162
msgid "Set latitude (Y) for Earth Layers" msgid "Set latitude (Y) for Earth Layers"
msgstr "Configurar latitud (Y) en Minimapa" msgstr "Configurar latitud (Y) en Minimapa"
#: ../../view/theme/diabook/theme.php:551
#: ../../view/theme/diabook/theme.php:592 #: ../../view/theme/diabook/theme.php:592
#: ../../view/theme/diabook/theme.php:635
#: ../../view/theme/diabook/config.php:166 #: ../../view/theme/diabook/config.php:166
msgid "Help or @NewHere ?" msgid "Help or @NewHere ?"
msgstr "¿Ayuda o @NuevoAquí?" msgstr "¿Ayuda o @NuevoAquí?"
#: ../../view/theme/diabook/theme.php:599 #: ../../view/theme/diabook/theme.php:558
#: ../../view/theme/diabook/theme.php:636 #: ../../view/theme/diabook/theme.php:593
#: ../../view/theme/diabook/config.php:167 #: ../../view/theme/diabook/config.php:167
msgid "Connect Services" msgid "Connect Services"
msgstr "Servicios conectados" msgstr "Servicios conectados"
#: ../../view/theme/diabook/theme.php:606 #: ../../view/theme/diabook/theme.php:565
#: ../../view/theme/diabook/theme.php:638 #: ../../view/theme/diabook/theme.php:595
msgid "Last Tweets" msgid "Last Tweets"
msgstr "Últimos tweets" msgstr "Últimos tweets"
#: ../../view/theme/diabook/theme.php:609 #: ../../view/theme/diabook/theme.php:568
#: ../../view/theme/diabook/config.php:159 #: ../../view/theme/diabook/config.php:159
msgid "Set twitter search term" msgid "Set twitter search term"
msgstr "Establecer término de búsqueda en Twitter" 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 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:288
msgid "don't show" msgid "don't show"
msgstr "no mostrar" 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 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:287
msgid "show" msgid "show"
msgstr "mostrar" msgstr "mostrar"
#: ../../view/theme/diabook/theme.php:630 #: ../../view/theme/diabook/theme.php:588
msgid "Show/hide boxes at right-hand column:" msgid "Show/hide boxes at right-hand column:"
msgstr "Mostrar/Ocultar casillas en la columna derecha:" msgstr "Mostrar/Ocultar casillas en la columna derecha:"
@ -8300,79 +8298,79 @@ msgstr "relajado"
msgid "surprised" msgid "surprised"
msgstr "sorprendido" msgstr "sorprendido"
#: ../../include/text.php:921 #: ../../include/text.php:919
msgid "January" msgid "January"
msgstr "Enero" msgstr "Enero"
#: ../../include/text.php:921 #: ../../include/text.php:919
msgid "February" msgid "February"
msgstr "Febrero" msgstr "Febrero"
#: ../../include/text.php:921 #: ../../include/text.php:919
msgid "March" msgid "March"
msgstr "Marzo" msgstr "Marzo"
#: ../../include/text.php:921 #: ../../include/text.php:919
msgid "April" msgid "April"
msgstr "Abril" msgstr "Abril"
#: ../../include/text.php:921 #: ../../include/text.php:919
msgid "May" msgid "May"
msgstr "Mayo" msgstr "Mayo"
#: ../../include/text.php:921 #: ../../include/text.php:919
msgid "June" msgid "June"
msgstr "Junio" msgstr "Junio"
#: ../../include/text.php:921 #: ../../include/text.php:919
msgid "July" msgid "July"
msgstr "Julio" msgstr "Julio"
#: ../../include/text.php:921 #: ../../include/text.php:919
msgid "August" msgid "August"
msgstr "Agosto" msgstr "Agosto"
#: ../../include/text.php:921 #: ../../include/text.php:919
msgid "September" msgid "September"
msgstr "Septiembre" msgstr "Septiembre"
#: ../../include/text.php:921 #: ../../include/text.php:919
msgid "October" msgid "October"
msgstr "Octubre" msgstr "Octubre"
#: ../../include/text.php:921 #: ../../include/text.php:919
msgid "November" msgid "November"
msgstr "Noviembre" msgstr "Noviembre"
#: ../../include/text.php:921 #: ../../include/text.php:919
msgid "December" msgid "December"
msgstr "Diciembre" msgstr "Diciembre"
#: ../../include/text.php:1007 #: ../../include/text.php:1005
msgid "bytes" msgid "bytes"
msgstr "bytes" msgstr "bytes"
#: ../../include/text.php:1034 ../../include/text.php:1046 #: ../../include/text.php:1032 ../../include/text.php:1044
msgid "Click to open/close" msgid "Click to open/close"
msgstr "Pulsa para abrir/cerrar" msgstr "Pulsa para abrir/cerrar"
#: ../../include/text.php:1219 ../../include/user.php:236 #: ../../include/text.php:1217 ../../include/user.php:236
msgid "default" msgid "default"
msgstr "predeterminado" msgstr "predeterminado"
#: ../../include/text.php:1231 #: ../../include/text.php:1229
msgid "Select an alternate language" msgid "Select an alternate language"
msgstr "Elige otro idioma" msgstr "Elige otro idioma"
#: ../../include/text.php:1441 #: ../../include/text.php:1439
msgid "activity" msgid "activity"
msgstr "Actividad" msgstr "Actividad"
#: ../../include/text.php:1444 #: ../../include/text.php:1442
msgid "post" msgid "post"
msgstr "Publicación" msgstr "Publicación"
#: ../../include/text.php:1599 #: ../../include/text.php:1597
msgid "Item filed" msgid "Item filed"
msgstr "Elemento archivado" msgstr "Elemento archivado"
@ -8665,17 +8663,17 @@ msgstr "segundos"
msgid "%1$d %2$s ago" msgid "%1$d %2$s ago"
msgstr "hace %1$d %2$s" msgstr "hace %1$d %2$s"
#: ../../include/datetime.php:472 ../../include/items.php:1688 #: ../../include/datetime.php:472 ../../include/items.php:1689
#, php-format #, php-format
msgid "%s's birthday" msgid "%s's birthday"
msgstr "Cumpleaños de %s" msgstr "Cumpleaños de %s"
#: ../../include/datetime.php:473 ../../include/items.php:1689 #: ../../include/datetime.php:473 ../../include/items.php:1690
#, php-format #, php-format
msgid "Happy Birthday %s" msgid "Happy Birthday %s"
msgstr "Feliz cumpleaños %s" msgstr "Feliz cumpleaños %s"
#: ../../include/onepoll.php:409 #: ../../include/onepoll.php:414
msgid "From: " msgid "From: "
msgstr "De: " msgstr "De: "
@ -8945,15 +8943,15 @@ msgstr "No ha sido posible recibir la información del contacto."
msgid "following" msgid "following"
msgstr "siguiendo" msgstr "siguiendo"
#: ../../include/items.php:3299 #: ../../include/items.php:3300
msgid "A new person is sharing with you at " msgid "A new person is sharing with you at "
msgstr "Una nueva persona está compartiendo contigo en " msgstr "Una nueva persona está compartiendo contigo en "
#: ../../include/items.php:3299 #: ../../include/items.php:3300
msgid "You have a new follower at " msgid "You have a new follower at "
msgstr "Tienes un nuevo seguidor en " msgstr "Tienes un nuevo seguidor en "
#: ../../include/items.php:3980 #: ../../include/items.php:3981
msgid "Archives" msgid "Archives"
msgstr "Archivos" msgstr "Archivos"
@ -9047,34 +9045,34 @@ msgstr "La ficha de seguridad no es correcta. Seguramente haya ocurrido por habe
msgid "stopped following" msgid "stopped following"
msgstr "dejó de seguir" msgstr "dejó de seguir"
#: ../../include/Contact.php:220 ../../include/conversation.php:790 #: ../../include/Contact.php:220 ../../include/conversation.php:791
msgid "Poke" msgid "Poke"
msgstr "Toque" msgstr "Toque"
#: ../../include/Contact.php:221 ../../include/conversation.php:784 #: ../../include/Contact.php:221 ../../include/conversation.php:785
msgid "View Status" msgid "View Status"
msgstr "Ver estado" msgstr "Ver estado"
#: ../../include/Contact.php:222 ../../include/conversation.php:785 #: ../../include/Contact.php:222 ../../include/conversation.php:786
msgid "View Profile" msgid "View Profile"
msgstr "Ver perfil" msgstr "Ver perfil"
#: ../../include/Contact.php:223 ../../include/conversation.php:786 #: ../../include/Contact.php:223 ../../include/conversation.php:787
msgid "View Photos" msgid "View Photos"
msgstr "Ver fotos" msgstr "Ver fotos"
#: ../../include/Contact.php:224 ../../include/Contact.php:237 #: ../../include/Contact.php:224 ../../include/Contact.php:237
#: ../../include/conversation.php:787 #: ../../include/conversation.php:788
msgid "Network Posts" msgid "Network Posts"
msgstr "Publicaciones en la red" msgstr "Publicaciones en la red"
#: ../../include/Contact.php:225 ../../include/Contact.php:237 #: ../../include/Contact.php:225 ../../include/Contact.php:237
#: ../../include/conversation.php:788 #: ../../include/conversation.php:789
msgid "Edit Contact" msgid "Edit Contact"
msgstr "Editar contacto" msgstr "Editar contacto"
#: ../../include/Contact.php:226 ../../include/Contact.php:237 #: ../../include/Contact.php:226 ../../include/Contact.php:237
#: ../../include/conversation.php:789 #: ../../include/conversation.php:790
msgid "Send PM" msgid "Send PM"
msgstr "Enviar mensaje privado" msgstr "Enviar mensaje privado"
@ -9092,86 +9090,86 @@ msgstr "publicación/tema"
msgid "%1$s marked %2$s's %3$s as favorite" msgid "%1$s marked %2$s's %3$s as favorite"
msgstr "%1$s ha marcado %3$s de %2$s como Favorito" 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:" msgid "Categories:"
msgstr "" msgstr ""
#: ../../include/conversation.php:595 ../../object/Item.php:219 #: ../../include/conversation.php:596 ../../object/Item.php:219
msgid "Filed under:" msgid "Filed under:"
msgstr "" msgstr ""
#: ../../include/conversation.php:680 #: ../../include/conversation.php:681
msgid "remove" msgid "remove"
msgstr "eliminar" msgstr "eliminar"
#: ../../include/conversation.php:684 #: ../../include/conversation.php:685
msgid "Delete Selected Items" msgid "Delete Selected Items"
msgstr "Eliminar el elemento seleccionado" msgstr "Eliminar el elemento seleccionado"
#: ../../include/conversation.php:783 #: ../../include/conversation.php:784
msgid "Follow Thread" msgid "Follow Thread"
msgstr "" msgstr ""
#: ../../include/conversation.php:852 #: ../../include/conversation.php:853
#, php-format #, php-format
msgid "%s likes this." msgid "%s likes this."
msgstr "A %s le gusta esto." msgstr "A %s le gusta esto."
#: ../../include/conversation.php:852 #: ../../include/conversation.php:853
#, php-format #, php-format
msgid "%s doesn't like this." msgid "%s doesn't like this."
msgstr "A %s no le gusta esto." msgstr "A %s no le gusta esto."
#: ../../include/conversation.php:856 #: ../../include/conversation.php:857
#, php-format #, php-format
msgid "<span %1$s>%2$d people</span> like this." msgid "<span %1$s>%2$d people</span> like this."
msgstr "Le gusta a <span %1$s>%2$d personas</span>." msgstr "Le gusta a <span %1$s>%2$d personas</span>."
#: ../../include/conversation.php:858 #: ../../include/conversation.php:859
#, php-format #, php-format
msgid "<span %1$s>%2$d people</span> don't like this." msgid "<span %1$s>%2$d people</span> don't like this."
msgstr "No le gusta a <span %1$s>%2$d personas</span>." msgstr "No le gusta a <span %1$s>%2$d personas</span>."
#: ../../include/conversation.php:864 #: ../../include/conversation.php:865
msgid "and" msgid "and"
msgstr "y" msgstr "y"
#: ../../include/conversation.php:867 #: ../../include/conversation.php:868
#, php-format #, php-format
msgid ", and %d other people" msgid ", and %d other people"
msgstr " y a otras %d personas" msgstr " y a otras %d personas"
#: ../../include/conversation.php:868 #: ../../include/conversation.php:869
#, php-format #, php-format
msgid "%s like this." msgid "%s like this."
msgstr "Le gusta a %s." msgstr "Le gusta a %s."
#: ../../include/conversation.php:868 #: ../../include/conversation.php:869
#, php-format #, php-format
msgid "%s don't like this." msgid "%s don't like this."
msgstr "No le gusta a %s." 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 <strong>everybody</strong>" msgid "Visible to <strong>everybody</strong>"
msgstr "Visible para <strong>cualquiera</strong>" msgstr "Visible para <strong>cualquiera</strong>"
#: ../../include/conversation.php:894 ../../include/conversation.php:911 #: ../../include/conversation.php:895 ../../include/conversation.php:912
msgid "Please enter a video link/URL:" msgid "Please enter a video link/URL:"
msgstr "Por favor, introduce la URL/enlace del vídeo:" 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:" msgid "Please enter an audio link/URL:"
msgstr "Por favor, introduce la URL/enlace del audio:" 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:" msgid "Tag term:"
msgstr "Etiquetar:" msgstr "Etiquetar:"
#: ../../include/conversation.php:898 ../../include/conversation.php:915 #: ../../include/conversation.php:899 ../../include/conversation.php:916
msgid "Where are you right now?" msgid "Where are you right now?"
msgstr "¿Dónde estás ahora?" msgstr "¿Dónde estás ahora?"
#: ../../include/conversation.php:977 #: ../../include/conversation.php:978
msgid "permissions" msgid "permissions"
msgstr "permisos" msgstr "permisos"

View file

@ -255,7 +255,7 @@ $a->strings["<h1>What next</h1>"] = "<h1>¿Ahora qué?</h1>";
$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["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["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
$a->strings["Time Conversion"] = "Conversión horária"; $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["UTC time: %s"] = "Tiempo UTC: %s";
$a->strings["Current timezone: %s"] = "Zona horaria actual: %s"; $a->strings["Current timezone: %s"] = "Zona horaria actual: %s";
$a->strings["Converted localtime: %s"] = "Zona horaria local convertida: %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["Nickname or Email: "] = "Apodo o Correo electrónico: ";
$a->strings["Reset"] = "Restablecer"; $a->strings["Reset"] = "Restablecer";
$a->strings["Account settings"] = "Configuración de tu cuenta"; $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["Connector settings"] = "Configuración del conector";
$a->strings["Plugin settings"] = "Configuración de los módulos"; $a->strings["Plugin settings"] = "Configuración de los módulos";
$a->strings["Connected apps"] = "Aplicaciones conectadas"; $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 a un directorio";
$a->strings["Move to folder:"] = "Mover al 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["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["Display Theme:"] = "Utilizar tema:";
$a->strings["Mobile Theme:"] = "Tema móvil:"; $a->strings["Mobile Theme:"] = "Tema móvil:";
$a->strings["Update browser every xx seconds"] = "Actualizar navegador cada xx segundos"; $a->strings["Update browser every xx seconds"] = "Actualizar navegador cada xx segundos";

View file

@ -3,15 +3,16 @@
# This file is distributed under the same license as the Friendica package. # This file is distributed under the same license as the Friendica package.
# #
# Translators: # Translators:
# <domovoy@errlock.org>, 2012.
# <olivier@free-beer.ch>, 2012. # <olivier@free-beer.ch>, 2012.
# Olivier <olivier+transifex@migeot.org>, 2011-2012. # Olivier <olivier+transifex@migeot.org>, 2011-2012.
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: friendica\n" "Project-Id-Version: friendica\n"
"Report-Msgid-Bugs-To: http://bugs.friendica.com/\n" "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
"POT-Creation-Date: 2012-10-18 10:00-0700\n" "POT-Creation-Date: 2012-10-30 10:00-0700\n"
"PO-Revision-Date: 2012-10-18 08:00+0000\n" "PO-Revision-Date: 2012-10-31 14:33+0000\n"
"Last-Translator: Olivier <olivier+transifex@migeot.org>\n" "Last-Translator: Domovoy <domovoy@errlock.org>\n"
"Language-Team: French (http://www.transifex.com/projects/p/friendica/language/fr/)\n" "Language-Team: French (http://www.transifex.com/projects/p/friendica/language/fr/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
@ -60,7 +61,7 @@ msgstr "Impossible d'appliquer les réglages."
#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510
#: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:159 #: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:159
#: ../../addon/fbpost/fbpost.php:165 #: ../../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 #: ../../index.php:319 ../../addon.old/facebook/facebook.php:510
#: ../../addon.old/facebook/facebook.php:516 #: ../../addon.old/facebook/facebook.php:516
#: ../../addon.old/fbpost/fbpost.php:159 ../../addon.old/fbpost/fbpost.php:165 #: ../../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/irc/irc.php:55 ../../addon/fromapp/fromapp.php:77
#: ../../addon/blogger/blogger.php:102 ../../addon/posterous/posterous.php:103 #: ../../addon/blogger/blogger.php:102 ../../addon/posterous/posterous.php:103
#: ../../view/theme/cleanzero/config.php:80 #: ../../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/diabook/config.php:152
#: ../../view/theme/quattro/config.php:64 ../../view/theme/dispy/config.php:70 #: ../../view/theme/quattro/config.php:64 ../../view/theme/dispy/config.php:70
#: ../../object/Item.php:558 ../../addon.old/fromgplus/fromgplus.php:40 #: ../../object/Item.php:558 ../../addon.old/fromgplus/fromgplus.php:40
@ -283,11 +284,11 @@ msgstr "l, F j"
msgid "Edit event" msgid "Edit event"
msgstr "Editer l'événement" 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" msgid "link to source"
msgstr "lien original" 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 #: ../../include/nav.php:52 ../../boot.php:1701
msgid "Events" msgid "Events"
msgstr "Événements" 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/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:142
#: ../../mod/dfrn_request.php:847 ../../mod/settings.php:544 #: ../../mod/dfrn_request.php:847 ../../mod/settings.php:544
#: ../../mod/settings.php:570 ../../addon/js_upload/js_upload.php:45 #: ../../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 #: ../../addon.old/js_upload/js_upload.php:45
msgid "Cancel" msgid "Cancel"
msgstr "Annuler" msgstr "Annuler"
@ -439,7 +440,7 @@ msgstr "Albums photo"
#: ../../mod/photos.php:1095 ../../mod/photos.php:1110 #: ../../mod/photos.php:1095 ../../mod/photos.php:1110
#: ../../mod/photos.php:1562 ../../mod/photos.php:1574 #: ../../mod/photos.php:1562 ../../mod/photos.php:1574
#: ../../addon/communityhome/communityhome.php:110 #: ../../addon/communityhome/communityhome.php:110
#: ../../view/theme/diabook/theme.php:492 #: ../../view/theme/diabook/theme.php:485
#: ../../addon.old/communityhome/communityhome.php:110 #: ../../addon.old/communityhome/communityhome.php:110
msgid "Contact Photos" msgid "Contact Photos"
msgstr "Photos du contact" 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:204 ../../mod/profile_photo.php:296
#: ../../mod/profile_photo.php:305 #: ../../mod/profile_photo.php:305
#: ../../addon/communityhome/communityhome.php:111 #: ../../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 #: ../../include/user.php:331 ../../include/user.php:338
#: ../../addon.old/communityhome/communityhome.php:111 #: ../../addon.old/communityhome/communityhome.php:111
msgid "Profile Photos" 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/photos.php:606 ../../mod/like.php:145 ../../mod/subthread.php:87
#: ../../mod/tagger.php:62 ../../addon/communityhome/communityhome.php:163 #: ../../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/diaspora.php:1835 ../../include/conversation.php:125
#: ../../include/conversation.php:253 #: ../../include/conversation.php:253
#: ../../addon.old/communityhome/communityhome.php:163 #: ../../addon.old/communityhome/communityhome.php:163
@ -648,15 +649,15 @@ msgstr "J'aime (bascule)"
msgid "I don't like this (toggle)" msgid "I don't like this (toggle)"
msgstr "Je n'aime pas (bascule)" msgstr "Je n'aime pas (bascule)"
#: ../../mod/photos.php:1386 ../../include/conversation.php:956 #: ../../mod/photos.php:1386 ../../include/conversation.php:957
msgid "Share" msgid "Share"
msgstr "Partager" msgstr "Partager"
#: ../../mod/photos.php:1387 ../../mod/editpost.php:118 #: ../../mod/photos.php:1387 ../../mod/editpost.php:118
#: ../../mod/content.php:482 ../../mod/content.php:845 #: ../../mod/content.php:482 ../../mod/content.php:845
#: ../../mod/wallmessage.php:152 ../../mod/message.php:293 #: ../../mod/wallmessage.php:152 ../../mod/message.php:293
#: ../../mod/message.php:481 ../../include/conversation.php:619 #: ../../mod/message.php:481 ../../include/conversation.php:620
#: ../../include/conversation.php:975 ../../object/Item.php:258 #: ../../include/conversation.php:976 ../../object/Item.php:258
msgid "Please wait" msgid "Please wait"
msgstr "Patientez" msgstr "Patientez"
@ -674,7 +675,7 @@ msgstr "Commenter"
#: ../../mod/photos.php:1407 ../../mod/photos.php:1450 #: ../../mod/photos.php:1407 ../../mod/photos.php:1450
#: ../../mod/photos.php:1521 ../../mod/editpost.php:139 #: ../../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 #: ../../object/Item.php:567
msgid "Preview" msgid "Preview"
msgstr "Aperçu" msgstr "Aperçu"
@ -682,7 +683,7 @@ msgstr "Aperçu"
#: ../../mod/photos.php:1489 ../../mod/content.php:439 #: ../../mod/photos.php:1489 ../../mod/content.php:439
#: ../../mod/content.php:723 ../../mod/settings.php:606 #: ../../mod/content.php:723 ../../mod/settings.php:606
#: ../../mod/group.php:168 ../../mod/admin.php:696 #: ../../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" msgid "Delete"
msgstr "Supprimer" msgstr "Supprimer"
@ -698,7 +699,7 @@ msgstr "Photos récentes"
msgid "Not available." msgid "Not available."
msgstr "Indisponible." 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 #: ../../include/nav.php:101
msgid "Community" msgid "Community"
msgstr "Communauté" msgstr "Communauté"
@ -748,7 +749,7 @@ msgstr "Élément introuvable"
msgid "Edit post" msgid "Edit post"
msgstr "Éditer la publication" msgstr "Éditer la publication"
#: ../../mod/editpost.php:88 ../../include/conversation.php:942 #: ../../mod/editpost.php:88 ../../include/conversation.php:943
msgid "Post to Email" msgid "Post to Email"
msgstr "Publier aussi par courriel" msgstr "Publier aussi par courriel"
@ -759,85 +760,85 @@ msgstr "Éditer"
#: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150 #: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150
#: ../../mod/message.php:291 ../../mod/message.php:478 #: ../../mod/message.php:291 ../../mod/message.php:478
#: ../../include/conversation.php:957 #: ../../include/conversation.php:958
msgid "Upload photo" msgid "Upload photo"
msgstr "Joindre photo" msgstr "Joindre photo"
#: ../../mod/editpost.php:105 ../../include/conversation.php:958 #: ../../mod/editpost.php:105 ../../include/conversation.php:959
msgid "upload photo" msgid "upload photo"
msgstr "envoi image" msgstr "envoi image"
#: ../../mod/editpost.php:106 ../../include/conversation.php:959 #: ../../mod/editpost.php:106 ../../include/conversation.php:960
msgid "Attach file" msgid "Attach file"
msgstr "Joindre fichier" msgstr "Joindre fichier"
#: ../../mod/editpost.php:107 ../../include/conversation.php:960 #: ../../mod/editpost.php:107 ../../include/conversation.php:961
msgid "attach file" msgid "attach file"
msgstr "ajout fichier" msgstr "ajout fichier"
#: ../../mod/editpost.php:108 ../../mod/wallmessage.php:151 #: ../../mod/editpost.php:108 ../../mod/wallmessage.php:151
#: ../../mod/message.php:292 ../../mod/message.php:479 #: ../../mod/message.php:292 ../../mod/message.php:479
#: ../../include/conversation.php:961 #: ../../include/conversation.php:962
msgid "Insert web link" msgid "Insert web link"
msgstr "Insérer lien web" msgstr "Insérer lien web"
#: ../../mod/editpost.php:109 ../../include/conversation.php:962 #: ../../mod/editpost.php:109 ../../include/conversation.php:963
msgid "web link" msgid "web link"
msgstr "lien web" msgstr "lien web"
#: ../../mod/editpost.php:110 ../../include/conversation.php:963 #: ../../mod/editpost.php:110 ../../include/conversation.php:964
msgid "Insert video link" msgid "Insert video link"
msgstr "Insérer un lien video" 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" msgid "video link"
msgstr "lien vidéo" msgstr "lien vidéo"
#: ../../mod/editpost.php:112 ../../include/conversation.php:965 #: ../../mod/editpost.php:112 ../../include/conversation.php:966
msgid "Insert audio link" msgid "Insert audio link"
msgstr "Insérer un lien audio" 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" msgid "audio link"
msgstr "lien audio" msgstr "lien audio"
#: ../../mod/editpost.php:114 ../../include/conversation.php:967 #: ../../mod/editpost.php:114 ../../include/conversation.php:968
msgid "Set your location" msgid "Set your location"
msgstr "Définir votre localisation" msgstr "Définir votre localisation"
#: ../../mod/editpost.php:115 ../../include/conversation.php:968 #: ../../mod/editpost.php:115 ../../include/conversation.php:969
msgid "set location" msgid "set location"
msgstr "spéc. localisation" msgstr "spéc. localisation"
#: ../../mod/editpost.php:116 ../../include/conversation.php:969 #: ../../mod/editpost.php:116 ../../include/conversation.php:970
msgid "Clear browser location" msgid "Clear browser location"
msgstr "Effacer la localisation du navigateur" 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" msgid "clear location"
msgstr "supp. localisation" msgstr "supp. localisation"
#: ../../mod/editpost.php:119 ../../include/conversation.php:976 #: ../../mod/editpost.php:119 ../../include/conversation.php:977
msgid "Permission settings" msgid "Permission settings"
msgstr "Réglages des permissions" 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" msgid "CC: email addresses"
msgstr "CC: adresses de courriel" msgstr "CC: adresses de courriel"
#: ../../mod/editpost.php:128 ../../include/conversation.php:986 #: ../../mod/editpost.php:128 ../../include/conversation.php:987
msgid "Public post" msgid "Public post"
msgstr "Notice publique" msgstr "Notice publique"
#: ../../mod/editpost.php:131 ../../include/conversation.php:972 #: ../../mod/editpost.php:131 ../../include/conversation.php:973
msgid "Set title" msgid "Set title"
msgstr "Définir un titre" 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)" msgid "Categories (comma-separated list)"
msgstr "Catégories (séparées par des virgules)" 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" msgid "Example: bob@example.com, mary@example.com"
msgstr "Exemple: bob@exemple.com, mary@exemple.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" msgid "Confirm"
msgstr "Confirmer" msgstr "Confirmer"
#: ../../mod/dfrn_request.php:715 ../../include/items.php:3292 #: ../../mod/dfrn_request.php:715 ../../include/items.php:3293
msgid "[Name Withheld]" msgid "[Name Withheld]"
msgstr "[Nom non-publié]" msgstr "[Nom non-publié]"
@ -1295,7 +1296,7 @@ msgstr "Conversion temporelle"
#: ../../mod/localtime.php:26 #: ../../mod/localtime.php:26
msgid "" 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." "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." 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: " msgstr "Groupe: "
#: ../../mod/content.php:438 ../../mod/content.php:722 #: ../../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" msgid "Select"
msgstr "Sélectionner" msgstr "Sélectionner"
#: ../../mod/content.php:455 ../../mod/content.php:815 #: ../../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 #: ../../object/Item.php:227 ../../object/Item.php:228
#, php-format #, php-format
msgid "View %s's profile @ %s" msgid "View %s's profile @ %s"
msgstr "Voir le profil de %s @ %s" msgstr "Voir le profil de %s @ %s"
#: ../../mod/content.php:465 ../../mod/content.php:827 #: ../../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 #, php-format
msgid "%s from %s" msgid "%s from %s"
msgstr "%s de %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" msgid "View in context"
msgstr "Voir dans le contexte" msgstr "Voir dans le contexte"
@ -1409,7 +1410,7 @@ msgid_plural "%d comments"
msgstr[0] "%d commentaire" msgstr[0] "%d commentaire"
msgstr[1] "%d commentaires" 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 #: ../../object/Item.php:279 ../../object/Item.php:292
msgid "comment" msgid "comment"
msgid_plural "comments" msgid_plural "comments"
@ -1541,10 +1542,10 @@ msgstr "Réseau"
msgid "Personal" msgid "Personal"
msgstr "Personnel" 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 #: ../../include/nav.php:77 ../../include/nav.php:115
msgid "Home" msgid "Home"
msgstr "Accueil" msgstr "Profil"
#: ../../mod/notifications.php:98 ../../include/nav.php:121 #: ../../mod/notifications.php:98 ../../include/nav.php:121
msgid "Introductions" msgid "Introductions"
@ -1986,7 +1987,7 @@ msgstr "Vous le/la suivez"
msgid "Edit contact" msgid "Edit contact"
msgstr "Éditer le 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 #: ../../include/nav.php:139
msgid "Contacts" msgid "Contacts"
msgstr "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:702
#: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661 #: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661
#: ../../addon/public_server/public_server.php:62 #: ../../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 #: ../../boot.php:799 ../../addon.old/facebook/facebook.php:702
#: ../../addon.old/facebook/facebook.php:1200 #: ../../addon.old/facebook/facebook.php:1200
#: ../../addon.old/fbpost/fbpost.php:661 #: ../../addon.old/fbpost/fbpost.php:661
@ -2113,9 +2114,8 @@ msgstr "Supprimer le compte"
#: ../../mod/settings.php:69 ../../mod/newmember.php:22 #: ../../mod/settings.php:69 ../../mod/newmember.php:22
#: ../../mod/admin.php:785 ../../mod/admin.php:990 #: ../../mod/admin.php:785 ../../mod/admin.php:990
#: ../../addon/dav/friendica/layout.fnk.php:225 #: ../../addon/dav/friendica/layout.fnk.php:225
#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:537 #: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:614
#: ../../view/theme/diabook/theme.php:658 ../../include/nav.php:137 #: ../../include/nav.php:137 ../../addon.old/dav/friendica/layout.fnk.php:225
#: ../../addon.old/dav/friendica/layout.fnk.php:225
#: ../../addon.old/mathjax/mathjax.php:36 #: ../../addon.old/mathjax/mathjax.php:36
msgid "Settings" msgid "Settings"
msgstr "Réglages" msgstr "Réglages"
@ -2779,7 +2779,7 @@ msgstr "Pas de destinataire."
#: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131 #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131
#: ../../mod/message.php:242 ../../mod/message.php:250 #: ../../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:" msgid "Please enter a link URL:"
msgstr "Entrez un lien web:" 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." 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 #: ../../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 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50
#: ../../boot.php:1684 #: ../../boot.php:1684
msgid "Profile" msgid "Profile"
@ -2901,7 +2901,7 @@ msgstr "Choisissez quelques mots-clé publics pour votre profil par défaut. Ils
#: ../../mod/newmember.php:44 #: ../../mod/newmember.php:44
msgid "Connecting" msgid "Connecting"
msgstr "" msgstr "Connexions"
#: ../../mod/newmember.php:49 ../../mod/newmember.php:51 #: ../../mod/newmember.php:49 ../../mod/newmember.php:51
#: ../../addon/facebook/facebook.php:728 ../../addon/fbpost/fbpost.php:239 #: ../../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 #: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1598
#: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:158
#: ../../addon/communityhome/communityhome.php:167 #: ../../addon/communityhome/communityhome.php:167
#: ../../view/theme/diabook/theme.php:459 #: ../../view/theme/diabook/theme.php:452
#: ../../view/theme/diabook/theme.php:468 ../../include/diaspora.php:1835 #: ../../view/theme/diabook/theme.php:461 ../../include/diaspora.php:1835
#: ../../include/conversation.php:120 ../../include/conversation.php:129 #: ../../include/conversation.php:120 ../../include/conversation.php:129
#: ../../include/conversation.php:248 ../../include/conversation.php:257 #: ../../include/conversation.php:248 ../../include/conversation.php:257
#: ../../addon.old/facebook/facebook.php:1598 #: ../../addon.old/facebook/facebook.php:1598
@ -3197,7 +3197,7 @@ msgstr "le statut"
#: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602 #: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602
#: ../../addon/communityhome/communityhome.php:172 #: ../../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 #: ../../include/conversation.php:136
#: ../../addon.old/facebook/facebook.php:1602 #: ../../addon.old/facebook/facebook.php:1602
#: ../../addon.old/communityhome/communityhome.php:172 #: ../../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/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159
#: ../../mod/admin.php:734 ../../mod/admin.php:933 ../../mod/display.php:29 #: ../../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." msgid "Item not found."
msgstr "Élément introuvable." msgstr "Élément introuvable."
@ -3220,7 +3220,7 @@ msgstr "Élément introuvable."
msgid "Access denied." msgid "Access denied."
msgstr "Accès refusé." 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 #: ../../include/nav.php:51 ../../boot.php:1691
msgid "Photos" msgid "Photos"
msgstr "Photos" msgstr "Photos"
@ -4520,8 +4520,8 @@ msgstr "visible par tous"
msgid "Edit visibility" msgid "Edit visibility"
msgstr "Changer la visibilité" msgstr "Changer la visibilité"
#: ../../mod/filer.php:29 ../../include/conversation.php:897 #: ../../mod/filer.php:29 ../../include/conversation.php:898
#: ../../include/conversation.php:914 #: ../../include/conversation.php:915
msgid "Save to Folder:" msgid "Save to Folder:"
msgstr "Sauver dans le Dossier:" msgstr "Sauver dans le Dossier:"
@ -4613,7 +4613,7 @@ msgstr "Texte source (format Diaspora) :"
msgid "diaspora2bb: " msgid "diaspora2bb: "
msgstr "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 #: ../../include/contact_widgets.php:34
msgid "Friend Suggestions" msgid "Friend Suggestions"
msgstr "Suggestions d'amitiés/contacts" 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" msgid "Ignore/Hide"
msgstr "Ignorer/cacher" 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" msgid "Global Directory"
msgstr "Annuaire global" msgstr "Annuaire global"
@ -5565,7 +5565,7 @@ msgid "Latest likes"
msgstr "Dernières approbations" msgstr "Dernières approbations"
#: ../../addon/communityhome/communityhome.php:155 #: ../../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 #: ../../include/conversation.php:117 ../../include/conversation.php:245
#: ../../addon.old/communityhome/communityhome.php:155 #: ../../addon.old/communityhome/communityhome.php:155
msgid "event" 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:30
#: ../../addon.old/dav/common/wdcal_edit.inc.php:738 #: ../../addon.old/dav/common/wdcal_edit.inc.php:738
msgid "Could not open component for editing" 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/common/wdcal_edit.inc.php:140
#: ../../addon/dav/friendica/layout.fnk.php:143 #: ../../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:254
#: ../../addon/dav/common/wdcal_edit.inc.php:270 #: ../../addon/dav/common/wdcal_edit.inc.php:270
#: ../../addon/dav/common/wdcal_edit.inc.php:293 #: ../../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:231
#: ../../addon.old/dav/common/wdcal_edit.inc.php:254 #: ../../addon.old/dav/common/wdcal_edit.inc.php:254
#: ../../addon.old/dav/common/wdcal_edit.inc.php:270 #: ../../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:235
#: ../../addon/dav/common/wdcal_edit.inc.php:274 #: ../../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:235
#: ../../addon.old/dav/common/wdcal_edit.inc.php:274 #: ../../addon.old/dav/common/wdcal_edit.inc.php:274
#: ../../addon.old/dav/common/wdcal_edit.inc.php:308 #: ../../addon.old/dav/common/wdcal_edit.inc.php:308
@ -5738,35 +5738,35 @@ msgid "Monday"
msgstr "Lundi" msgstr "Lundi"
#: ../../addon/dav/common/wdcal_edit.inc.php:238 #: ../../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:238
#: ../../addon.old/dav/common/wdcal_edit.inc.php:277 #: ../../addon.old/dav/common/wdcal_edit.inc.php:277
msgid "Tuesday" msgid "Tuesday"
msgstr "Mardi" msgstr "Mardi"
#: ../../addon/dav/common/wdcal_edit.inc.php:241 #: ../../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:241
#: ../../addon.old/dav/common/wdcal_edit.inc.php:280 #: ../../addon.old/dav/common/wdcal_edit.inc.php:280
msgid "Wednesday" msgid "Wednesday"
msgstr "Mercredi" msgstr "Mercredi"
#: ../../addon/dav/common/wdcal_edit.inc.php:244 #: ../../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:244
#: ../../addon.old/dav/common/wdcal_edit.inc.php:283 #: ../../addon.old/dav/common/wdcal_edit.inc.php:283
msgid "Thursday" msgid "Thursday"
msgstr "Jeudi" msgstr "Jeudi"
#: ../../addon/dav/common/wdcal_edit.inc.php:247 #: ../../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:247
#: ../../addon.old/dav/common/wdcal_edit.inc.php:286 #: ../../addon.old/dav/common/wdcal_edit.inc.php:286
msgid "Friday" msgid "Friday"
msgstr "Vendredi" msgstr "Vendredi"
#: ../../addon/dav/common/wdcal_edit.inc.php:250 #: ../../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:250
#: ../../addon.old/dav/common/wdcal_edit.inc.php:289 #: ../../addon.old/dav/common/wdcal_edit.inc.php:289
msgid "Saturday" msgid "Saturday"
@ -6391,7 +6391,7 @@ msgstr "Permissions distantes"
msgid "" msgid ""
"Allow recipients of your private posts to see the other recipients of the " "Allow recipients of your private posts to see the other recipients of the "
"posts" "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 #: ../../addon/remote_permissions/remote_permissions.php:57
msgid "Remote Permissions settings updated." msgid "Remote Permissions settings updated."
@ -6403,7 +6403,7 @@ msgstr "Visibilité"
#: ../../addon/remote_permissions/remote_permissions.php:177 #: ../../addon/remote_permissions/remote_permissions.php:177
msgid "may only be a partial list" msgid "may only be a partial list"
msgstr "" msgstr "peut être une liste partielle"
#: ../../addon/remote_permissions/remote_permissions.php:196 #: ../../addon/remote_permissions/remote_permissions.php:196
msgid "Global" msgid "Global"
@ -7579,137 +7579,135 @@ msgstr "Largeur du thème"
msgid "Color scheme" msgid "Color scheme"
msgstr "Palette de couleurs" 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 #: ../../include/nav.php:115
msgid "Your posts and conversations" msgid "Your posts and conversations"
msgstr "Vos notices et 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" msgid "Your profile page"
msgstr "Votre page de profil" msgstr "Votre page de profil"
#: ../../view/theme/diabook/theme.php:89 #: ../../view/theme/diabook/theme.php:88
msgid "Your contacts" msgid "Your contacts"
msgstr "Vos 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" msgid "Your photos"
msgstr "Vos 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" msgid "Your events"
msgstr "Vos événements" 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" msgid "Personal notes"
msgstr "Notes personnelles" 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" msgid "Your personal photos"
msgstr "Vos photos personnelles" msgstr "Vos photos personnelles"
#: ../../view/theme/diabook/theme.php:94 #: ../../view/theme/diabook/theme.php:93
#: ../../view/theme/diabook/theme.php:537
#: ../../view/theme/diabook/theme.php:632
#: ../../view/theme/diabook/config.php:163 #: ../../view/theme/diabook/config.php:163
msgid "Community Pages" msgid "Community Pages"
msgstr "Pages de Communauté" msgstr "Pages de Communauté"
#: ../../view/theme/diabook/theme.php:384 #: ../../view/theme/diabook/theme.php:377
#: ../../view/theme/diabook/theme.php:634 #: ../../view/theme/diabook/theme.php:591
#: ../../view/theme/diabook/config.php:165 #: ../../view/theme/diabook/config.php:165
msgid "Community Profiles" msgid "Community Profiles"
msgstr "Profils communautaires" msgstr "Profils communautaires"
#: ../../view/theme/diabook/theme.php:405 #: ../../view/theme/diabook/theme.php:398
#: ../../view/theme/diabook/theme.php:639 #: ../../view/theme/diabook/theme.php:596
#: ../../view/theme/diabook/config.php:170 #: ../../view/theme/diabook/config.php:170
msgid "Last users" msgid "Last users"
msgstr "Derniers utilisateurs" msgstr "Derniers utilisateurs"
#: ../../view/theme/diabook/theme.php:434 #: ../../view/theme/diabook/theme.php:427
#: ../../view/theme/diabook/theme.php:641 #: ../../view/theme/diabook/theme.php:598
#: ../../view/theme/diabook/config.php:172 #: ../../view/theme/diabook/config.php:172
msgid "Last likes" msgid "Last likes"
msgstr "Dernièrement aimé" msgstr "Dernièrement aimé"
#: ../../view/theme/diabook/theme.php:479 #: ../../view/theme/diabook/theme.php:472
#: ../../view/theme/diabook/theme.php:640 #: ../../view/theme/diabook/theme.php:597
#: ../../view/theme/diabook/config.php:171 #: ../../view/theme/diabook/config.php:171
msgid "Last photos" msgid "Last photos"
msgstr "Dernières photos" msgstr "Dernières photos"
#: ../../view/theme/diabook/theme.php:516 #: ../../view/theme/diabook/theme.php:509
#: ../../view/theme/diabook/theme.php:637 #: ../../view/theme/diabook/theme.php:594
#: ../../view/theme/diabook/config.php:168 #: ../../view/theme/diabook/config.php:168
msgid "Find Friends" msgid "Find Friends"
msgstr "Trouver des amis" msgstr "Trouver des amis"
#: ../../view/theme/diabook/theme.php:517 #: ../../view/theme/diabook/theme.php:510
msgid "Local Directory" msgid "Local Directory"
msgstr "Annuaire local" 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" msgid "Similar Interests"
msgstr "Intérêts similaires" 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" msgid "Invite Friends"
msgstr "Inviter des amis" msgstr "Inviter des amis"
#: ../../view/theme/diabook/theme.php:572 #: ../../view/theme/diabook/theme.php:531
#: ../../view/theme/diabook/theme.php:633 #: ../../view/theme/diabook/theme.php:590
#: ../../view/theme/diabook/config.php:164 #: ../../view/theme/diabook/config.php:164
msgid "Earth Layers" msgid "Earth Layers"
msgstr "Géolocalisation" msgstr "Géolocalisation"
#: ../../view/theme/diabook/theme.php:577 #: ../../view/theme/diabook/theme.php:536
msgid "Set zoomfactor for Earth Layers" msgid "Set zoomfactor for Earth Layers"
msgstr "Régler le niveau de zoom pour la géolocalisation" 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 #: ../../view/theme/diabook/config.php:161
msgid "Set longitude (X) for Earth Layers" msgid "Set longitude (X) for Earth Layers"
msgstr "Régler la longitude (X) pour la géolocalisation" 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 #: ../../view/theme/diabook/config.php:162
msgid "Set latitude (Y) for Earth Layers" msgid "Set latitude (Y) for Earth Layers"
msgstr "Régler la latitude (Y) pour la géolocalisation" 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:592
#: ../../view/theme/diabook/theme.php:635
#: ../../view/theme/diabook/config.php:166 #: ../../view/theme/diabook/config.php:166
msgid "Help or @NewHere ?" msgid "Help or @NewHere ?"
msgstr "Aide ou @NewHere?" msgstr "Aide ou @NewHere?"
#: ../../view/theme/diabook/theme.php:599 #: ../../view/theme/diabook/theme.php:558
#: ../../view/theme/diabook/theme.php:636 #: ../../view/theme/diabook/theme.php:593
#: ../../view/theme/diabook/config.php:167 #: ../../view/theme/diabook/config.php:167
msgid "Connect Services" msgid "Connect Services"
msgstr "Connecter des services" msgstr "Connecter des services"
#: ../../view/theme/diabook/theme.php:606 #: ../../view/theme/diabook/theme.php:565
#: ../../view/theme/diabook/theme.php:638 #: ../../view/theme/diabook/theme.php:595
msgid "Last Tweets" msgid "Last Tweets"
msgstr "Derniers tweets" msgstr "Derniers tweets"
#: ../../view/theme/diabook/theme.php:609 #: ../../view/theme/diabook/theme.php:568
#: ../../view/theme/diabook/config.php:159 #: ../../view/theme/diabook/config.php:159
msgid "Set twitter search term" msgid "Set twitter search term"
msgstr "Rechercher un terme twitter" 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 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:288
msgid "don't show" msgid "don't show"
msgstr "cacher" 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 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:287
msgid "show" msgid "show"
msgstr "montrer" msgstr "montrer"
#: ../../view/theme/diabook/theme.php:630 #: ../../view/theme/diabook/theme.php:588
msgid "Show/hide boxes at right-hand column:" msgid "Show/hide boxes at right-hand column:"
msgstr "Montrer/cacher les boîtes dans la colonne de droite :" msgstr "Montrer/cacher les boîtes dans la colonne de droite :"
@ -7748,7 +7746,7 @@ msgstr "Centre"
#: ../../view/theme/quattro/config.php:69 #: ../../view/theme/quattro/config.php:69
msgid "Posts font size" msgid "Posts font size"
msgstr "" msgstr "Taille de texte des messages"
#: ../../view/theme/quattro/config.php:70 #: ../../view/theme/quattro/config.php:70
msgid "Textareas font size" msgid "Textareas font size"
@ -8295,79 +8293,79 @@ msgstr "détendue"
msgid "surprised" msgid "surprised"
msgstr "surprise" msgstr "surprise"
#: ../../include/text.php:921 #: ../../include/text.php:919
msgid "January" msgid "January"
msgstr "Janvier" msgstr "Janvier"
#: ../../include/text.php:921 #: ../../include/text.php:919
msgid "February" msgid "February"
msgstr "Février" msgstr "Février"
#: ../../include/text.php:921 #: ../../include/text.php:919
msgid "March" msgid "March"
msgstr "Mars" msgstr "Mars"
#: ../../include/text.php:921 #: ../../include/text.php:919
msgid "April" msgid "April"
msgstr "Avril" msgstr "Avril"
#: ../../include/text.php:921 #: ../../include/text.php:919
msgid "May" msgid "May"
msgstr "Mai" msgstr "Mai"
#: ../../include/text.php:921 #: ../../include/text.php:919
msgid "June" msgid "June"
msgstr "Juin" msgstr "Juin"
#: ../../include/text.php:921 #: ../../include/text.php:919
msgid "July" msgid "July"
msgstr "Juillet" msgstr "Juillet"
#: ../../include/text.php:921 #: ../../include/text.php:919
msgid "August" msgid "August"
msgstr "Août" msgstr "Août"
#: ../../include/text.php:921 #: ../../include/text.php:919
msgid "September" msgid "September"
msgstr "Septembre" msgstr "Septembre"
#: ../../include/text.php:921 #: ../../include/text.php:919
msgid "October" msgid "October"
msgstr "Octobre" msgstr "Octobre"
#: ../../include/text.php:921 #: ../../include/text.php:919
msgid "November" msgid "November"
msgstr "Novembre" msgstr "Novembre"
#: ../../include/text.php:921 #: ../../include/text.php:919
msgid "December" msgid "December"
msgstr "Décembre" msgstr "Décembre"
#: ../../include/text.php:1007 #: ../../include/text.php:1005
msgid "bytes" msgid "bytes"
msgstr "octets" msgstr "octets"
#: ../../include/text.php:1034 ../../include/text.php:1046 #: ../../include/text.php:1032 ../../include/text.php:1044
msgid "Click to open/close" msgid "Click to open/close"
msgstr "Cliquer pour ouvrir/fermer" msgstr "Cliquer pour ouvrir/fermer"
#: ../../include/text.php:1219 ../../include/user.php:236 #: ../../include/text.php:1217 ../../include/user.php:236
msgid "default" msgid "default"
msgstr "défaut" msgstr "défaut"
#: ../../include/text.php:1231 #: ../../include/text.php:1229
msgid "Select an alternate language" msgid "Select an alternate language"
msgstr "Choisir une langue alternative" msgstr "Choisir une langue alternative"
#: ../../include/text.php:1441 #: ../../include/text.php:1439
msgid "activity" msgid "activity"
msgstr "activité" msgstr "activité"
#: ../../include/text.php:1444 #: ../../include/text.php:1442
msgid "post" msgid "post"
msgstr "publication" msgstr "publication"
#: ../../include/text.php:1599 #: ../../include/text.php:1597
msgid "Item filed" msgid "Item filed"
msgstr "Élément classé" msgstr "Élément classé"
@ -8660,17 +8658,17 @@ msgstr "secondes"
msgid "%1$d %2$s ago" msgid "%1$d %2$s ago"
msgstr "%1$d %2$s auparavant" msgstr "%1$d %2$s auparavant"
#: ../../include/datetime.php:472 ../../include/items.php:1688 #: ../../include/datetime.php:472 ../../include/items.php:1689
#, php-format #, php-format
msgid "%s's birthday" msgid "%s's birthday"
msgstr "Anniversaire de %s's" msgstr "Anniversaire de %s's"
#: ../../include/datetime.php:473 ../../include/items.php:1689 #: ../../include/datetime.php:473 ../../include/items.php:1690
#, php-format #, php-format
msgid "Happy Birthday %s" msgid "Happy Birthday %s"
msgstr "Joyeux anniversaire, %s !" msgstr "Joyeux anniversaire, %s !"
#: ../../include/onepoll.php:409 #: ../../include/onepoll.php:414
msgid "From: " msgid "From: "
msgstr "De: " msgstr "De: "
@ -8940,15 +8938,15 @@ msgstr "Impossible de récupérer les informations du contact."
msgid "following" msgid "following"
msgstr "following" msgstr "following"
#: ../../include/items.php:3299 #: ../../include/items.php:3300
msgid "A new person is sharing with you at " msgid "A new person is sharing with you at "
msgstr "Une nouvelle personne partage avec vous à " msgstr "Une nouvelle personne partage avec vous à "
#: ../../include/items.php:3299 #: ../../include/items.php:3300
msgid "You have a new follower at " msgid "You have a new follower at "
msgstr "Vous avez un nouvel abonné à " msgstr "Vous avez un nouvel abonné à "
#: ../../include/items.php:3980 #: ../../include/items.php:3981
msgid "Archives" msgid "Archives"
msgstr "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" msgid "stopped following"
msgstr "retiré de la liste de suivi" 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" msgid "Poke"
msgstr "Sollicitations (pokes)" msgstr "Sollicitations (pokes)"
#: ../../include/Contact.php:221 ../../include/conversation.php:784 #: ../../include/Contact.php:221 ../../include/conversation.php:785
msgid "View Status" msgid "View Status"
msgstr "Voir les statuts" msgstr "Voir les statuts"
#: ../../include/Contact.php:222 ../../include/conversation.php:785 #: ../../include/Contact.php:222 ../../include/conversation.php:786
msgid "View Profile" msgid "View Profile"
msgstr "Voir le profil" msgstr "Voir le profil"
#: ../../include/Contact.php:223 ../../include/conversation.php:786 #: ../../include/Contact.php:223 ../../include/conversation.php:787
msgid "View Photos" msgid "View Photos"
msgstr "Voir les photos" msgstr "Voir les photos"
#: ../../include/Contact.php:224 ../../include/Contact.php:237 #: ../../include/Contact.php:224 ../../include/Contact.php:237
#: ../../include/conversation.php:787 #: ../../include/conversation.php:788
msgid "Network Posts" msgid "Network Posts"
msgstr "Posts du Réseau" msgstr "Posts du Réseau"
#: ../../include/Contact.php:225 ../../include/Contact.php:237 #: ../../include/Contact.php:225 ../../include/Contact.php:237
#: ../../include/conversation.php:788 #: ../../include/conversation.php:789
msgid "Edit Contact" msgid "Edit Contact"
msgstr "Éditer le contact" msgstr "Éditer le contact"
#: ../../include/Contact.php:226 ../../include/Contact.php:237 #: ../../include/Contact.php:226 ../../include/Contact.php:237
#: ../../include/conversation.php:789 #: ../../include/conversation.php:790
msgid "Send PM" msgid "Send PM"
msgstr "Message privé" msgstr "Message privé"
@ -9087,86 +9085,86 @@ msgstr "publication/élément"
msgid "%1$s marked %2$s's %3$s as favorite" msgid "%1$s marked %2$s's %3$s as favorite"
msgstr "%1$s a marqué le %3$s de %2$s comme favori" 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:" msgid "Categories:"
msgstr "Catégories:" msgstr "Catégories:"
#: ../../include/conversation.php:595 ../../object/Item.php:219 #: ../../include/conversation.php:596 ../../object/Item.php:219
msgid "Filed under:" msgid "Filed under:"
msgstr "Rangé sous:" msgstr "Rangé sous:"
#: ../../include/conversation.php:680 #: ../../include/conversation.php:681
msgid "remove" msgid "remove"
msgstr "enlever" msgstr "enlever"
#: ../../include/conversation.php:684 #: ../../include/conversation.php:685
msgid "Delete Selected Items" msgid "Delete Selected Items"
msgstr "Supprimer les éléments sélectionnés" msgstr "Supprimer les éléments sélectionnés"
#: ../../include/conversation.php:783 #: ../../include/conversation.php:784
msgid "Follow Thread" msgid "Follow Thread"
msgstr "Suivre le fil" msgstr "Suivre le fil"
#: ../../include/conversation.php:852 #: ../../include/conversation.php:853
#, php-format #, php-format
msgid "%s likes this." msgid "%s likes this."
msgstr "%s aime ça." msgstr "%s aime ça."
#: ../../include/conversation.php:852 #: ../../include/conversation.php:853
#, php-format #, php-format
msgid "%s doesn't like this." msgid "%s doesn't like this."
msgstr "%s n'aime pas ça." msgstr "%s n'aime pas ça."
#: ../../include/conversation.php:856 #: ../../include/conversation.php:857
#, php-format #, php-format
msgid "<span %1$s>%2$d people</span> like this." msgid "<span %1$s>%2$d people</span> like this."
msgstr "<span %1$s>%2$d personnes</span> aiment ça." msgstr "<span %1$s>%2$d personnes</span> aiment ça."
#: ../../include/conversation.php:858 #: ../../include/conversation.php:859
#, php-format #, php-format
msgid "<span %1$s>%2$d people</span> don't like this." msgid "<span %1$s>%2$d people</span> don't like this."
msgstr "<span %1$s>%2$d personnes</span> n'aiment pas ça." msgstr "<span %1$s>%2$d personnes</span> n'aiment pas ça."
#: ../../include/conversation.php:864 #: ../../include/conversation.php:865
msgid "and" msgid "and"
msgstr "et" msgstr "et"
#: ../../include/conversation.php:867 #: ../../include/conversation.php:868
#, php-format #, php-format
msgid ", and %d other people" msgid ", and %d other people"
msgstr ", et %d autres personnes" msgstr ", et %d autres personnes"
#: ../../include/conversation.php:868 #: ../../include/conversation.php:869
#, php-format #, php-format
msgid "%s like this." msgid "%s like this."
msgstr "%s aiment ça." msgstr "%s aiment ça."
#: ../../include/conversation.php:868 #: ../../include/conversation.php:869
#, php-format #, php-format
msgid "%s don't like this." msgid "%s don't like this."
msgstr "%s n'aiment pas ça." 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 <strong>everybody</strong>" msgid "Visible to <strong>everybody</strong>"
msgstr "Visible par <strong>tout le monde</strong>" msgstr "Visible par <strong>tout le monde</strong>"
#: ../../include/conversation.php:894 ../../include/conversation.php:911 #: ../../include/conversation.php:895 ../../include/conversation.php:912
msgid "Please enter a video link/URL:" msgid "Please enter a video link/URL:"
msgstr "Entrez un lien/URL video :" 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:" msgid "Please enter an audio link/URL:"
msgstr "Entrez un lien/URL audio :" 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:" msgid "Tag term:"
msgstr "Tag : " msgstr "Tag : "
#: ../../include/conversation.php:898 ../../include/conversation.php:915 #: ../../include/conversation.php:899 ../../include/conversation.php:916
msgid "Where are you right now?" msgid "Where are you right now?"
msgstr "Où êtes-vous présentemment?" msgstr "Où êtes-vous présentemment?"
#: ../../include/conversation.php:977 #: ../../include/conversation.php:978
msgid "permissions" msgid "permissions"
msgstr "permissions" msgstr "permissions"

View file

@ -255,7 +255,7 @@ $a->strings["<h1>What next</h1>"] = "<h1>Ensuite</h1>";
$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["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["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
$a->strings["Time Conversion"] = "Conversion temporelle"; $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["UTC time: %s"] = "Temps UTC : %s";
$a->strings["Current timezone: %s"] = "Zone de temps courante : %s"; $a->strings["Current timezone: %s"] = "Zone de temps courante : %s";
$a->strings["Converted localtime: %s"] = "Temps local converti : %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["System"] = "Système";
$a->strings["Network"] = "Réseau"; $a->strings["Network"] = "Réseau";
$a->strings["Personal"] = "Personnel"; $a->strings["Personal"] = "Personnel";
$a->strings["Home"] = "Accueil"; $a->strings["Home"] = "Profil";
$a->strings["Introductions"] = "Introductions"; $a->strings["Introductions"] = "Introductions";
$a->strings["Messages"] = "Messages"; $a->strings["Messages"] = "Messages";
$a->strings["Show Ignored Requests"] = "Voir les demandes ignorées"; $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 <strong>default</strong> profile to your liking. Review the settings for hiding your list of friends and hiding the profile from unknown visitors."] = "Éditez votre profil <strong>par défaut</strong> à votre convenance. Vérifiez les réglages concernant la visibilité de votre liste d'amis par les visiteurs inconnus."; $a->strings["Edit your <strong>default</strong> profile to your liking. Review the settings for hiding your list of friends and hiding the profile from unknown visitors."] = "Éditez votre profil <strong>par défaut</strong> à 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["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["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["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["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["<em>If</em> this is your own personal server, installing the Facebook addon may ease your transition to the free social web."] = "<em>Si</em> ceci est votre propre serveur, installer le connecteur Facebook peut adoucir votre transition vers le web social libre."; $a->strings["<em>If</em> this is your own personal server, installing the Facebook addon may ease your transition to the free social web."] = "<em>Si</em> 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["Latest likes"] = "Dernières approbations";
$a->strings["event"] = "évènement"; $a->strings["event"] = "évènement";
$a->strings["No access"] = "Pas d'accès"; $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["Go back to the calendar"] = "Revenir au calendrier";
$a->strings["Event data"] = "Données de l'évènement"; $a->strings["Event data"] = "Données de l'évènement";
$a->strings["Calendar"] = "Calendrier"; $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["dreamwidth password"] = "Mot de passe";
$a->strings["Post to dreamwidth by default"] = "Poster vers Dreamwidth par défaut"; $a->strings["Post to dreamwidth by default"] = "Poster vers Dreamwidth par défaut";
$a->strings["Remote Permissions Settings"] = "Permissions distantes"; $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["Remote Permissions settings updated."] = "Permissions distantes mises-à-jour.";
$a->strings["Visible to"] = "Visibilité"; $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["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["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"; $a->strings["Individual"] = "Individuel";
@ -1631,7 +1631,7 @@ $a->strings["Last tweets"] = "Derniers tweets";
$a->strings["Alignment"] = "Alignement"; $a->strings["Alignment"] = "Alignement";
$a->strings["Left"] = "Gauche"; $a->strings["Left"] = "Gauche";
$a->strings["Center"] = "Centre"; $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["Textareas font size"] = "";
$a->strings["Set colour scheme"] = "Choisir le schéma de couleurs"; $a->strings["Set colour scheme"] = "Choisir le schéma de couleurs";
$a->strings["j F, Y"] = "j F, Y"; $a->strings["j F, Y"] = "j F, Y";

View file

@ -89,16 +89,8 @@
$(obj).val(''); $(obj).val('');
} }
function showHideComments(id) { window.showMore = "$showmore";
if( $('#collapsed-comments-' + id).is(':visible')) { window.showFewer = "$showfewer";
$('#collapsed-comments-' + id).hide();
$('#hide-comments-' + id).html('$showmore');
}
else {
$('#collapsed-comments-' + id).show();
$('#hide-comments-' + id).html('$showfewer');
}
}
function showHideCommentBox(id) { function showHideCommentBox(id) {
if( $('#comment-edit-form-' + id).is(':visible')) { if( $('#comment-edit-form-' + id).is(':visible')) {

View file

@ -12,8 +12,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: friendica\n" "Project-Id-Version: friendica\n"
"Report-Msgid-Bugs-To: http://bugs.friendica.com/\n" "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
"POT-Creation-Date: 2012-10-21 10:00-0700\n" "POT-Creation-Date: 2012-10-29 10:00-0700\n"
"PO-Revision-Date: 2012-10-22 12:47+0000\n" "PO-Revision-Date: 2012-10-25 07:03+0000\n"
"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n" "Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\n" "Language-Team: Italian (http://www.transifex.com/projects/p/friendica/language/it/)\n"
"MIME-Version: 1.0\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 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510
#: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:159 #: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:159
#: ../../addon/fbpost/fbpost.php:165 #: ../../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 #: ../../index.php:319 ../../addon.old/facebook/facebook.php:510
#: ../../addon.old/facebook/facebook.php:516 #: ../../addon.old/facebook/facebook.php:516
#: ../../addon.old/fbpost/fbpost.php:159 ../../addon.old/fbpost/fbpost.php:165 #: ../../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/irc/irc.php:55 ../../addon/fromapp/fromapp.php:77
#: ../../addon/blogger/blogger.php:102 ../../addon/posterous/posterous.php:103 #: ../../addon/blogger/blogger.php:102 ../../addon/posterous/posterous.php:103
#: ../../view/theme/cleanzero/config.php:80 #: ../../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/diabook/config.php:152
#: ../../view/theme/quattro/config.php:64 ../../view/theme/dispy/config.php:70 #: ../../view/theme/quattro/config.php:64 ../../view/theme/dispy/config.php:70
#: ../../object/Item.php:558 ../../addon.old/fromgplus/fromgplus.php:40 #: ../../object/Item.php:558 ../../addon.old/fromgplus/fromgplus.php:40
@ -290,7 +290,7 @@ msgstr "Modifca l'evento"
msgid "link to source" msgid "link to source"
msgstr "Collegamento all'originale" 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 #: ../../include/nav.php:52 ../../boot.php:1701
msgid "Events" msgid "Events"
msgstr "Eventi" msgstr "Eventi"
@ -442,7 +442,7 @@ msgstr "Album foto"
#: ../../mod/photos.php:1095 ../../mod/photos.php:1110 #: ../../mod/photos.php:1095 ../../mod/photos.php:1110
#: ../../mod/photos.php:1562 ../../mod/photos.php:1574 #: ../../mod/photos.php:1562 ../../mod/photos.php:1574
#: ../../addon/communityhome/communityhome.php:110 #: ../../addon/communityhome/communityhome.php:110
#: ../../view/theme/diabook/theme.php:492 #: ../../view/theme/diabook/theme.php:485
#: ../../addon.old/communityhome/communityhome.php:110 #: ../../addon.old/communityhome/communityhome.php:110
msgid "Contact Photos" msgid "Contact Photos"
msgstr "Foto dei contatti" 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:204 ../../mod/profile_photo.php:296
#: ../../mod/profile_photo.php:305 #: ../../mod/profile_photo.php:305
#: ../../addon/communityhome/communityhome.php:111 #: ../../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 #: ../../include/user.php:331 ../../include/user.php:338
#: ../../addon.old/communityhome/communityhome.php:111 #: ../../addon.old/communityhome/communityhome.php:111
msgid "Profile Photos" 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/photos.php:606 ../../mod/like.php:145 ../../mod/subthread.php:87
#: ../../mod/tagger.php:62 ../../addon/communityhome/communityhome.php:163 #: ../../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/diaspora.php:1835 ../../include/conversation.php:125
#: ../../include/conversation.php:253 #: ../../include/conversation.php:253
#: ../../addon.old/communityhome/communityhome.php:163 #: ../../addon.old/communityhome/communityhome.php:163
@ -701,7 +701,7 @@ msgstr "Foto recenti"
msgid "Not available." msgid "Not available."
msgstr "Non disponibile." 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 #: ../../include/nav.php:101
msgid "Community" msgid "Community"
msgstr "Comunità" msgstr "Comunità"
@ -961,7 +961,7 @@ msgstr "Conferma la tua richiesta di connessione con %s."
msgid "Confirm" msgid "Confirm"
msgstr "Conferma" msgstr "Conferma"
#: ../../mod/dfrn_request.php:715 ../../include/items.php:3292 #: ../../mod/dfrn_request.php:715 ../../include/items.php:3293
msgid "[Name Withheld]" msgid "[Name Withheld]"
msgstr "[Nome Nascosto]" msgstr "[Nome Nascosto]"
@ -1544,7 +1544,7 @@ msgstr "Rete"
msgid "Personal" msgid "Personal"
msgstr "Personale" 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 #: ../../include/nav.php:77 ../../include/nav.php:115
msgid "Home" msgid "Home"
msgstr "Home" msgstr "Home"
@ -1989,7 +1989,7 @@ msgstr "sei un fan di"
msgid "Edit contact" msgid "Edit contact"
msgstr "Modifca contatto" 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 #: ../../include/nav.php:139
msgid "Contacts" msgid "Contacts"
msgstr "Contatti" msgstr "Contatti"
@ -2026,7 +2026,7 @@ msgstr "Richiesta reimpostazione password su %s"
#: ../../addon/facebook/facebook.php:702 #: ../../addon/facebook/facebook.php:702
#: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661 #: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661
#: ../../addon/public_server/public_server.php:62 #: ../../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 #: ../../boot.php:799 ../../addon.old/facebook/facebook.php:702
#: ../../addon.old/facebook/facebook.php:1200 #: ../../addon.old/facebook/facebook.php:1200
#: ../../addon.old/fbpost/fbpost.php:661 #: ../../addon.old/fbpost/fbpost.php:661
@ -2116,9 +2116,8 @@ msgstr ""
#: ../../mod/settings.php:69 ../../mod/newmember.php:22 #: ../../mod/settings.php:69 ../../mod/newmember.php:22
#: ../../mod/admin.php:785 ../../mod/admin.php:990 #: ../../mod/admin.php:785 ../../mod/admin.php:990
#: ../../addon/dav/friendica/layout.fnk.php:225 #: ../../addon/dav/friendica/layout.fnk.php:225
#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:537 #: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:614
#: ../../view/theme/diabook/theme.php:658 ../../include/nav.php:137 #: ../../include/nav.php:137 ../../addon.old/dav/friendica/layout.fnk.php:225
#: ../../addon.old/dav/friendica/layout.fnk.php:225
#: ../../addon.old/mathjax/mathjax.php:36 #: ../../addon.old/mathjax/mathjax.php:36
msgid "Settings" msgid "Settings"
msgstr "Impostazioni" 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." 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 #: ../../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 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50
#: ../../boot.php:1684 #: ../../boot.php:1684
msgid "Profile" 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 #: ../../mod/newmember.php:66 ../../include/group.php:270
msgid "Groups" msgid "Groups"
msgstr "Grouppi" msgstr "Gruppi"
#: ../../mod/newmember.php:70 #: ../../mod/newmember.php:70
msgid "Group Your Contacts" msgid "Group Your Contacts"
@ -3188,8 +3187,8 @@ msgstr "Cerca persone"
#: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1598 #: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1598
#: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:158
#: ../../addon/communityhome/communityhome.php:167 #: ../../addon/communityhome/communityhome.php:167
#: ../../view/theme/diabook/theme.php:459 #: ../../view/theme/diabook/theme.php:452
#: ../../view/theme/diabook/theme.php:468 ../../include/diaspora.php:1835 #: ../../view/theme/diabook/theme.php:461 ../../include/diaspora.php:1835
#: ../../include/conversation.php:120 ../../include/conversation.php:129 #: ../../include/conversation.php:120 ../../include/conversation.php:129
#: ../../include/conversation.php:248 ../../include/conversation.php:257 #: ../../include/conversation.php:248 ../../include/conversation.php:257
#: ../../addon.old/facebook/facebook.php:1598 #: ../../addon.old/facebook/facebook.php:1598
@ -3200,7 +3199,7 @@ msgstr "stato"
#: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602 #: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602
#: ../../addon/communityhome/communityhome.php:172 #: ../../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 #: ../../include/conversation.php:136
#: ../../addon.old/facebook/facebook.php:1602 #: ../../addon.old/facebook/facebook.php:1602
#: ../../addon.old/communityhome/communityhome.php:172 #: ../../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/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159
#: ../../mod/admin.php:734 ../../mod/admin.php:933 ../../mod/display.php:29 #: ../../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." msgid "Item not found."
msgstr "Elemento non trovato." msgstr "Elemento non trovato."
@ -3223,7 +3222,7 @@ msgstr "Elemento non trovato."
msgid "Access denied." msgid "Access denied."
msgstr "Accesso negato." 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 #: ../../include/nav.php:51 ../../boot.php:1691
msgid "Photos" msgid "Photos"
msgstr "Foto" msgstr "Foto"
@ -4616,7 +4615,7 @@ msgstr ""
msgid "diaspora2bb: " msgid "diaspora2bb: "
msgstr "" 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 #: ../../include/contact_widgets.php:34
msgid "Friend Suggestions" msgid "Friend Suggestions"
msgstr "Contatti suggeriti" msgstr "Contatti suggeriti"
@ -4631,7 +4630,7 @@ msgstr "Nessun suggerimento disponibile. Se questo è un sito nuovo, riprova tra
msgid "Ignore/Hide" msgid "Ignore/Hide"
msgstr "Ignora / Nascondi" 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" msgid "Global Directory"
msgstr "Elenco globale" msgstr "Elenco globale"
@ -5568,7 +5567,7 @@ msgid "Latest likes"
msgstr "Ultimi \"mi piace\"" msgstr "Ultimi \"mi piace\""
#: ../../addon/communityhome/communityhome.php:155 #: ../../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 #: ../../include/conversation.php:117 ../../include/conversation.php:245
#: ../../addon.old/communityhome/communityhome.php:155 #: ../../addon.old/communityhome/communityhome.php:155
msgid "event" msgid "event"
@ -7582,137 +7581,135 @@ msgstr ""
msgid "Color scheme" msgid "Color scheme"
msgstr "Schema colori" 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 #: ../../include/nav.php:115
msgid "Your posts and conversations" msgid "Your posts and conversations"
msgstr "I tuoi messaggi e le tue conversazioni" 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" msgid "Your profile page"
msgstr "Pagina del tuo profilo" msgstr "Pagina del tuo profilo"
#: ../../view/theme/diabook/theme.php:89 #: ../../view/theme/diabook/theme.php:88
msgid "Your contacts" msgid "Your contacts"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:51 #: ../../view/theme/diabook/theme.php:89 ../../include/nav.php:51
msgid "Your photos" msgid "Your photos"
msgstr "Le tue foto" 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" msgid "Your events"
msgstr "I tuoi eventi" 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" msgid "Personal notes"
msgstr "Note personali" 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" msgid "Your personal photos"
msgstr "Le tue foto personali" msgstr "Le tue foto personali"
#: ../../view/theme/diabook/theme.php:94 #: ../../view/theme/diabook/theme.php:93
#: ../../view/theme/diabook/theme.php:537
#: ../../view/theme/diabook/theme.php:632
#: ../../view/theme/diabook/config.php:163 #: ../../view/theme/diabook/config.php:163
msgid "Community Pages" msgid "Community Pages"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:384 #: ../../view/theme/diabook/theme.php:377
#: ../../view/theme/diabook/theme.php:634 #: ../../view/theme/diabook/theme.php:591
#: ../../view/theme/diabook/config.php:165 #: ../../view/theme/diabook/config.php:165
msgid "Community Profiles" msgid "Community Profiles"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:405 #: ../../view/theme/diabook/theme.php:398
#: ../../view/theme/diabook/theme.php:639 #: ../../view/theme/diabook/theme.php:596
#: ../../view/theme/diabook/config.php:170 #: ../../view/theme/diabook/config.php:170
msgid "Last users" msgid "Last users"
msgstr "Ultimi utenti" msgstr "Ultimi utenti"
#: ../../view/theme/diabook/theme.php:434 #: ../../view/theme/diabook/theme.php:427
#: ../../view/theme/diabook/theme.php:641 #: ../../view/theme/diabook/theme.php:598
#: ../../view/theme/diabook/config.php:172 #: ../../view/theme/diabook/config.php:172
msgid "Last likes" msgid "Last likes"
msgstr "Ultimi \"mi piace\"" msgstr "Ultimi \"mi piace\""
#: ../../view/theme/diabook/theme.php:479 #: ../../view/theme/diabook/theme.php:472
#: ../../view/theme/diabook/theme.php:640 #: ../../view/theme/diabook/theme.php:597
#: ../../view/theme/diabook/config.php:171 #: ../../view/theme/diabook/config.php:171
msgid "Last photos" msgid "Last photos"
msgstr "Ultime foto" msgstr "Ultime foto"
#: ../../view/theme/diabook/theme.php:516 #: ../../view/theme/diabook/theme.php:509
#: ../../view/theme/diabook/theme.php:637 #: ../../view/theme/diabook/theme.php:594
#: ../../view/theme/diabook/config.php:168 #: ../../view/theme/diabook/config.php:168
msgid "Find Friends" msgid "Find Friends"
msgstr "Trova Amici" msgstr "Trova Amici"
#: ../../view/theme/diabook/theme.php:517 #: ../../view/theme/diabook/theme.php:510
msgid "Local Directory" msgid "Local Directory"
msgstr "Elenco Locale" 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" msgid "Similar Interests"
msgstr "Interessi simili" 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" msgid "Invite Friends"
msgstr "Invita amici" msgstr "Invita amici"
#: ../../view/theme/diabook/theme.php:572 #: ../../view/theme/diabook/theme.php:531
#: ../../view/theme/diabook/theme.php:633 #: ../../view/theme/diabook/theme.php:590
#: ../../view/theme/diabook/config.php:164 #: ../../view/theme/diabook/config.php:164
msgid "Earth Layers" msgid "Earth Layers"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:577 #: ../../view/theme/diabook/theme.php:536
msgid "Set zoomfactor for Earth Layers" msgid "Set zoomfactor for Earth Layers"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:578 #: ../../view/theme/diabook/theme.php:537
#: ../../view/theme/diabook/config.php:161 #: ../../view/theme/diabook/config.php:161
msgid "Set longitude (X) for Earth Layers" msgid "Set longitude (X) for Earth Layers"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:579 #: ../../view/theme/diabook/theme.php:538
#: ../../view/theme/diabook/config.php:162 #: ../../view/theme/diabook/config.php:162
msgid "Set latitude (Y) for Earth Layers" msgid "Set latitude (Y) for Earth Layers"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:551
#: ../../view/theme/diabook/theme.php:592 #: ../../view/theme/diabook/theme.php:592
#: ../../view/theme/diabook/theme.php:635
#: ../../view/theme/diabook/config.php:166 #: ../../view/theme/diabook/config.php:166
msgid "Help or @NewHere ?" msgid "Help or @NewHere ?"
msgstr "Serve aiuto? Sei nuovo?" msgstr "Serve aiuto? Sei nuovo?"
#: ../../view/theme/diabook/theme.php:599 #: ../../view/theme/diabook/theme.php:558
#: ../../view/theme/diabook/theme.php:636 #: ../../view/theme/diabook/theme.php:593
#: ../../view/theme/diabook/config.php:167 #: ../../view/theme/diabook/config.php:167
msgid "Connect Services" msgid "Connect Services"
msgstr "Servizi di conessione" msgstr "Servizi di conessione"
#: ../../view/theme/diabook/theme.php:606 #: ../../view/theme/diabook/theme.php:565
#: ../../view/theme/diabook/theme.php:638 #: ../../view/theme/diabook/theme.php:595
msgid "Last Tweets" msgid "Last Tweets"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:609 #: ../../view/theme/diabook/theme.php:568
#: ../../view/theme/diabook/config.php:159 #: ../../view/theme/diabook/config.php:159
msgid "Set twitter search term" msgid "Set twitter search term"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:629 #: ../../view/theme/diabook/theme.php:587
#: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:288 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:288
msgid "don't show" msgid "don't show"
msgstr "non mostrare" 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 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:287
msgid "show" msgid "show"
msgstr "mostra" msgstr "mostra"
#: ../../view/theme/diabook/theme.php:630 #: ../../view/theme/diabook/theme.php:588
msgid "Show/hide boxes at right-hand column:" msgid "Show/hide boxes at right-hand column:"
msgstr "" msgstr ""
@ -8663,12 +8660,12 @@ msgstr "secondi"
msgid "%1$d %2$s ago" msgid "%1$d %2$s ago"
msgstr "%1$d %2$s fa" msgstr "%1$d %2$s fa"
#: ../../include/datetime.php:472 ../../include/items.php:1688 #: ../../include/datetime.php:472 ../../include/items.php:1689
#, php-format #, php-format
msgid "%s's birthday" msgid "%s's birthday"
msgstr "" msgstr ""
#: ../../include/datetime.php:473 ../../include/items.php:1689 #: ../../include/datetime.php:473 ../../include/items.php:1690
#, php-format #, php-format
msgid "Happy Birthday %s" msgid "Happy Birthday %s"
msgstr "" msgstr ""
@ -8943,15 +8940,15 @@ msgstr "Impossibile recuperare informazioni sul contatto."
msgid "following" msgid "following"
msgstr "segue" msgstr "segue"
#: ../../include/items.php:3299 #: ../../include/items.php:3300
msgid "A new person is sharing with you at " msgid "A new person is sharing with you at "
msgstr "Una nuova persona sta condividendo con te da " msgstr "Una nuova persona sta condividendo con te da "
#: ../../include/items.php:3299 #: ../../include/items.php:3300
msgid "You have a new follower at " msgid "You have a new follower at "
msgstr "Una nuova persona ti segue su " msgstr "Una nuova persona ti segue su "
#: ../../include/items.php:3980 #: ../../include/items.php:3981
msgid "Archives" msgid "Archives"
msgstr "" msgstr ""

View file

@ -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 <em>Connect</em> or <em>Follow</em> 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 <em>Connetti</em> o <em>Segui</em> nella loro pagina del profilo. Inserisci il tuo Indirizzo Identità, se richiesto."; $a->strings["The Directory page lets you find other people in this network or other federated sites. Look for a <em>Connect</em> or <em>Follow</em> 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 <em>Connetti</em> o <em>Segui</em> nella loro pagina del profilo. Inserisci il tuo Indirizzo Identità, se richiesto.";
$a->strings["Finding New People"] = ""; $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["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["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["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?"] = ""; $a->strings["Why Aren't My Posts Public?"] = "";

View file

@ -158,21 +158,26 @@ function enableOnUser(){
}); });
function deleteCheckedItems() { function deleteCheckedItems() {
var checkedstr = ''; if(confirm('$delitems')) {
var checkedstr = '';
$('.item-select').each( function() { $("#item-delete-selected").hide();
if($(this).is(':checked')) { $('#item-delete-selected-rotator').show();
if(checkedstr.length != 0) {
checkedstr = checkedstr + ',' + $(this).val(); $('.item-select').each( function() {
} if($(this).is(':checked')) {
else { if(checkedstr.length != 0) {
checkedstr = $(this).val(); checkedstr = checkedstr + ',' + $(this).val();
} }
} else {
}); checkedstr = $(this).val();
$.post('item', { dropitems: checkedstr }, function(data) { }
window.location.reload(); }
}); });
$.post('item', { dropitems: checkedstr }, function(data) {
window.location.reload();
});
}
} }
function jotGetLink() { function jotGetLink() {

View file

@ -14,6 +14,7 @@
<input type="hidden" name="coord" id="jot-coord" value="" /> <input type="hidden" name="coord" id="jot-coord" value="" />
<input type="hidden" name="post_id" value="$post_id" /> <input type="hidden" name="post_id" value="$post_id" />
<input type="hidden" name="preview" id="jot-preview" value="0" /> <input type="hidden" name="preview" id="jot-preview" value="0" />
<input type="hidden" name="post_id_random" value="$rand_num" />
<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"></div> <div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"></div>
<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div> <div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>
<div id="jot-text-wrap"> <div id="jot-text-wrap">

View file

@ -6,6 +6,7 @@
<input type="hidden" name="return" value="$return_path" /> <input type="hidden" name="return" value="$return_path" />
<input type="hidden" name="jsreload" value="$jsreload" /> <input type="hidden" name="jsreload" value="$jsreload" />
<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" /> <input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
<input type="hidden" name="post_id_random" value="$rand_num" />
<div class="comment-edit-photo" id="comment-edit-photo-$id" > <div class="comment-edit-photo" id="comment-edit-photo-$id" >
<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a> <a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>

View file

@ -6,6 +6,7 @@
<input type="hidden" name="return" value="$return_path" /> <input type="hidden" name="return" value="$return_path" />
<input type="hidden" name="jsreload" value="$jsreload" /> <input type="hidden" name="jsreload" value="$jsreload" />
<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" /> <input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
<input type="hidden" name="post_id_random" value="$rand_num" />
<div class="comment-edit-photo" id="comment-edit-photo-$id" > <div class="comment-edit-photo" id="comment-edit-photo-$id" >
<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a> <a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>

View file

@ -6,6 +6,7 @@
<input type="hidden" name="return" value="$return_path" /> <input type="hidden" name="return" value="$return_path" />
<input type="hidden" name="jsreload" value="$jsreload" /> <input type="hidden" name="jsreload" value="$jsreload" />
<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" /> <input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
<input type="hidden" name="post_id_random" value="$rand_num" />
<div class="comment-edit-photo" id="comment-edit-photo-$id" > <div class="comment-edit-photo" id="comment-edit-photo-$id" >
<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a> <a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>

View file

@ -13,6 +13,7 @@
<input type="hidden" name="coord" id="jot-coord" value="" /> <input type="hidden" name="coord" id="jot-coord" value="" />
<input type="hidden" name="post_id" value="$post_id" /> <input type="hidden" name="post_id" value="$post_id" />
<input type="hidden" name="preview" id="jot-preview" value="0" /> <input type="hidden" name="preview" id="jot-preview" value="0" />
<input type="hidden" name="post_id_random" value="$rand_num" />
<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"> <input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div> <div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>
<div id="character-counter" class="grey"></div> <div id="character-counter" class="grey"></div>

View file

@ -6,6 +6,7 @@
<input type="hidden" name="return" value="$return_path" /> <input type="hidden" name="return" value="$return_path" />
<input type="hidden" name="jsreload" value="$jsreload" /> <input type="hidden" name="jsreload" value="$jsreload" />
<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" /> <input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
<input type="hidden" name="post_id_random" value="$rand_num" />
<div class="comment-edit-photo" id="comment-edit-photo-$id" > <div class="comment-edit-photo" id="comment-edit-photo-$id" >
<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a> <a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>

View file

@ -84,16 +84,8 @@
$(obj).val(''); $(obj).val('');
} }
function showHideComments(id) { window.showMore = "$showmore";
if( $('#collapsed-comments-' + id).is(':visible')) { window.showFewer = "$showfewer";
$('#collapsed-comments-' + id).hide();
$('#hide-comments-' + id).html('$showmore');
}
else {
$('#collapsed-comments-' + id).show();
$('#hide-comments-' + id).html('$showfewer');
}
}
function showHideCommentBox(id) { function showHideCommentBox(id) {
if( $('#comment-edit-form-' + id).is(':visible')) { if( $('#comment-edit-form-' + id).is(':visible')) {

View file

@ -9,6 +9,7 @@
<input type="hidden" name="coord" id="jot-coord" value="" /> <input type="hidden" name="coord" id="jot-coord" value="" />
<input type="hidden" name="post_id" value="$post_id" /> <input type="hidden" name="post_id" value="$post_id" />
<input type="hidden" name="preview" id="jot-preview" value="0" /> <input type="hidden" name="preview" id="jot-preview" value="0" />
<input type="hidden" name="post_id_random" value="$rand_num" />
<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none" /></div> <div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none" /></div>
<div id="character-counter" class="grey jothidden"></div> <div id="character-counter" class="grey jothidden"></div>
<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div> <div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>

View file

@ -10,6 +10,7 @@
<input type="hidden" name="return" value="$return_path" /> <input type="hidden" name="return" value="$return_path" />
<input type="hidden" name="jsreload" value="$jsreload" /> <input type="hidden" name="jsreload" value="$jsreload" />
<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" /> <input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
<input type="hidden" name="post_id_random" value="$rand_num" />
<div class="comment-edit-photo" id="comment-edit-photo-$id" > <div class="comment-edit-photo" id="comment-edit-photo-$id" >
<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a> <a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>

View file

@ -6,6 +6,7 @@
<input type="hidden" name="return" value="$return_path" /> <input type="hidden" name="return" value="$return_path" />
<input type="hidden" name="jsreload" value="$jsreload" /> <input type="hidden" name="jsreload" value="$jsreload" />
<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" /> <input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
<input type="hidden" name="post_id_random" value="$rand_num" />
<div class="comment-edit-photo" id="comment-edit-photo-$id" > <div class="comment-edit-photo" id="comment-edit-photo-$id" >
<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a> <a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>

View file

@ -1,25 +0,0 @@
<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
<div class="contact-entry-photo-wrapper" >
<div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')"
onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
{{ if $contact.photo_menu }}
<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
<div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
<ul>
$contact.photo_menu
</ul>
</div>
{{ endif }}
</div>
</div>
<div class="contact-entry-photo-end" ></div>
<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
<div class="contact-entry-end" ></div>
</div>

View file

@ -1,29 +0,0 @@
$live_update
{{ for $threads as $thread }}
<div id="tread-wrapper-$thread.id" class="tread-wrapper">
{{ for $thread.items as $item }}
{{if $item.comment_firstcollapsed}}
<div class="hide-comments-outer">
<span id="hide-comments-total-$thread.id" class="hide-comments-total">$thread.num_comments</span> <span id="hide-comments-$thread.id" class="hide-comments fakelink" onclick="showHideComments($thread.id);">$thread.hide_text</span>
</div>
<div id="collapsed-comments-$thread.id" class="collapsed-comments" style="display: none;">
{{endif}}
{{if $item.comment_lastcollapsed}}</div>{{endif}}
{{ inc $item.template }}{{ endinc }}
{{ endfor }}
</div>
{{ endfor }}
<div id="conversation-end"></div>
{{ if $dropping }}
<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
<div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
<div id="item-delete-selected-desc" >$dropping</div>
</div>
<div id="item-delete-selected-end"></div>
{{ endif }}

View file

@ -14,6 +14,7 @@
<input type="hidden" name="coord" id="jot-coord" value="" /> <input type="hidden" name="coord" id="jot-coord" value="" />
<input type="hidden" name="post_id" value="$post_id" /> <input type="hidden" name="post_id" value="$post_id" />
<input type="hidden" name="preview" id="jot-preview" value="0" /> <input type="hidden" name="preview" id="jot-preview" value="0" />
<input type="hidden" name="post_id_random" value="$rand_num" />
<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"></div> <div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"></div>
<div id="jot-text-wrap"> <div id="jot-text-wrap">
<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /> <img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />

View file

@ -1,10 +0,0 @@
<div id="nets-sidebar" class="widget">
<h3>$title</h3>
<div id="nets-desc">$desc</div>
<a href="$base?nets=all" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a>
<ul class="nets-ul">
{{ for $nets as $net }}
<li><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
{{ endfor }}
</ul>
</div>

View file

@ -1,14 +0,0 @@
<div class="widget" id="saved-search-list">
<h3 id="search">$title</h3>
$searchbox
<ul id="saved-search-ul">
{{ for $saved as $search }}
<li class="saved-search-li clear">
<a title="$search.delete" onclick="return confirmDelete();" id="drop-saved-search-term-$search.id" class="iconspacer savedsearchdrop " href="network/?f=&amp;remove=1&amp;search=$search.encodedterm"></a>
<a id="saved-search-term-$search.id" class="savedsearchterm" href="network/?f=&amp;search=$search.encodedterm">$search.term</a>
</li>
{{ endfor }}
</ul>
<div class="clear"></div>
</div>

View file

@ -21,6 +21,7 @@
<input type="hidden" name="return" value="$return_path" /> <input type="hidden" name="return" value="$return_path" />
<input type="hidden" name="jsreload" value="$jsreload" /> <input type="hidden" name="jsreload" value="$jsreload" />
<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" /> <input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
<input type="hidden" name="post_id_random" value="$rand_num" />
<!--<div class="comment-edit-photo" id="comment-edit-photo-$id" >--> <!--<div class="comment-edit-photo" id="comment-edit-photo-$id" >-->
<a class="comment-edit-photo comment-edit-photo-link" id="comment-edit-photo-$id" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a> <a class="comment-edit-photo comment-edit-photo-link" id="comment-edit-photo-$id" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>

View file

@ -15,6 +15,7 @@
<input type="hidden" name="post_id" value="$post_id" /> <input type="hidden" name="post_id" value="$post_id" />
<input type="hidden" name="source" value="$sourceapp" /> <input type="hidden" name="source" value="$sourceapp" />
<input type="hidden" name="preview" id="jot-preview" value="0" /> <input type="hidden" name="preview" id="jot-preview" value="0" />
<input type="hidden" name="post_id_random" value="$rand_num" />
<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"></div> <div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"></div>
<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div> <div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>
<div id="jot-text-wrap"> <div id="jot-text-wrap">

View file

@ -243,12 +243,13 @@
if($j('#live-profile').length) { src = 'profile'; liveUpdate(); } if($j('#live-profile').length) { src = 'profile'; liveUpdate(); }
if($j('#live-community').length) { src = 'community'; liveUpdate(); } if($j('#live-community').length) { src = 'community'; liveUpdate(); }
if($j('#live-notes').length) { src = 'notes'; liveUpdate(); } if($j('#live-notes').length) { src = 'notes'; liveUpdate(); }
if($j('#live-display').length) { if($j('#live-display').length) { src = 'display'; liveUpdate(); }
/*if($j('#live-display').length) {
if(liking) { if(liking) {
liking = 0; liking = 0;
window.location.href=window.location.href window.location.href=window.location.href
} }
} }*/
if($j('#live-photos').length) { if($j('#live-photos').length) {
if(liking) { if(liking) {
liking = 0; liking = 0;
@ -307,10 +308,26 @@
$j('#' + prev).after($j(this)); $j('#' + prev).after($j(this));
} }
else { else {
// Find out if the hidden comments are open, so we can keep it that way
// if a new comment has been posted
var id = $j('.hide-comments-total', this).attr('id');
if(typeof id != 'undefined') {
id = id.split('-')[3];
var commentsOpen = $j("#collapsed-comments-" + id).is(":visible");
}
$j('img',this).each(function() { $j('img',this).each(function() {
$j(this).attr('src',$j(this).attr('dst')); $j(this).attr('src',$j(this).attr('dst'));
}); });
//vScroll = $j(document).scrollTop();
$j('html').height($j('html').height());
$j('#' + ident).replaceWith($j(this)); $j('#' + ident).replaceWith($j(this));
if(typeof id != 'undefined') {
if(commentsOpen) showHideComments(id);
}
$j('html').height('auto');
//$j(document).scrollTop(vScroll);
} }
prev = ident; prev = ident;
}); });
@ -517,6 +534,17 @@
} }
function showHideComments(id) {
if( $j("#collapsed-comments-" + id).is(":visible")) {
$j("#collapsed-comments-" + id).hide();
$j("#hide-comments-" + id).html(window.showMore);
}
else {
$j("#collapsed-comments-" + id).show();
$j("#hide-comments-" + id).html(window.showFewer);
}
}
function preview_post() { function preview_post() {
$j("#jot-preview").val("1"); $j("#jot-preview").val("1");

File diff suppressed because one or more lines are too long

View file

@ -533,17 +533,6 @@ function qCommentInsert(obj,id) {
$j(obj).val(""); $j(obj).val("");
} }
function showHideComments(id) {
if( $j("#collapsed-comments-" + id).is(":visible")) {
$j("#collapsed-comments-" + id).hide();
$j("#hide-comments-" + id).html(window.showMore);
}
else {
$j("#collapsed-comments-" + id).show();
$j("#hide-comments-" + id).html(window.showFewer);
}
}
/*function showHideCommentBox(id) { /*function showHideCommentBox(id) {
if( $j('#comment-edit-form-' + id).is(':visible')) { if( $j('#comment-edit-form-' + id).is(':visible')) {
$j('#comment-edit-form-' + id).hide(); $j('#comment-edit-form-' + id).hide();

File diff suppressed because one or more lines are too long

View file

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

Some files were not shown because too many files have changed in this diff Show more