From 1548449586f17c0ef9bfab0ffb16f2a495fc6082 Mon Sep 17 00:00:00 2001
From: Olivier Migeot <olivier@migeot.org>
Date: Wed, 24 Aug 2011 18:04:16 +0200
Subject: [PATCH 01/46] Small fix
---
view/fr/messages.po | 2 +-
view/fr/strings.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/view/fr/messages.po b/view/fr/messages.po
index d6bd55f00..c31197d40 100644
--- a/view/fr/messages.po
+++ b/view/fr/messages.po
@@ -4844,7 +4844,7 @@ msgstr "octets"
#: ../../include/text.php:835
msgid "Select an alternate language"
-msgstr "Choisir une langue complémentaire"
+msgstr "Choisir une autre langue"
#: ../../include/acl_selectors.php:280
msgid "show"
diff --git a/view/fr/strings.php b/view/fr/strings.php
index cbed6eec4..a9735940c 100644
--- a/view/fr/strings.php
+++ b/view/fr/strings.php
@@ -828,7 +828,7 @@ $a->strings["Delete Selected Items"] = "Supprimer les éléments selectionnés";
$a->strings["Attach file"] = "Joindre un fichier";
$a->strings["Public post"] = "Entrée publique";
$a->strings["bytes"] = "octets";
-$a->strings["Select an alternate language"] = "Choisir une langue complémentaire";
+$a->strings["Select an alternate language"] = "Choisir une autre langue";
$a->strings["show"] = "montrer";
$a->strings["don't show"] = "ne pas montrer";
$a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
From c68569040e830700128a1aa4ee64de3fa4787930 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Thu, 29 Sep 2011 15:32:16 -0700
Subject: [PATCH 02/46] added back for photos page until we can get rid of it
cleanly
---
boot.php | 2 +-
view/like_noshare.tpl | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
create mode 100644 view/like_noshare.tpl
diff --git a/boot.php b/boot.php
index 07fa64bbc..e8f2b6f0c 100644
--- a/boot.php
+++ b/boot.php
@@ -8,7 +8,7 @@ require_once("include/pgettext.php");
require_once('include/nav.php');
define ( 'FRIENDIKA_PLATFORM', 'Free Friendika');
-define ( 'FRIENDIKA_VERSION', '2.3.1118' );
+define ( 'FRIENDIKA_VERSION', '2.3.1119' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1092 );
diff --git a/view/like_noshare.tpl b/view/like_noshare.tpl
new file mode 100644
index 000000000..2c467c3c2
--- /dev/null
+++ b/view/like_noshare.tpl
@@ -0,0 +1,5 @@
+<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
+ <a href="#" class="icon like"title="$likethis" onclick="dolike($id,'like'); return false"></a>
+ <a href="#" class="icon dislike" title="$nolike" onclick="dolike($id,'dislike'); return false"></a>
+ <img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+ </div>
From c1221cc052c78550c214e7974407cc66992eadbe Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Thu, 29 Sep 2011 15:52:31 -0700
Subject: [PATCH 03/46] add display_item hook to 'search|new' message display
---
include/conversation.php | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/include/conversation.php b/include/conversation.php
index ebe582f4c..6069afb03 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -220,7 +220,7 @@ function conversation(&$a, $items, $mode, $update) {
$body = prepare_body($item,true);
- $treads[$treadsid] .= replace_macros($tpl,array(
+ $tmp_item = replace_macros($tpl,array(
'$id' => $item['item_id'],
'$linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])),
'$profile_url' => $profile_link,
@@ -251,6 +251,11 @@ function conversation(&$a, $items, $mode, $update) {
'$wait' => t('Please wait'),
));
+ $arr = array('item' => $item, 'output' => $tmp_item);
+ call_hooks('display_item', $arr);
+
+ $treads[$treadsid] .= $arr['output'];
+
}
}
From 097c1f8da774c82f441f370f391f93acc2025ccd Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Thu, 29 Sep 2011 21:20:19 -0700
Subject: [PATCH 04/46] do not poll for abandoned accounts
---
boot.php | 2 +-
database.sql | 4 +++-
include/poller.php | 13 ++++++++++++-
mod/admin.php | 4 ++++
update.php | 6 +++++-
view/admin_site.tpl | 1 +
6 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/boot.php b/boot.php
index e8f2b6f0c..85b571c82 100644
--- a/boot.php
+++ b/boot.php
@@ -10,7 +10,7 @@ require_once('include/nav.php');
define ( 'FRIENDIKA_PLATFORM', 'Free Friendika');
define ( 'FRIENDIKA_VERSION', '2.3.1119' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
-define ( 'DB_UPDATE_VERSION', 1092 );
+define ( 'DB_UPDATE_VERSION', 1093 );
define ( 'EOL', "<br />\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
diff --git a/database.sql b/database.sql
index 08d02d67e..f39728a33 100644
--- a/database.sql
+++ b/database.sql
@@ -424,7 +424,9 @@ CREATE TABLE IF NOT EXISTS `user` (
`deny_gid` mediumtext NOT NULL,
`openidserver` text NOT NULL,
PRIMARY KEY (`uid`),
- KEY `nickname` (`nickname`)
+ KEY `nickname` (`nickname`),
+ KEY `account_expired` (`account_expired`),
+ KEY `login_date` (`login_date`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
diff --git a/include/poller.php b/include/poller.php
index 07076508f..89a3408ec 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -44,6 +44,12 @@ function poller_run($argv, $argc){
AND `account_expires_on` != '0000-00-00 00:00:00'
AND `account_expires_on` < UTC_TIMESTAMP() ");
+ $abandon_days = intval(get_config('system','account_abandon_days'));
+ if($abandon_days < 1)
+ $abandon_days = 0;
+
+
+
// once daily run expire in background
$d1 = get_config('system','last_expire_day');
@@ -92,12 +98,17 @@ function poller_run($argv, $argc){
// and which have a polling address and ignore Diaspora since
// we are unable to match those posts with a Diaspora GUID and prevent duplicates.
+ $abandon_sql = (($abandon_days)
+ ? sprintf(" AND `user`.`login_date` > UTC_TIMESTAMP() - INTERVAL %d DAY ", intval($abandon_days))
+ : ''
+ );
+
$contacts = q("SELECT `contact`.`id` FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid`
WHERE ( `rel` = %d OR `rel` = %d ) AND `poll` != ''
AND `network` != '%s'
$sql_extra
AND `self` = 0 AND `contact`.`blocked` = 0 AND `contact`.`readonly` = 0
- AND `user`.`account_expired` = 0 ORDER BY RAND()",
+ AND `user`.`account_expired` = 0 $abandon_sql ORDER BY RAND()",
intval(CONTACT_IS_SHARING),
intval(CONTACT_IS_FRIEND),
dbesc(NETWORK_DIASPORA)
diff --git a/mod/admin.php b/mod/admin.php
index da561d554..ebef1ccb9 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -177,6 +177,8 @@ function admin_page_site_post(&$a){
$register_policy = ((x($_POST,'register_policy')) ? intval(trim($_POST['register_policy'])) : 0);
+ $abandon_days = ((x($_POST,'abandon_days')) ? intval(trim($_POST['abandon_days'])) : 0);
+
$register_text = ((x($_POST,'register_text')) ? notags(trim($_POST['register_text'])) : '');
$allowed_sites = ((x($_POST,'allowed_sites')) ? notags(trim($_POST['allowed_sites'])) : '');
@@ -215,6 +217,7 @@ function admin_page_site_post(&$a){
set_config('system','maximagesize', $maximagesize);
set_config('config','register_policy', $register_policy);
+ set_config('system','account_abandon_days', $abandon_days);
set_config('config','register_text', $register_text);
set_config('system','allowed_sites', $allowed_sites);
set_config('system','allowed_email', $allowed_email);
@@ -314,6 +317,7 @@ function admin_page_site(&$a) {
'$register_policy' => array('register_policy', t("Register policy"), $a->config['register_policy'], "", $register_choices),
'$register_text' => array('register_text', t("Register text"), htmlentities($a->config['register_text'], ENT_QUOTES), "Will be displayed prominently on the registration page."),
+ '$abandon_days' => array('abandon_days', t('Accounts abandoned after x days'), get_config('system','account_abandon_days'), t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.')),
'$allowed_sites' => array('allowed_sites', t("Allowed friend domains"), get_config('system','allowed_sites'), "Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"),
'$allowed_email' => array('allowed_email', t("Allowed email domains"), get_config('system','allowed_email'), "Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains"),
'$block_public' => array('block_public', t("Block public"), get_config('system','block_public'), "Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."),
diff --git a/update.php b/update.php
index 2f9277dae..0dd599e83 100644
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
<?php
-define( 'UPDATE_VERSION' , 1092 );
+define( 'UPDATE_VERSION' , 1093 );
/**
*
@@ -770,3 +770,7 @@ function update_1091() {
}
+function update_1092() {
+ q("ALTER TABLE `user` ADD INDEX ( `login_date` ) ");
+ q("ALTER TABLE `user` ADD INDEX ( `account_expired` ) ");
+}
\ No newline at end of file
diff --git a/view/admin_site.tpl b/view/admin_site.tpl
index 061656df7..9a1229845 100644
--- a/view/admin_site.tpl
+++ b/view/admin_site.tpl
@@ -43,6 +43,7 @@
{{ inc field_input.tpl with $field=$proxy }}{{ endinc }}
{{ inc field_input.tpl with $field=$proxyuser }}{{ endinc }}
{{ inc field_input.tpl with $field=$timeout }}{{ endinc }}
+ {{ inc field_input.tpl with $field=$abandon_days }}{{ endinc }}
<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
From 52557b011d2c05e83b1df91d2d766317dd2c5223 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Thu, 29 Sep 2011 21:56:44 -0700
Subject: [PATCH 05/46] possible sql errors
---
include/delivery.php | 2 +-
include/notifier.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/delivery.php b/include/delivery.php
index 06cc1f679..3ab820b62 100644
--- a/include/delivery.php
+++ b/include/delivery.php
@@ -72,7 +72,7 @@ function delivery_run($argv, $argc){
$normal_mode = false;
$expire = true;
$items = q("SELECT * FROM `item` WHERE `uid` = %d AND `wall` = 1
- AND `deleted` = 1 AND `changed` > UTC_TIMESTAMP - INTERVAL 30 MINUTE",
+ AND `deleted` = 1 AND `changed` > UTC_TIMESTAMP() - INTERVAL 30 MINUTE",
intval($item_id)
);
$uid = $item_id;
diff --git a/include/notifier.php b/include/notifier.php
index 748d15743..864fa517b 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -86,7 +86,7 @@ function notifier_run($argv, $argc){
$normal_mode = false;
$expire = true;
$items = q("SELECT * FROM `item` WHERE `uid` = %d AND `wall` = 1
- AND `deleted` = 1 AND `changed` > UTC_TIMESTAMP - INTERVAL 10 MINUTE",
+ AND `deleted` = 1 AND `changed` > UTC_TIMESTAMP() - INTERVAL 10 MINUTE",
intval($item_id)
);
$uid = $item_id;
From 6f610eb614f5d80c3a8dc1f69832dc9032876f6f Mon Sep 17 00:00:00 2001
From: Devlon Duthie <duthied@gmail.com>
Date: Fri, 30 Sep 2011 01:01:15 -0500
Subject: [PATCH 06/46] 1. added button class to tpl files 2. messages - moved
delete X into message div and new message form div 3. began work on creating
thumbnail versions of albums - needs aspect ratio correction (javascript) 4.
changed font-size and font-variation on vcard for better readability. 5.
streamlining continued with the CSS file
---
view/admin_aside.tpl | 12 ++--
view/group_drop.tpl | 3 +-
view/mail_conv.tpl | 7 +--
view/mail_list.tpl | 4 +-
view/photo_album.tpl | 2 +-
view/prv_message.tpl | 3 +-
view/settings_tabs.tpl | 4 +-
view/theme/testbubble/mail_head.tpl | 6 +-
view/theme/testbubble/style.css | 98 +++++++++++------------------
9 files changed, 55 insertions(+), 84 deletions(-)
diff --git a/view/admin_aside.tpl b/view/admin_aside.tpl
index 63f109d7f..a10c06f4e 100644
--- a/view/admin_aside.tpl
+++ b/view/admin_aside.tpl
@@ -12,26 +12,26 @@
</script>
<h4><a href="$admurl">Admin</a></h4>
<ul class='admin linklist'>
- <li class='admin link $admin.site.2'><a href='$admin.site.0'>$admin.site.1</a></li>
- <li class='admin link $admin.users.2'><a href='$admin.users.0'>$admin.users.1</a><span id='pending-update' title='$h_pending'></span></li>
- <li class='admin link $admin.plugins.2'><a href='$admin.plugins.0'>$admin.plugins.1</a></li>
+ <li class='admin link button $admin.site.2'><a href='$admin.site.0'>$admin.site.1</a></li>
+ <li class='admin link button $admin.users.2'><a href='$admin.users.0'>$admin.users.1</a><span id='pending-update' title='$h_pending'></span></li>
+ <li class='admin link button $admin.plugins.2'><a href='$admin.plugins.0'>$admin.plugins.1</a></li>
</ul>
<ul class='admin linklist'>
- <li class='admin link $admin.update.2'><a href='$admin.update.0'>$admin.update.1</a></li>
+ <li class='admin link button $admin.update.2'><a href='$admin.update.0'>$admin.update.1</a></li>
</ul>
{{ if $admin.plugins_admin }}<h4>Plugins</h4>{{ endif }}
<ul class='admin linklist'>
{{ for $admin.plugins_admin as $l }}
- <li class='admin link $l.2'><a href='$l.0'>$l.1</a></li>
+ <li class='admin link button $l.2'><a href='$l.0'>$l.1</a></li>
{{ endfor }}
</ul>
<h4>Logs</h4>
<ul class='admin linklist'>
- <li class='admin link $admin.logs.2'><a href='$admin.logs.0'>$admin.logs.1</a></li>
+ <li class='admin link button $admin.logs.2'><a href='$admin.logs.0'>$admin.logs.1</a></li>
</ul>
diff --git a/view/group_drop.tpl b/view/group_drop.tpl
index bd9852b96..cbae1610f 100644
--- a/view/group_drop.tpl
+++ b/view/group_drop.tpl
@@ -1,7 +1,6 @@
-<div class="group-delete-wrapper" id="group-delete-wrapper-$id" >
+<div class="group-delete-wrapper button" id="group-delete-wrapper-$id" >
<a href="group/drop/$id"
onclick="return confirmDelete();"
- title="$delete"
id="group-delete-icon-$id"
class="icon drophide group-delete-icon"
onmouseover="imgbright(this);"
diff --git a/view/mail_conv.tpl b/view/mail_conv.tpl
index d7ed14580..6c2af115b 100644
--- a/view/mail_conv.tpl
+++ b/view/mail_conv.tpl
@@ -7,9 +7,8 @@
<div class="mail-conv-date">$date</div>
<div class="mail-conv-subject">$subject</div>
<div class="mail-conv-body">$body</div>
- </div>
+ <div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-$id" ><a href="message/drop/$id" onclick="return confirmDelete();" ><img src="images/b_drophide.gif" alt="$delete" title="$delete" id="mail-conv-delete-icon-$id" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div>
+ <div class="mail-conv-outside-wrapper-end"></div>
+</div>
</div>
-<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-$id" ><a href="message/drop/$id" onclick="return confirmDelete();" ><img src="images/b_drophide.gif" alt="$delete" title="$delete" id="mail-conv-delete-icon-$id" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div>
-
-<div class="mail-conv-outside-wrapper-end"></div>
<hr class="mail-conv-break" />
diff --git a/view/mail_list.tpl b/view/mail_list.tpl
index 8c8e78276..77673c792 100644
--- a/view/mail_list.tpl
+++ b/view/mail_list.tpl
@@ -6,10 +6,10 @@
<div class="mail-list-sender-name" >$from_name</div>
<div class="mail-list-date">$date</div>
<div class="mail-list-subject"><a href="message/$id" class="mail-list-link">$subject</a></div>
+ <div class="mail-list-delete-wrapper" id="mail-list-delete-wrapper-$id" >
+ <a href="message/dropconv/$id" onclick="return confirmDelete();" title="$delete" class="icon drophide mail-list- delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>
</div>
</div>
-<div class="mail-list-delete-wrapper" id="mail-list-delete-wrapper-$id" >
- <a href="message/dropconv/$id" onclick="return confirmDelete();" title="$delete" class="icon drophide mail-list-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>
</div>
<div class="mail-list-delete-end"></div>
diff --git a/view/photo_album.tpl b/view/photo_album.tpl
index fab7d7254..e3f2ba91c 100644
--- a/view/photo_album.tpl
+++ b/view/photo_album.tpl
@@ -1,6 +1,6 @@
<div class="photo-album-image-wrapper" id="photo-album-image-wrapper-$id">
<a href="$photolink" class="photo-album-photo-link" id="photo-album-photo-link-$id" title="$phototitle">
- <img src="$imgsrc" alt="$imgalt" title="$phototitle" class="photo-album-photo" id="photo-album-photo-$id" />
+ <img src="$imgsrc" alt="$imgalt" title="$phototitle" class="photo-album-photo lframe resize" id="photo-album-photo-$id" />
<p class='caption'>$desc</p>
</a>
diff --git a/view/prv_message.tpl b/view/prv_message.tpl
index 7c3894145..ead360deb 100644
--- a/view/prv_message.tpl
+++ b/view/prv_message.tpl
@@ -15,7 +15,7 @@ $select
<div id="prvmail-message-label">$yourmessage</div>
<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" ></textarea>
-</div>
+
<div id="prvmail-submit-wrapper" >
<input type="submit" id="prvmail-submit" name="submit" value="Submit" />
<div id="prvmail-upload-wrapper" >
@@ -29,5 +29,6 @@ $select
</div>
</div>
<div id="prvmail-end"></div>
+</div>
</form>
</div>
diff --git a/view/settings_tabs.tpl b/view/settings_tabs.tpl
index 893fdfbce..5003ed8ce 100644
--- a/view/settings_tabs.tpl
+++ b/view/settings_tabs.tpl
@@ -1,6 +1,6 @@
<div id="profile-tabs-wrapper" >
- <a href="$account.1" id="profile-tab-status-link" class="profile-tabs" >$account.0</a>
- <a href="$plugins.1" id="profile-tab-profile-link" class="profile-tabs" >$plugins.0</a>
+ <a href="$account.1" id="profile-tab-status-link" class="profile-tabs button" >$account.0</a>
+ <a href="$plugins.1" id="profile-tab-profile-link" class="profile-tabs button" >$plugins.0</a>
<div id="profile-tabs-end"></div>
</div>
diff --git a/view/theme/testbubble/mail_head.tpl b/view/theme/testbubble/mail_head.tpl
index 89615cbd0..2a4fc42ea 100644
--- a/view/theme/testbubble/mail_head.tpl
+++ b/view/theme/testbubble/mail_head.tpl
@@ -1,7 +1,7 @@
<h3>$messages</h3>
<ul class="tabs-wrapper">
-<li><a href="message" class="tabs">$inbox</a></li>
-<li><a href="message/sent" class="tabs">$outbox</a></li>
-<li><a href="message/new" class="tabs">$new</a></li>
+<li><a href="message" class="tabs button">$inbox</a></li>
+<li><a href="message/sent" class="tabs button">$outbox</a></li>
+<li><a href="message/new" class="tabs button">$new</a></li>
</ul>
diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css
index 9727de6d1..deae9ae58 100644
--- a/view/theme/testbubble/style.css
+++ b/view/theme/testbubble/style.css
@@ -7,14 +7,11 @@
*/
/* ========== */
/* = Colors
-
Red links - #b20202
Red link hover - #db0503
Red Gradients (buttons and other gradients) - #b20202 and #d60808
-
Grey/body text - #626262
Grey Gradients (buttons and other gradients) - #bdbdbd and #a2a2a2
-
Dark Grey Gradients - #7c7d7b and #555753
You can switch out the colors of the header, buttons and links by using a find and replace in your text editor.
@@ -134,7 +131,7 @@ section {
.mframe {
padding: 5px;
background-color: #efefef;
- border: 2px dotted #eeeeee;
+ border: 2px solid #dddddd;
-moz-box-shadow: 3px 3px 4px #959494;
-webkit-box-shadow: 3px 3px 4px #959494;
box-shadow: 3px 3px 4px #959494;
@@ -452,14 +449,10 @@ aside a{
font-variant:small-caps;
}
-.marital {
- font-size: 1em;
- font-variant:small-caps;
-}
-
-.homepage-label {
- font-size: 1em;
- font-variant:small-caps;
+.vcard dd {
+ font-size: 12px;
+ font-variant: normal;
+ -webkit-margin-start: 10px;
}
.vcard .fn {
@@ -1304,7 +1297,11 @@ div[id$="wrapper"] br { clear: left; }
}
.photo-top-photo,
-.photo-album-photo {}
+.photo-album-photo {
+ width: 180px;
+ height: 180px;
+ overflow: hidden;
+}
.photo-top-album-name {
position: absolute;
@@ -1587,16 +1584,15 @@ input#photo_edit_form {
font-size: 1em;
}
-
#prvmail-submit-wrapper { margin-top: 10px; }
#prvmail-submit {
float: right;
margin-top: 0px;
- margin-right: 90px;
+ margin-right: 0px;
}
#prvmail-upload {
-margin-left: 90px;
+margin-left: 0px;
}
#prvmail-submit-wrapper > div {
@@ -1637,7 +1633,7 @@ margin-left: 90px;
float: right;
clear: block;
display: inline;
- font-size: 0.8em;
+ font-size: 0.9em;
padding-left: 10px;
font-stretch:ultra-condensed;
font-variant:small-caps;
@@ -1654,11 +1650,15 @@ margin-left: 90px;
color: #626262;
}
-.mail-list-delete-wrapper { float: left; margin-right:550px; }
+.mail-list-delete-wrapper { float: right;}
.mail-list-outside-wrapper-end {
clear: both;
}
+.mail-conv-outside-wrapper {
+ margin-bottom: 10px;
+}
+
.mail-conv-sender {float: left; margin: 0px 5px 5px 0px; }
.mail-conv-sender-photo {
width: 64px;
@@ -1675,13 +1675,20 @@ margin-left: 90px;
.mail-conv-detail {
width: 500px;
padding: 30px;
+ padding-bottom: 10px;
margin-left: 20px;
+ margin-bottom: 0px;
vertical-align: middle;
margin: auto;
border: 1px solid #dddddd;
}
.mail-conv-break { display: none; border: none;}
-.mail-conv-delete-wrapper { margin-top: 5px; width: 650px; text-align: right; }
+.mail-conv-delete-wrapper { padding-top: 10px; width: 510px; text-align: right; }
+
+#prvmail-subject {
+ font-weight: bold;
+ border: none;
+}
/* ================= */
/* = Notifications = */
@@ -2061,56 +2068,19 @@ margin-left: 90px;
padding-top: 10px;
}
-#profile-tab-status-link:hover {
+#profile-tab-status-link {
border: 0px;
padding: 5px 10px 5px 10px;
font-style: bold;
- color: #efefef;
- background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );
- background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% );
- filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808');
- background-color:#b20202;
-}
-
-#profile-tab-status-link:active {
- border: 0px;
- padding: 5px 10px 5px 10px;
- font-style: bold;
- background-color: #b20202;
- position:relative;
- top:1px;
-}
-
-#profile-tab-status-link a {
- color: #efefef;
}
#uexport-link a {
color: #efefef;
}
-#profile-tab-profile-link:hover {
+#profile-tab-profile-link {
border: 0px;
padding: 5px 10px 5px 10px;
- font-style: bold;
- color: #efefef;
- background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );
- background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% );
- filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808');
- background-color:#b20202;
-}
-
-#profile-tab-profile-link:active {
- border: 0px;
- padding: 5px 10px 5px 10px;
- font-style: bold;
- background-color: #b20202;
- position:relative;
- top:1px;
-}
-
-#profile-tab-profile-link a {
- color: #efefef;
}
#uexport-link {
@@ -2246,7 +2216,7 @@ margin-left: 90px;
display: inline;
padding: 5px;
margin-bottom: 10px;
- -moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
+/* -moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
box-shadow:inset 0px 1px 0px 0px #cfcfcf;
background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
@@ -2255,10 +2225,10 @@ margin-left: 90px;
background-color:#bdbdbd;
-moz-border-radius:5px;
-webkit-border-radius:5px;
- border-radius:5px;
+ border-radius:5px;*/
}
-.group-delete-wrapper:hover {
+/*.group-delete-wrapper:hover {
background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );
background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808');
@@ -2275,7 +2245,7 @@ margin-left: 90px;
.group-delete-wrapper a {
color: #efefef;
font-size: 0.9em;
-}
+}*/
#group-edit-desc { margin: 10px 0xp; }
#group-new-text {font-size: 1.1em;}
@@ -2602,7 +2572,9 @@ tr {
.admin.link {
list-style-position: inside;
font-size: 1em;
- padding: 3px;
+ padding: 5px;
+ width: 100px;
+ margin: 5px;
}
#adminpage dl {
From dfb3ee6e29b6943f86ec75af12db5a1422a7e1dd Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Fri, 30 Sep 2011 14:31:01 +0200
Subject: [PATCH 07/46] fix star icon viewing profile page as unlogged user
---
include/conversation.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/conversation.php b/include/conversation.php
index ebe582f4c..7859d301c 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -450,7 +450,7 @@ function conversation(&$a, $items, $mode, $update) {
);
$star = false;
- $starred = "unstarred";
+ $isstarred = "unstarred";
if ($profile_owner == local_user() && $toplevelpost) {
$isstarred = (($item['starred']) ? "starred" : "unstarred");
From 0508ccf50fc6f64af40ad97e3a573a0d489630f2 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Fri, 30 Sep 2011 17:47:33 -0700
Subject: [PATCH 08/46] restore photo cache
---
boot.php | 2 +-
mod/photo.php | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/boot.php b/boot.php
index 85b571c82..59eeb4643 100644
--- a/boot.php
+++ b/boot.php
@@ -8,7 +8,7 @@ require_once("include/pgettext.php");
require_once('include/nav.php');
define ( 'FRIENDIKA_PLATFORM', 'Free Friendika');
-define ( 'FRIENDIKA_VERSION', '2.3.1119' );
+define ( 'FRIENDIKA_VERSION', '2.3.1120' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1093 );
diff --git a/mod/photo.php b/mod/photo.php
index 3994620f8..fcc75a513 100644
--- a/mod/photo.php
+++ b/mod/photo.php
@@ -129,6 +129,8 @@ function photo_init(&$a) {
}
header("Content-type: image/jpeg");
+ header("Expires: " . gmdate("D, d M Y H:i:s", time() + (3600*24)) . " GMT";
+ header("Cache-Control: max-age=" . (3600*24));
echo $data;
killme();
// NOTREACHED
From 8fb2d02d3d32fd5876625036a774520d87f5ead4 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Fri, 30 Sep 2011 18:00:32 -0700
Subject: [PATCH 09/46] typo last checkin
---
mod/photo.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mod/photo.php b/mod/photo.php
index fcc75a513..71c345fc5 100644
--- a/mod/photo.php
+++ b/mod/photo.php
@@ -129,7 +129,7 @@ function photo_init(&$a) {
}
header("Content-type: image/jpeg");
- header("Expires: " . gmdate("D, d M Y H:i:s", time() + (3600*24)) . " GMT";
+ header("Expires: " . gmdate("D, d M Y H:i:s", time() + (3600*24)) . " GMT");
header("Cache-Control: max-age=" . (3600*24));
echo $data;
killme();
From c15690563d9be00e8f7ae29ecdd6bbdb7f64603f Mon Sep 17 00:00:00 2001
From: Devlon Duthie <duthied@gmail.com>
Date: Sat, 1 Oct 2011 01:52:06 -0500
Subject: [PATCH 10/46] class and wrapper div added to photo for aspect ratio
display testbubble theme styling for aspect ratio on photos
---
view/photo_album.tpl | 1 -
view/theme/testbubble/style.css | 38 ++++++++++++++++++++++-----------
2 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/view/photo_album.tpl b/view/photo_album.tpl
index e3f2ba91c..3ab9fe723 100644
--- a/view/photo_album.tpl
+++ b/view/photo_album.tpl
@@ -3,6 +3,5 @@
<img src="$imgsrc" alt="$imgalt" title="$phototitle" class="photo-album-photo lframe resize" id="photo-album-photo-$id" />
<p class='caption'>$desc</p>
</a>
-
</div>
<div class="photo-album-image-wrapper-end"></div>
diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css
index deae9ae58..85a01d0d2 100644
--- a/view/theme/testbubble/style.css
+++ b/view/theme/testbubble/style.css
@@ -1250,7 +1250,7 @@ div[id$="wrapper"] br { clear: left; }
/* ========== */
#side-bar-photos-albums li {
- font-size: 1.2em;
+ font-size: 14px;
font-variant: none;
}
@@ -1279,14 +1279,30 @@ div[id$="wrapper"] br { clear: left; }
background-color: #b20202;
}
-.photo-album-image-wrapper,
-.photo-top-image-wrapper {
- float: left;
+.photo-album-image-wrapper {
+ float: left;
margin: 0px 10px 10px 0px;
padding-bottom: 30px;
position:relative;
}
+.photo-top-image-wrapper {
+ float: left;
+ width: 180px;
+ height: 180px;
+ margin: 0px 10px 10px 0px;
+ padding-bottom: 30px;
+ position:relative;
+}
+
+#photo-album-wrapper-inner {
+ position: relative;
+ float: left;
+ width: 180px;
+ height: 180px;
+ overflow: hidden;
+}
+
#photo-photo { max-width: 100% }
#photo-photo img { max-width: 100% }
@@ -1296,12 +1312,8 @@ div[id$="wrapper"] br { clear: left; }
border-bottom: 0px;
}
-.photo-top-photo,
-.photo-album-photo {
- width: 180px;
- height: 180px;
- overflow: hidden;
-}
+.photo-top-photo {}
+.photo-album-photo {}
.photo-top-album-name {
position: absolute;
@@ -2216,7 +2228,7 @@ margin-left: 0px;
display: inline;
padding: 5px;
margin-bottom: 10px;
-/* -moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
+ -moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
-webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
box-shadow:inset 0px 1px 0px 0px #cfcfcf;
background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
@@ -2228,7 +2240,7 @@ margin-left: 0px;
border-radius:5px;*/
}
-/*.group-delete-wrapper:hover {
+.group-delete-wrapper:hover {
background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );
background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808');
@@ -2245,7 +2257,7 @@ margin-left: 0px;
.group-delete-wrapper a {
color: #efefef;
font-size: 0.9em;
-}*/
+}
#group-edit-desc { margin: 10px 0xp; }
#group-new-text {font-size: 1.1em;}
From f4c961b90676dad0a6773e52e4bd08b33c9b68c6 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sat, 1 Oct 2011 02:22:48 -0700
Subject: [PATCH 11/46] override pragma
---
mod/photo.php | 5 +++++
mod/photos.php | 3 +++
2 files changed, 8 insertions(+)
diff --git a/mod/photo.php b/mod/photo.php
index 71c345fc5..a5a5a1dc1 100644
--- a/mod/photo.php
+++ b/mod/photo.php
@@ -128,6 +128,11 @@ function photo_init(&$a) {
}
}
+ if(function_exists('header_remove')) {
+ header_remove('Pragma');
+ header_remove('pragma');
+ }
+
header("Content-type: image/jpeg");
header("Expires: " . gmdate("D, d M Y H:i:s", time() + (3600*24)) . " GMT");
header("Cache-Control: max-age=" . (3600*24));
diff --git a/mod/photos.php b/mod/photos.php
index 90d51000e..b6be8d025 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -585,6 +585,9 @@ function photos_post(&$a) {
else
$visible = 0;
+ if(intval($_REQUEST,'not_visible'))
+ $visible = 0;
+
$str_group_allow = perms2str(((is_array($_REQUEST['group_allow'])) ? $_REQUEST['group_allow'] : explode(',',$_REQUEST['group_allow'])));
$str_contact_allow = perms2str(((is_array($_REQUEST['contact_allow'])) ? $_REQUEST['contact_allow'] : explode(',',$_REQUEST['contact_allow'])));
$str_group_deny = perms2str(((is_array($_REQUEST['group_deny'])) ? $_REQUEST['group_deny'] : explode(',',$_REQUEST['group_deny'])));
From 78c00c287d5c14d2a93b461b8522bd8a1e95c44c Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sat, 1 Oct 2011 04:25:40 -0700
Subject: [PATCH 12/46] legibility improvements to darkbubble, mark as a
derived theme
---
view/theme/darkbubble/calendar.png | Bin 3779 -> 0 bytes
view/theme/darkbubble/connect.png | Bin 443 -> 0 bytes
view/theme/darkbubble/contact_edit.tpl | 67 --
view/theme/darkbubble/dbicons.png | Bin 0 -> 19694 bytes
view/theme/darkbubble/group_drop.tpl | 8 -
view/theme/darkbubble/group_edit.tpl | 16 -
view/theme/darkbubble/groups.png | Bin 911 -> 0 bytes
view/theme/darkbubble/icons.png | Bin 22600 -> 0 bytes
view/theme/darkbubble/icons.svg | 1442 -----------------------
view/theme/darkbubble/jot-header.tpl | 251 ----
view/theme/darkbubble/jot.tpl | 75 --
view/theme/darkbubble/login-bg.gif | Bin 237 -> 0 bytes
view/theme/darkbubble/login.tpl | 25 -
view/theme/darkbubble/lrarrow.gif | Bin 236 -> 0 bytes
view/theme/darkbubble/mail_head.tpl | 7 -
view/theme/darkbubble/menu-user-pin.png | Bin 276 -> 0 bytes
view/theme/darkbubble/nav.tpl | 55 -
view/theme/darkbubble/next.png | Bin 891 -> 0 bytes
view/theme/darkbubble/notifications.png | Bin 6225 -> 0 bytes
view/theme/darkbubble/photo_view.tpl | 40 -
view/theme/darkbubble/photography.png | Bin 766 -> 0 bytes
view/theme/darkbubble/premium.png | Bin 2317 -> 0 bytes
view/theme/darkbubble/prev.png | Bin 853 -> 0 bytes
view/theme/darkbubble/profile_entry.tpl | 11 -
view/theme/darkbubble/profile_tabs.tpl | 9 -
view/theme/darkbubble/profile_vcard.tpl | 45 -
view/theme/darkbubble/search.png | Bin 808 -> 0 bytes
view/theme/darkbubble/search_item.tpl | 48 -
view/theme/darkbubble/star.png | Bin 2129 -> 0 bytes
view/theme/darkbubble/style.css | 22 +
view/theme/darkbubble/theme.php | 4 +
view/theme/darkbubble/user.png | Bin 664 -> 0 bytes
view/theme/darkbubble/wall_item.tpl | 75 --
view/theme/darkbubble/wallwall_item.tpl | 74 --
34 files changed, 26 insertions(+), 2248 deletions(-)
delete mode 100644 view/theme/darkbubble/calendar.png
delete mode 100644 view/theme/darkbubble/connect.png
delete mode 100644 view/theme/darkbubble/contact_edit.tpl
create mode 100644 view/theme/darkbubble/dbicons.png
delete mode 100644 view/theme/darkbubble/group_drop.tpl
delete mode 100644 view/theme/darkbubble/group_edit.tpl
delete mode 100644 view/theme/darkbubble/groups.png
delete mode 100644 view/theme/darkbubble/icons.png
delete mode 100644 view/theme/darkbubble/icons.svg
delete mode 100644 view/theme/darkbubble/jot-header.tpl
delete mode 100644 view/theme/darkbubble/jot.tpl
delete mode 100644 view/theme/darkbubble/login-bg.gif
delete mode 100644 view/theme/darkbubble/login.tpl
delete mode 100644 view/theme/darkbubble/lrarrow.gif
delete mode 100644 view/theme/darkbubble/mail_head.tpl
delete mode 100644 view/theme/darkbubble/menu-user-pin.png
delete mode 100644 view/theme/darkbubble/nav.tpl
delete mode 100644 view/theme/darkbubble/next.png
delete mode 100644 view/theme/darkbubble/notifications.png
delete mode 100644 view/theme/darkbubble/photo_view.tpl
delete mode 100644 view/theme/darkbubble/photography.png
delete mode 100644 view/theme/darkbubble/premium.png
delete mode 100644 view/theme/darkbubble/prev.png
delete mode 100644 view/theme/darkbubble/profile_entry.tpl
delete mode 100644 view/theme/darkbubble/profile_tabs.tpl
delete mode 100644 view/theme/darkbubble/profile_vcard.tpl
delete mode 100644 view/theme/darkbubble/search.png
delete mode 100644 view/theme/darkbubble/search_item.tpl
delete mode 100644 view/theme/darkbubble/star.png
create mode 100644 view/theme/darkbubble/theme.php
delete mode 100644 view/theme/darkbubble/user.png
delete mode 100644 view/theme/darkbubble/wall_item.tpl
delete mode 100644 view/theme/darkbubble/wallwall_item.tpl
diff --git a/view/theme/darkbubble/calendar.png b/view/theme/darkbubble/calendar.png
deleted file mode 100644
index 705a75b8a8646ce86030c5ee5220bde99490bff4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 3779
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
diff --git a/view/theme/darkbubble/connect.png b/view/theme/darkbubble/connect.png
deleted file mode 100644
index b76fc13dce9eee21d5a9449f80e21444c801cabe..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 443
zcmV;s0Yv_ZP)<h;3K|Lk000e1NJLTq000mG000gM1^@s6CNG?d00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10XRuSK~yM_rIN8O1W^=*zyGcsD!Z8#5+$NgZ-`Q&RC@=l7KMsL
z!VBm`LeyS>!~>``3MAvsy{nQinWJDuHZx1&Pfqp!=gT=cM`lKyLI}%}9ZNh)BkQeJ
zD-LE{Z8zYYZ2}8steO=om6>6HveX4oNah=j<f<}cW<$&S=aXLVxm)KCo#1l~CW=B&
zwf=7a&}666$^HQ#0p4o?-uw9w{85bg2B5x?W!Y4W{@je2Ue8xv0AR#9ol0~8Ldd5<
z*Upu1Nz&LdV^sn(T>|4kQ32q`FWJ0A6G+T71AW8BLI{g#n%)co^zxF;6@}Xd-KJ@J
z*f;V#UviF9U;=aoESTAybB*10yM6x+81~9Q^J{Dah|#Y}+9^vDFbnMc2B?x^%wK^~
l;NdT49F&>aKJXyv-~)f?rYbayUt9nH002ovPDHLkV1mQvvw#2q
diff --git a/view/theme/darkbubble/contact_edit.tpl b/view/theme/darkbubble/contact_edit.tpl
deleted file mode 100644
index 59747c62d..000000000
--- a/view/theme/darkbubble/contact_edit.tpl
+++ /dev/null
@@ -1,67 +0,0 @@
-
-<h2>$header</h2>
-
-<div id="contact-edit-banner-name">$name</div>
-
-$nettype
-
-<form action="contacts/$contact_id" method="post" >
-<input type="hidden" name="contact_id" value="$contact_id">
-
-<div id="contact-edit-wrapper" >
-
- <div id="contact-edit-photo-wrapper" >
- <img id="contact-edit-direction-icon" src="$dir_icon" alt="$alt_text" title="$alt_text" />
- <div id="contact-edit-photo" >
- <a href="$url" title="$visit" /><img src="$photo" $sparkle alt="$name" /></a>
- </div>
- <div id="contact-edit-photo-end" ></div>
- </div>
- <div id="contact-edit-nav-wrapper" >
-
- <div id="contact-edit-links" >
- <a href="contacts/$contact_id/block" class="icon block" id="contact-edit-block-link" title="$block_text"></a>
- <a href="contacts/$contact_id/ignore" class="icon no" id="contact-edit-ignore-link" title="$ignore_text"></a>
- <a href="crepair/$contact_id" class="icon tools" id="contact-edit-repair" title="$lblcrepair"></a>
- <a href="contacts/$contact_id/drop" class="icon drophide" id="contact-edit-drop-link" onclick="return confirmDelete();" title="$delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);"></a>
- </div>
- <div id="contact-edit-nav-end"></div>
-
- {{ if $poll_enabled }}
- <div id="contact-edit-poll-wrapper">
- <div id="contact-edit-last-update-text">$lastupdtext<span id="contact-edit-last-updated">$last_update</span></div>
- <div id="contact-edit-poll-text">$updpub</div>
- $poll_interval
- <div id="contact-edit-update-now"><a href="contacts/$contact_id/update" >$udnow</a></div>
- </div>
- {{ endif }}
- </div>
- <div id="contact-edit-end" ></div>
-
-$insecure
-$blocked
-$ignored
-
-<div id="view-recent-wrapper"><a href="network/?cid=$contact_id" id="contact-view-recent">$lblrecent</a></div>
-$lblsuggest
-
-<div id="contact-edit-info-wrapper">
-<h4>$lbl_info1</h4>
-<textarea id="contact-edit-info" rows="10" cols="72" name="info" >$info</textarea>
-</div>
-<div id="contact-edit-info-end"></div>
-
-<input class="contact-edit-submit" type="submit" name="submit" value="$submit" />
-
-<div id="contact-edit-profile-select-text">
-<h4>$lbl_vis1</h4>
-<p>$lbl_vis2
-</p>
-</div>
-$profile_select
-<div id="contact-edit-profile-select-end"></div>
-
-<input class="contact-edit-submit" type="submit" name="submit" value="$submit" />
-
-</form>
-</div>
diff --git a/view/theme/darkbubble/dbicons.png b/view/theme/darkbubble/dbicons.png
new file mode 100644
index 0000000000000000000000000000000000000000..696ef779cd512b4dab50025874cd58c918107b1e
GIT binary patch
literal 19694
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
JDsk=!{{+o&m=6E|
literal 0
HcmV?d00001
diff --git a/view/theme/darkbubble/group_drop.tpl b/view/theme/darkbubble/group_drop.tpl
deleted file mode 100644
index f088fc06f..000000000
--- a/view/theme/darkbubble/group_drop.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="group-delete-wrapper" id="group-delete-wrapper-$id" >
- <a href="group/drop/$id"
- onclick="return confirmDelete();"
- title="$delete"
- id="group-delete-icon-$id"
- class="drophide group-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" >Delete Group</a>
-</div>
-<div class="group-delete-end"></div>
diff --git a/view/theme/darkbubble/group_edit.tpl b/view/theme/darkbubble/group_edit.tpl
deleted file mode 100644
index a8b3f92a0..000000000
--- a/view/theme/darkbubble/group_edit.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<h2>$title</h2>
-
-
-<div id="group-edit-wrapper" >
- <form action="group/$gid" id="group-edit-form" method="post" >
- <div id="group-edit-name-wrapper" >
- <label id="group-edit-name-label" for="group-edit-name" >$gname</label>
- <input type="text" id="group-edit-name" name="groupname" value="$name" />
- <input type="submit" name="submit" value="$submit">
- $drop
- </div>
- <div id="group-edit-name-end"></div>
- <div id="group-edit-desc">$desc</div>
- <div id="group-edit-select-end" ></div>
- </form>
-</div>
diff --git a/view/theme/darkbubble/groups.png b/view/theme/darkbubble/groups.png
deleted file mode 100644
index a65a7218c93c372404e70bd45434ffc2c915b1d3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 911
zcmV;A191F_P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#F-b&0RCwBKQ(0_GVH7@h-{)@Abd*w4
zkwzkAsHzaDNQosu#rELAlSIS|B19wzuM*<P5{ZO2d&JfU>V-&!NoiH9r8AZ;Q?uyY
zd*}YnKdnf_O}@;{{QvpR`M&R5fPWr_VSwXU5Jdq9AuK{^ZeHFHi&gHiEh{bv0<bJw
zzW3jU9!?gEh-s@@R$iE1T}7r=Rg$P{2bN{-o*<bZU?~$VqFn`^2N4g8MUS3Vv^{ye
zF`XXV<vKRlwgnMG=Xj1i8+BcaVc5xr<&ilEf)eBTKEGqfcBgUC!lu5y-WvQrVOu6+
z+a}mn1Pnt5S&?~$W#-VPWdfuG&+~ZNadYdYgYE54Q~7-M`Sz`wA7b|@b#--FL)Sq^
zXqpO&Bta||^QeUK^poSd?a!XB?eFhB9(5fFfd!g+{o2*$0|yVkP*jCTSSZUfL`?IW
zWkzy5%B54#IYdNtS9jNX)XG&vU2ssdp=*H5;@DVbc*&AwpJ_on9v@6BNIV!A7-+{t
z>Uo@=pCqWjLW63RWr-#LUeO2i1PX=1Aa=?$ENU#IQz<Q(OzzZmmCC;FI?i17Pki<B
z5<g5c5~`|N9+gHZief?2^zXTRmh|>?&m0{cuErSAPzw#!rm!4)gc8WNZ{4Upb@JG{
zwd*!?8M+ZjqC`zAHZ(NeIe+fVffXxSKDchwqp~m+a2*S5(*#wLwsC7#x2(B*@%%YS
z6!h=k(sup)#3zg^ho<HGdb^tlDXAYncE|Sa+yC<In~oU_5cHow7<k}&1(mCvQF+Pt
ze$B-3L6RjlGcx4lb3e`Ec)>)I7=dRY@I8f)@ay8HrNf=c*HvN32j3s31i$!^(V=;c
z69uZBL#HP;3_Fxc)F|A_B4QlgynZ#ib<571PafW@A<<~DCO+%kSSE9YR}@(^3<Hf*
z%DK|)upUAZ0$nn~5b%Q{WOHLSZsxN?M^AU+jZs7oqLUXSiQsp@pre1kF#KUc+%&pv
zln=>JhKH|h2mvvU$Ri3&+oQW3snnOMAn=v!&x}?ol~_WH!jSGmfU>f_@2An1>s{}Y
lC#akN_anq}ybHet7yy>`LZi9QUkv~N002ovPDHLkV1hz7sXPDx
diff --git a/view/theme/darkbubble/icons.png b/view/theme/darkbubble/icons.png
deleted file mode 100644
index 57c4bfb052cc88631ebd1b594c1fc65e60b25f21..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 22600
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
Z35YtjseLCWAsYfd>MGjGg-Vve{{^8j-Bthq
diff --git a/view/theme/darkbubble/icons.svg b/view/theme/darkbubble/icons.svg
deleted file mode 100644
index b435ba665..000000000
--- a/view/theme/darkbubble/icons.svg
+++ /dev/null
@@ -1,1442 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="250"
- height="200"
- id="svg3403"
- version="1.1"
- inkscape:version="0.48.1 r9760"
- sodipodi:docname="icons.svg"
- inkscape:export-filename="/home/fabio/public_html/friendika/view/theme/dispy/icons.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <defs
- id="defs3405">
- <filter
- color-interpolation-filters="sRGB"
- inkscape:collect="always"
- id="filter4064">
- <feBlend
- inkscape:collect="always"
- mode="lighten"
- in2="BackgroundImage"
- id="feBlend4066" />
- </filter>
- <inkscape:path-effect
- effect="gears"
- id="path-effect4050"
- is_visible="true"
- teeth="10"
- phi="10" />
- <inkscape:path-effect
- effect="gears"
- id="path-effect3436"
- is_visible="true"
- teeth="10"
- phi="10" />
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="0.9899495"
- inkscape:cx="43.010429"
- inkscape:cy="-67.661177"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="true"
- showguides="true"
- inkscape:guide-bbox="true"
- inkscape:snap-global="false"
- inkscape:window-width="1534"
- inkscape:window-height="1067"
- inkscape:window-x="104"
- inkscape:window-y="63"
- inkscape:window-maximized="0">
- <inkscape:grid
- type="xygrid"
- id="grid4016"
- empspacing="5"
- visible="true"
- enabled="false"
- snapvisiblegridlinesonly="false"
- spacingx="20px"
- spacingy="20px"
- dotted="false"
- units="px"
- originx="50px"
- originy="200px" />
- <inkscape:grid
- type="xygrid"
- id="grid4018"
- empspacing="5"
- visible="true"
- enabled="true"
- snapvisiblegridlinesonly="false"
- color="#ff0000"
- opacity="0.1254902"
- empcolor="#ff0000"
- empopacity="0.25098039"
- originy="200px"
- spacingx="22px"
- spacingy="22px" />
- </sodipodi:namedview>
- <metadata
- id="metadata3408">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Livello 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(0,-852.36218)">
- <rect
- style="fill:#2e3436;fill-opacity:1;stroke:none;display:inline"
- id="rect4007"
- width="44"
- height="132"
- x="1.5883562e-17"
- y="852.36218"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <g
- id="ico_dir"
- transform="matrix(0.43114968,0,0,0.43114968,-178.47604,867.63556)"
- style="stroke:#888a85;display:inline"
- inkscape:label="#g3846">
- <rect
- ry="6"
- rx="6"
- y="18.790752"
- x="417.14285"
- height="44.285713"
- width="44.285713"
- id="rect3820"
- style="fill:none;stroke:#888a85;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <path
- inkscape:connector-curvature="0"
- style="fill:#2e3436;stroke:#888a85;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="m 449.12191,27.281249 c -2.07646,0 -3.76352,1.688406 -3.76352,3.766518 0,2.078113 1.68706,3.766518 3.76352,3.766518 2.07646,0 3.76351,-1.688405 3.76351,-3.766518 0,-2.078112 -1.68705,-3.766518 -3.76351,-3.766518 z m 0,7.533036 c -5.23267,0 -9.47459,5.783883 -9.47459,12.932589 0,0.201529 0.0196,0.406525 0.0264,0.605804 l 18.89654,0 c 0.007,-0.199279 0.0264,-0.404275 0.0264,-0.605804 0,-7.148706 -4.24192,-12.932589 -9.47459,-12.932589 z"
- id="path3830" />
- <path
- id="path3832"
- d="m 431.26477,26.924106 c -2.07646,0 -3.76352,1.688406 -3.76352,3.766518 0,2.078113 1.68706,3.766518 3.76352,3.766518 2.07646,0 3.76351,-1.688405 3.76351,-3.766518 0,-2.078112 -1.68705,-3.766518 -3.76351,-3.766518 z m 0,7.533036 c -5.23267,0 -9.47459,5.783883 -9.47459,12.932589 0,0.201529 0.0196,0.406525 0.0264,0.605804 l 18.89654,0 c 0.007,-0.199279 0.0264,-0.404275 0.0264,-0.605804 0,-7.148706 -4.24192,-12.932589 -9.47459,-12.932589 z"
- style="fill:#2e3436;stroke:#888a85;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- inkscape:connector-curvature="0"
- id="path3822"
- d="M 439.46875,29.78125 C 437.00319,29.78125 435,31.784443 435,34.25 c 0,2.465557 2.00319,4.46875 4.46875,4.46875 2.46556,0 4.46875,-2.003193 4.46875,-4.46875 0,-2.465557 -2.00319,-4.46875 -4.46875,-4.46875 z m 0,8.9375 c -6.2132,0 -11.25,6.862234 -11.25,15.34375 0,0.239102 0.0233,0.482318 0.0313,0.71875 l 22.4375,0 c 0.008,-0.236432 0.0313,-0.479648 0.0313,-0.71875 0,-8.481516 -5.0368,-15.34375 -11.25,-15.34375 z"
- style="fill:#2e3436;stroke:#888a85;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- </g>
- <g
- id="ico_search"
- transform="matrix(0.43114968,0,0,0.43114968,-201.41936,889.63556)"
- style="stroke:#888a85;display:inline"
- inkscape:label="#g3852">
- <rect
- style="fill:none;stroke:#888a85;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect3837"
- width="44.285713"
- height="44.285713"
- x="470.35715"
- y="18.790752"
- rx="6"
- ry="6" />
- <path
- inkscape:connector-curvature="0"
- id="path3839"
- d="m 477.97758,26.469174 c -3.64342,3.88426 -3.47037,9.984211 0.41389,13.627637 3.52011,3.301856 8.87059,3.441123 12.55302,0.54905 -0.17428,0.682501 0.0188,1.431563 0.57086,1.949383 l 13.7666,12.913032 c 0.80813,0.75802 2.06896,0.717682 2.82698,-0.09044 l 0.68414,-0.729357 c 0.75802,-0.808126 0.71768,-2.06896 -0.0904,-2.82698 l -13.7666,-12.913032 c -0.55205,-0.51782 -1.31192,-0.66264 -1.98188,-0.445086 2.65077,-3.859767 2.16978,-9.190402 -1.35033,-12.492258 -3.88426,-3.643426 -9.9828,-3.426204 -13.62623,0.458055 z"
- style="fill:#2e3436;fill-opacity:1;stroke:#888a85;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <path
- transform="translate(-0.21428562,-0.35714286)"
- d="m 492.49999,33.612183 c 0,4.043513 -3.27792,7.321428 -7.32143,7.321428 -4.04352,0 -7.32143,-3.277915 -7.32143,-7.321428 0,-4.043514 3.27791,-7.321429 7.32143,-7.321429 4.04351,0 7.32143,3.277915 7.32143,7.321429 z"
- sodipodi:ry="7.3214288"
- sodipodi:rx="7.3214288"
- sodipodi:cy="33.612183"
- sodipodi:cx="485.17856"
- id="path3844"
- style="fill:#2e3436;fill-opacity:1;stroke:#888a85;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- sodipodi:type="arc" />
- </g>
- <g
- inkscape:label="#g3852"
- style="stroke:#888a85;display:inline"
- transform="matrix(0.43114968,0,0,0.43114968,-201.41936,845.63556)"
- id="ico_logout">
- <rect
- ry="6"
- rx="6"
- y="18.790752"
- x="470.35715"
- height="44.285713"
- width="44.285713"
- id="rect3995"
- style="fill:none;stroke:#888a85;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <path
- style="fill:#555753;fill-opacity:1;stroke:#888a85;stroke-width:2.31938004"
- d="M 504.69787,28.735741 480.30214,53.131477"
- id="path4003"
- inkscape:connector-curvature="0" />
- <path
- inkscape:connector-curvature="0"
- id="path4005"
- d="M 504.69787,53.131473 480.30214,28.735746"
- style="fill:#555753;fill-opacity:1;stroke:#888a85;stroke-width:2.31938004" />
- </g>
- <g
- inkscape:label="#g3846"
- style="stroke:#d3d7cf;display:inline"
- transform="matrix(0.43114968,0,0,0.43114968,-156.47604,867.63556)"
- id="ico_dir_on">
- <rect
- style="fill:none;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect4011"
- width="44.285713"
- height="44.285713"
- x="417.14285"
- y="18.790752"
- rx="6"
- ry="6" />
- <path
- id="path4013"
- d="m 449.12191,27.281249 c -2.07646,0 -3.76352,1.688406 -3.76352,3.766518 0,2.078113 1.68706,3.766518 3.76352,3.766518 2.07646,0 3.76351,-1.688405 3.76351,-3.766518 0,-2.078112 -1.68705,-3.766518 -3.76351,-3.766518 z m 0,7.533036 c -5.23267,0 -9.47459,5.783883 -9.47459,12.932589 0,0.201529 0.0196,0.406525 0.0264,0.605804 l 18.89654,0 c 0.007,-0.199279 0.0264,-0.404275 0.0264,-0.605804 0,-7.148706 -4.24192,-12.932589 -9.47459,-12.932589 z"
- style="fill:#2e3436;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- inkscape:connector-curvature="0"
- style="fill:#2e3436;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="m 431.26477,26.924106 c -2.07646,0 -3.76352,1.688406 -3.76352,3.766518 0,2.078113 1.68706,3.766518 3.76352,3.766518 2.07646,0 3.76351,-1.688405 3.76351,-3.766518 0,-2.078112 -1.68705,-3.766518 -3.76351,-3.766518 z m 0,7.533036 c -5.23267,0 -9.47459,5.783883 -9.47459,12.932589 0,0.201529 0.0196,0.406525 0.0264,0.605804 l 18.89654,0 c 0.007,-0.199279 0.0264,-0.404275 0.0264,-0.605804 0,-7.148706 -4.24192,-12.932589 -9.47459,-12.932589 z"
- id="path4015" />
- <path
- style="fill:#2e3436;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="M 439.46875,29.78125 C 437.00319,29.78125 435,31.784443 435,34.25 c 0,2.465557 2.00319,4.46875 4.46875,4.46875 2.46556,0 4.46875,-2.003193 4.46875,-4.46875 0,-2.465557 -2.00319,-4.46875 -4.46875,-4.46875 z m 0,8.9375 c -6.2132,0 -11.25,6.862234 -11.25,15.34375 0,0.239102 0.0233,0.482318 0.0313,0.71875 l 22.4375,0 c 0.008,-0.236432 0.0313,-0.479648 0.0313,-0.71875 0,-8.481516 -5.0368,-15.34375 -11.25,-15.34375 z"
- id="path4017"
- inkscape:connector-curvature="0" />
- </g>
- <g
- inkscape:label="#g3852"
- style="stroke:#d3d7cf;display:inline"
- transform="matrix(0.43114968,0,0,0.43114968,-179.41936,889.63556)"
- id="ico_search_on">
- <rect
- ry="6"
- rx="6"
- y="18.790752"
- x="470.35715"
- height="44.285713"
- width="44.285713"
- id="rect4021"
- style="fill:none;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <path
- style="fill:#2e3436;fill-opacity:1;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="m 477.97758,26.469174 c -3.64342,3.88426 -3.47037,9.984211 0.41389,13.627637 3.52011,3.301856 8.87059,3.441123 12.55302,0.54905 -0.17428,0.682501 0.0188,1.431563 0.57086,1.949383 l 13.7666,12.913032 c 0.80813,0.75802 2.06896,0.717682 2.82698,-0.09044 l 0.68414,-0.729357 c 0.75802,-0.808126 0.71768,-2.06896 -0.0904,-2.82698 l -13.7666,-12.913032 c -0.55205,-0.51782 -1.31192,-0.66264 -1.98188,-0.445086 2.65077,-3.859767 2.16978,-9.190402 -1.35033,-12.492258 -3.88426,-3.643426 -9.9828,-3.426204 -13.62623,0.458055 z"
- id="path4023"
- inkscape:connector-curvature="0" />
- <path
- sodipodi:type="arc"
- style="fill:#2e3436;fill-opacity:1;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="path4025"
- sodipodi:cx="485.17856"
- sodipodi:cy="33.612183"
- sodipodi:rx="7.3214288"
- sodipodi:ry="7.3214288"
- d="m 492.49999,33.612183 c 0,4.043513 -3.27792,7.321428 -7.32143,7.321428 -4.04352,0 -7.32143,-3.277915 -7.32143,-7.321428 0,-4.043514 3.27791,-7.321429 7.32143,-7.321429 4.04351,0 7.32143,3.277915 7.32143,7.321429 z"
- transform="translate(-0.21428562,-0.35714286)" />
- </g>
- <g
- id="ico_logout_on"
- transform="matrix(0.43114968,0,0,0.43114968,-179.41936,845.63556)"
- style="stroke:#d3d7cf;display:inline"
- inkscape:label="#g3852">
- <rect
- style="fill:none;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect4029"
- width="44.285713"
- height="44.285713"
- x="470.35715"
- y="18.790752"
- rx="6"
- ry="6" />
- <path
- inkscape:connector-curvature="0"
- id="path4031"
- d="M 504.69787,28.735741 480.30214,53.131477"
- style="fill:#555753;fill-opacity:1;stroke:#d3d7cf;stroke-width:2.31938004" />
- <path
- style="fill:#555753;fill-opacity:1;stroke:#d3d7cf;stroke-width:2.31938004"
- d="M 504.69787,53.131473 480.30214,28.735746"
- id="path4033"
- inkscape:connector-curvature="0" />
- </g>
- <g
- inkscape:label="#g3852"
- style="stroke:#888a85;display:inline;filter:url(#filter4064)"
- transform="matrix(0.43114968,0,0,0.43114968,-201.41936,911.63556)"
- id="g4040">
- <rect
- ry="6"
- rx="6"
- y="18.790752"
- x="470.35715"
- height="44.285713"
- width="44.285713"
- id="rect4042"
- style="fill:none;stroke:#888a85;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <path
- style="fill:#2e3436;fill-opacity:1;stroke:#888a85;stroke-width:1.66475451;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 484.90604,52.679071 c 0,0 -0.72327,1.028211 -2.88202,1.697409 -0.63474,-0.494653 -1.23439,-1.034334 -1.79294,-1.613646 0.43889,-2.217071 1.3855,-3.044283 1.3855,-3.044283 l 2.04237,-1.648571 c -0.73879,-0.915258 -1.3342,-1.946011 -1.75793,-3.043257 l -2.44847,0.945549 c 0,0 -1.18951,0.40671 -3.32932,-0.320779 -0.22277,-0.773276 -0.39067,-1.56235 -0.50204,-2.359331 1.65823,-1.535673 2.91028,-1.648499 2.91028,-1.648499 l 2.62132,-0.133248 c -0.0597,-1.174706 0.0645,-2.358577 0.36658,-3.495332 l -2.53663,-0.674208 c 0,0 -1.20139,-0.37014 -2.50493,-2.216441 0.2743,-0.756533 0.60227,-1.4936 0.98062,-2.20383 2.24419,-0.267701 3.32343,0.376954 3.32343,0.376954 l 2.19901,1.432971 c 0.64217,-0.985455 1.43848,-1.870246 2.35108,-2.612309 l -1.65589,-2.03644 c 0,0 -0.75438,-1.005609 -0.72373,-3.265497 0.66659,-0.45082 1.36515,-0.854347 2.08871,-1.206542 1.97294,1.102524 2.46715,2.258424 2.46715,2.258424 l 0.93675,2.451844 c 1.09876,-0.419794 2.26306,-0.667544 3.43754,-0.731472 l -0.14265,-2.620822 c 0,0 -0.0192,-1.25697 1.3339,-3.067245 0.80426,0.02709 1.6066,0.111239 2.39899,0.251604 0.94809,2.051624 0.66849,3.277254 0.66849,3.277254 l -0.6833,2.534196 c 1.13566,0.306213 2.22322,0.790136 3.21097,1.428761 l 1.42508,-2.204138 c 0,0 0.72327,-1.028211 2.88202,-1.697409 0.63474,0.494653 1.23439,1.034334 1.79294,1.613646 -0.43889,2.217071 -1.3855,3.044283 -1.3855,3.044283 l -2.04237,1.648571 c 0.73879,0.915258 1.3342,1.946011 1.75793,3.043257 l 2.44847,-0.945549 c 0,0 1.18951,-0.40671 3.32932,0.320779 0.22277,0.773276 0.39067,1.56235 0.50204,2.359331 -1.65823,1.535673 -2.91028,1.648499 -2.91028,1.648499 l -2.62132,0.133248 c 0.0597,1.174706 -0.0645,2.358577 -0.36658,3.495332 l 2.53663,0.674208 c 0,0 1.20139,0.37014 2.50493,2.216441 -0.2743,0.756533 -0.60227,1.4936 -0.98062,2.20383 -2.24419,0.267701 -3.32343,-0.376954 -3.32343,-0.376954 l -2.19901,-1.432971 c -0.64217,0.985455 -1.43848,1.870246 -2.35108,2.612309 l 1.65589,2.03644 c 0,0 0.75438,1.005609 0.72373,3.265497 -0.66659,0.45082 -1.36515,0.854347 -2.08871,1.206542 -1.97294,-1.102524 -2.46715,-2.258424 -2.46715,-2.258424 l -0.93675,-2.451844 c -1.09876,0.419794 -2.26306,0.667544 -3.43754,0.731472 l 0.14265,2.620822 c 0,0 0.0192,1.25697 -1.3339,3.067245 -0.80426,-0.02709 -1.6066,-0.111239 -2.39899,-0.251604 -0.94809,-2.051624 -0.66849,-3.277254 -0.66849,-3.277254 l 0.6833,-2.534196 c -1.13566,-0.306213 -2.22322,-0.790136 -3.21097,-1.428761 l -1.42508,2.204138"
- id="path4048"
- inkscape:connector-curvature="0"
- inkscape:path-effect="#path-effect4050"
- inkscape:original-d="M 484.55417,49.762303 492.5,40.933609 504.27158,48.879434" />
- </g>
- <g
- id="g4068"
- transform="matrix(0.43114968,0,0,0.43114968,-179.41936,911.63556)"
- style="stroke:#d3d7cf;display:inline;filter:url(#filter4064)"
- inkscape:label="#g3852">
- <rect
- style="fill:none;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect4070"
- width="44.285713"
- height="44.285713"
- x="470.35715"
- y="18.790752"
- rx="6"
- ry="6" />
- <path
- inkscape:original-d="M 484.55417,49.762303 492.5,40.933609 504.27158,48.879434"
- inkscape:path-effect="#path-effect4050"
- inkscape:connector-curvature="0"
- id="path4072"
- d="m 484.90604,52.679071 c 0,0 -0.72327,1.028211 -2.88202,1.697409 -0.63474,-0.494653 -1.23439,-1.034334 -1.79294,-1.613646 0.43889,-2.217071 1.3855,-3.044283 1.3855,-3.044283 l 2.04237,-1.648571 c -0.73879,-0.915258 -1.3342,-1.946011 -1.75793,-3.043257 l -2.44847,0.945549 c 0,0 -1.18951,0.40671 -3.32932,-0.320779 -0.22277,-0.773276 -0.39067,-1.56235 -0.50204,-2.359331 1.65823,-1.535673 2.91028,-1.648499 2.91028,-1.648499 l 2.62132,-0.133248 c -0.0597,-1.174706 0.0645,-2.358577 0.36658,-3.495332 l -2.53663,-0.674208 c 0,0 -1.20139,-0.37014 -2.50493,-2.216441 0.2743,-0.756533 0.60227,-1.4936 0.98062,-2.20383 2.24419,-0.267701 3.32343,0.376954 3.32343,0.376954 l 2.19901,1.432971 c 0.64217,-0.985455 1.43848,-1.870246 2.35108,-2.612309 l -1.65589,-2.03644 c 0,0 -0.75438,-1.005609 -0.72373,-3.265497 0.66659,-0.45082 1.36515,-0.854347 2.08871,-1.206542 1.97294,1.102524 2.46715,2.258424 2.46715,2.258424 l 0.93675,2.451844 c 1.09876,-0.419794 2.26306,-0.667544 3.43754,-0.731472 l -0.14265,-2.620822 c 0,0 -0.0192,-1.25697 1.3339,-3.067245 0.80426,0.02709 1.6066,0.111239 2.39899,0.251604 0.94809,2.051624 0.66849,3.277254 0.66849,3.277254 l -0.6833,2.534196 c 1.13566,0.306213 2.22322,0.790136 3.21097,1.428761 l 1.42508,-2.204138 c 0,0 0.72327,-1.028211 2.88202,-1.697409 0.63474,0.494653 1.23439,1.034334 1.79294,1.613646 -0.43889,2.217071 -1.3855,3.044283 -1.3855,3.044283 l -2.04237,1.648571 c 0.73879,0.915258 1.3342,1.946011 1.75793,3.043257 l 2.44847,-0.945549 c 0,0 1.18951,-0.40671 3.32932,0.320779 0.22277,0.773276 0.39067,1.56235 0.50204,2.359331 -1.65823,1.535673 -2.91028,1.648499 -2.91028,1.648499 l -2.62132,0.133248 c 0.0597,1.174706 -0.0645,2.358577 -0.36658,3.495332 l 2.53663,0.674208 c 0,0 1.20139,0.37014 2.50493,2.216441 -0.2743,0.756533 -0.60227,1.4936 -0.98062,2.20383 -2.24419,0.267701 -3.32343,-0.376954 -3.32343,-0.376954 l -2.19901,-1.432971 c -0.64217,0.985455 -1.43848,1.870246 -2.35108,2.612309 l 1.65589,2.03644 c 0,0 0.75438,1.005609 0.72373,3.265497 -0.66659,0.45082 -1.36515,0.854347 -2.08871,1.206542 -1.97294,-1.102524 -2.46715,-2.258424 -2.46715,-2.258424 l -0.93675,-2.451844 c -1.09876,0.419794 -2.26306,0.667544 -3.43754,0.731472 l 0.14265,2.620822 c 0,0 0.0192,1.25697 -1.3339,3.067245 -0.80426,-0.02709 -1.6066,-0.111239 -2.39899,-0.251604 -0.94809,-2.051624 -0.66849,-3.277254 -0.66849,-3.277254 l 0.6833,-2.534196 c -1.13566,-0.306213 -2.22322,-0.790136 -3.21097,-1.428761 l -1.42508,2.204138"
- style="fill:#2e3436;fill-opacity:1;stroke:#d3d7cf;stroke-width:1.66475451;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
- </g>
- <g
- id="g4074"
- transform="matrix(0.43114968,0,0,0.43114968,-201.41936,933.6356)"
- style="stroke:#888a85;display:inline;filter:url(#filter4064)"
- inkscape:label="#g3852">
- <rect
- style="fill:none;stroke:#888a85;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect4076"
- width="44.285713"
- height="44.285713"
- x="470.35715"
- y="18.790752"
- rx="6"
- ry="6" />
- <path
- style="fill:#2e3436;fill-opacity:1;stroke:#888a85;stroke-width:0.79446769;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
- d="m 871.875,46.1875 c -1.86715,0.0095 -3.39179,1.39545 -3.65625,3.1875 -0.13267,-0.238038 -0.39472,-0.407705 -0.6875,-0.40625 L 860.21875,49 c -0.42864,0.0022 -0.75216,0.352585 -0.75,0.78125 l 0,0.375 c 0.002,0.428643 0.35273,0.783324 0.78125,0.78125 l 0.71875,0 c -0.017,0.04029 -0.0313,0.109644 -0.0313,0.15625 l 0,1.90625 c 0,0.186425 0.15733,0.34375 0.34375,0.34375 l 0.9375,0 c 0.18642,0 0.34375,-0.157325 0.34375,-0.34375 l 0,-1.90625 c 0,-0.04661 -0.0143,-0.115964 -0.0313,-0.15625 l 1.25,0 c -0.017,0.04029 -0.0313,0.109644 -0.0313,0.15625 l 0,1.90625 c 0,0.186425 0.15733,0.34375 0.34375,0.34375 l 0.9375,0 c 0.18642,0 0.34375,-0.157325 0.34375,-0.34375 l 0,-1.90625 c 0,-0.05736 -0.006,-0.140333 -0.0313,-0.1875 l 2.1875,0 c 0.29284,-0.0015 0.55725,-0.166865 0.6875,-0.40625 0.28274,1.789274 1.85161,3.165775 3.71875,3.15625 2.0603,-0.01052 3.69802,-1.720959 3.6875,-3.78125 -0.0105,-2.060291 -1.68969,-3.698024 -3.75,-3.6875 z"
- transform="matrix(2.3193801,0,0,2.3193801,-1519.671,-74.824492)"
- id="path3839-4"
- inkscape:connector-curvature="0" />
- </g>
- <g
- inkscape:label="#g3852"
- style="stroke:#d3d7cf;display:inline;filter:url(#filter4064)"
- transform="matrix(0.43114968,0,0,0.43114968,-179.41936,933.6356)"
- id="g4106">
- <rect
- ry="6"
- rx="6"
- y="18.790752"
- x="470.35715"
- height="44.285713"
- width="44.285713"
- id="rect4108"
- style="fill:none;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <path
- id="path4110"
- transform="matrix(2.3193801,0,0,2.3193801,-1519.671,-74.824492)"
- d="m 871.875,46.1875 c -1.86715,0.0095 -3.39179,1.39545 -3.65625,3.1875 -0.13267,-0.238038 -0.39472,-0.407705 -0.6875,-0.40625 L 860.21875,49 c -0.42864,0.0022 -0.75216,0.352585 -0.75,0.78125 l 0,0.375 c 0.002,0.428643 0.35273,0.783324 0.78125,0.78125 l 0.71875,0 c -0.017,0.04029 -0.0313,0.109644 -0.0313,0.15625 l 0,1.90625 c 0,0.186425 0.15733,0.34375 0.34375,0.34375 l 0.9375,0 c 0.18642,0 0.34375,-0.157325 0.34375,-0.34375 l 0,-1.90625 c 0,-0.04661 -0.0143,-0.115964 -0.0313,-0.15625 l 1.25,0 c -0.017,0.04029 -0.0313,0.109644 -0.0313,0.15625 l 0,1.90625 c 0,0.186425 0.15733,0.34375 0.34375,0.34375 l 0.9375,0 c 0.18642,0 0.34375,-0.157325 0.34375,-0.34375 l 0,-1.90625 c 0,-0.05736 -0.006,-0.140333 -0.0313,-0.1875 l 2.1875,0 c 0.29284,-0.0015 0.55725,-0.166865 0.6875,-0.40625 0.28274,1.789274 1.85161,3.165775 3.71875,3.15625 2.0603,-0.01052 3.69802,-1.720959 3.6875,-3.78125 -0.0105,-2.060291 -1.68969,-3.698024 -3.75,-3.6875 z"
- style="fill:#2e3436;fill-opacity:1;stroke:#d3d7cf;stroke-width:0.79446769;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
- inkscape:connector-curvature="0" />
- </g>
- <g
- id="g4031-9"
- transform="matrix(0.45818575,0.68148541,-0.68148541,0.45818575,-2.7897502,485.71067)"
- style="display:inline"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <path
- sodipodi:type="arc"
- style="fill:#555753;fill-opacity:1;stroke:none"
- id="path4002-3"
- sodipodi:cx="559.67499"
- sodipodi:cy="21.754047"
- sodipodi:rx="0.88388348"
- sodipodi:ry="0.88388348"
- d="m 560.55887,21.754047 c 0,0.488156 -0.39573,0.883884 -0.88388,0.883884 -0.48816,0 -0.88389,-0.395728 -0.88389,-0.883884 0,-0.488155 0.39573,-0.883883 0.88389,-0.883883 0.48815,0 0.88388,0.395728 0.88388,0.883883 z"
- transform="matrix(2.8,0,0,2.8,-999.63682,-35.444974)" />
- <path
- transform="matrix(2.1,0,0,2.1,-600.17454,-24.194616)"
- d="m 560.55887,21.754047 c 0,0.488156 -0.39573,0.883884 -0.88388,0.883884 -0.48816,0 -0.88389,-0.395728 -0.88389,-0.883884 0,-0.488155 0.39573,-0.883883 0.88389,-0.883883 0.48815,0 0.88388,0.395728 0.88388,0.883883 z"
- sodipodi:ry="0.88388348"
- sodipodi:rx="0.88388348"
- sodipodi:cy="21.754047"
- sodipodi:cx="559.67499"
- id="path4004-9"
- style="fill:#555753;fill-opacity:1;stroke:none"
- sodipodi:type="arc" />
- <path
- sodipodi:type="arc"
- style="fill:#555753;fill-opacity:1;stroke:none"
- id="path4006-4"
- sodipodi:cx="559.67499"
- sodipodi:cy="21.754047"
- sodipodi:rx="0.88388348"
- sodipodi:ry="0.88388348"
- d="m 560.55887,21.754047 c 0,0.488156 -0.39573,0.883884 -0.88388,0.883884 -0.48816,0 -0.88389,-0.395728 -0.88389,-0.883884 0,-0.488155 0.39573,-0.883883 0.88389,-0.883883 0.48815,0 0.88388,0.395728 0.88388,0.883883 z"
- transform="matrix(2.2,0,0,2.2,-671.07968,-28.226177)" />
- <path
- style="fill:none;stroke:#555753;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 563.21055,31.653543 4.41942,-6.187185 -7.6014,-6.187184"
- id="path4010-56"
- inkscape:connector-curvature="0" />
- <path
- transform="matrix(2.4,0,0,2.4,-780.18625,-20.379394)"
- d="m 560.55887,21.754047 c 0,0.488156 -0.39573,0.883884 -0.88388,0.883884 -0.48816,0 -0.88389,-0.395728 -0.88389,-0.883884 0,-0.488155 0.39573,-0.883883 0.88389,-0.883883 0.48815,0 0.88388,0.395728 0.88388,0.883883 z"
- sodipodi:ry="0.88388348"
- sodipodi:rx="0.88388348"
- sodipodi:cy="21.754047"
- sodipodi:cx="559.67499"
- id="path4008-8"
- style="fill:#555753;fill-opacity:1;stroke:none"
- sodipodi:type="arc" />
- <path
- style="fill:none;stroke:#555753;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 567.45319,25.466358 7.6014,-4.065864"
- id="path4012-5"
- inkscape:connector-curvature="0" />
- </g>
- <path
- style="fill:none;stroke:#555753;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
- d="m 218.00001,881.25007 -5.8125,0 0,9.1875 10.53125,0 0,-5.2187"
- id="rect4432"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccccc"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <rect
- style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
- id="rect4387-8"
- width="14.5"
- height="9"
- x="173.12502"
- y="858.11218"
- rx="2.9268293"
- ry="2.9268293"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <path
- sodipodi:type="arc"
- style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
- id="path4391-3"
- sodipodi:cx="408.8125"
- sodipodi:cy="220.26843"
- sodipodi:rx="2.6875"
- sodipodi:ry="2.71875"
- d="m 411.5,220.26843 a 2.6875,2.71875 0 1 1 -5.375,0 2.6875,2.71875 0 1 1 5.375,0 z"
- transform="matrix(1.1489362,0,0,1.1489362,-286.13697,609.51131)"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <path
- style="fill:#ffffff;fill-opacity:1;stroke:#555753;stroke-width:0.47366244;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
- d="m 242.44524,860.13287 c -0.98011,0 -1.77562,0.6006 -1.77562,1.3586 l 0,1.5632 c 0,0.7581 0.79551,1.3733 1.77562,1.3733 l 4.53349,0 c 0.98012,0 1.77562,-0.6152 1.77562,-1.3733 l 0,-1.5632 c 0,-0.758 -0.7955,-1.3586 -1.77562,-1.3586 l -4.53349,0 z m 0.41557,1.0372 3.70235,0 c 0.51967,0 0.94448,0.2879 0.94448,0.6574 l 0,0.8912 c 0,0.3695 -0.42481,0.672 -0.94448,0.672 l -3.70235,0 c -0.51966,0 -0.94447,-0.3025 -0.94447,-0.672 l 0,-0.8912 c 0,-0.3695 0.42481,-0.6574 0.94447,-0.6574 z"
- id="rect4397-0"
- inkscape:connector-curvature="0"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <path
- inkscape:connector-curvature="0"
- id="path4418-4"
- d="m 232.97199,860.13287 c -0.98011,0 -1.77562,0.6006 -1.77562,1.3586 l 0,1.5632 c 0,0.7581 0.79551,1.3733 1.77562,1.3733 l 4.53349,0 c 0.98012,0 1.77562,-0.6152 1.77562,-1.3733 l 0,-1.5632 c 0,-0.758 -0.7955,-1.3586 -1.77562,-1.3586 l -4.53349,0 z m 0.41557,1.0372 3.70236,0 c 0.51966,0 0.94447,0.2879 0.94447,0.6574 l 0,0.8912 c 0,0.3695 -0.42481,0.672 -0.94447,0.672 l -3.70236,0 c -0.51966,0 -0.94447,-0.3025 -0.94447,-0.672 l 0,-0.8912 c 0,-0.3695 0.42481,-0.6574 0.94447,-0.6574 z"
- style="fill:#ffffff;fill-opacity:1;stroke:#555753;stroke-width:0.47366244;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <rect
- style="fill:#ffffff;fill-opacity:1;stroke:#555753;stroke-width:0.47366244;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
- id="rect4395-0"
- width="6.7246785"
- height="1.6362466"
- x="236.7028"
- y="861.57312"
- rx="1.0135853"
- ry="0.81812328"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <rect
- style="fill:#555753;fill-opacity:1;stroke:none;display:inline"
- id="rect4416-1"
- width="14.495689"
- height="6.5407376"
- x="132.5179"
- y="901.32971"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <text
- xml:space="preserve"
- style="font-size:5.54432058px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
- x="139.36653"
- y="900.60059"
- id="text4406-9"
- sodipodi:linespacing="100%"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90"><tspan
- sodipodi:role="line"
- id="tspan4408-6"
- x="139.36653"
- y="900.60059">You</tspan><tspan
- sodipodi:role="line"
- x="139.36653"
- y="906.1449"
- id="tspan4410-2"
- style="fill:#eeeeec">Tube</tspan></text>
- <path
- style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
- d="m 118.03127,895.15627 0,0.3125 c 0,1.2601 -0.0643,3.4345 -0.35937,5.75 l -1.5625,1e-4 c -0.80183,0.011 -1.64766,4.0737 -1.60938,8.0625 l 8.25,0 c -0.057,-5.5479 1.56902,-11.5211 1.75,-5.6563 0.21453,6.9525 1.74237,-5.1823 1.75,-8.4687 z"
- id="rect4428-4"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="csccccscc"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <path
- style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
- d="m 124.78127,905.73727 -1.9375,-0.063"
- id="path4440-4"
- inkscape:connector-curvature="0"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <path
- style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
- d="m 117.59377,901.20597 6.4375,0"
- id="path4442-9"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cc"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <rect
- style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
- id="rect4446-9"
- width="1.0625"
- height="0.375"
- x="115.28126"
- y="908.11218"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <rect
- y="906.51843"
- x="115.34376"
- height="0.375"
- width="1.0625"
- id="rect4448-3"
- style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <rect
- style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
- id="rect4450-6"
- width="1.0625"
- height="0.375"
- x="115.50001"
- y="904.89343"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <rect
- y="903.42468"
- x="115.81251"
- height="0.375"
- width="1.0625"
- id="rect4452-0"
- style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <rect
- style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
- id="rect4454-5"
- width="1.0625"
- height="0.375"
- x="116.21876"
- y="902.17468"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <rect
- y="900.17468"
- x="118.50001"
- height="0.375"
- width="1.0625"
- id="rect4456-0"
- style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <rect
- style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
- id="rect4458-2"
- width="1.0625"
- height="0.375"
- x="118.68751"
- y="898.70593"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <rect
- y="897.20593"
- x="118.75001"
- height="0.375"
- width="1.0625"
- id="rect4460-9"
- style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <rect
- style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
- id="rect4462-4"
- width="1.0625"
- height="0.375"
- x="118.75001"
- y="895.79968"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <rect
- y="908.11218"
- x="120.84376"
- height="0.375"
- width="1.0625"
- id="rect4464-3"
- style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <rect
- style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
- id="rect4466-5"
- width="1.0625"
- height="0.375"
- x="120.90627"
- y="906.51843"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <rect
- y="904.89343"
- x="121.06252"
- height="0.375"
- width="1.0625"
- id="rect4468-1"
- style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <rect
- style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
- id="rect4470-7"
- width="1.0625"
- height="0.375"
- x="121.37502"
- y="903.42468"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <rect
- y="902.17468"
- x="121.78127"
- height="0.375"
- width="1.0625"
- id="rect4472-4"
- style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <rect
- style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
- id="rect4474-3"
- width="1.0625"
- height="0.375"
- x="124.06252"
- y="900.17468"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <rect
- y="898.70593"
- x="124.25002"
- height="0.375"
- width="1.0625"
- id="rect4476-1"
- style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <rect
- style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
- id="rect4478-4"
- width="1.0625"
- height="0.375"
- x="124.31252"
- y="897.20593"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <rect
- y="895.79968"
- x="124.31252"
- height="0.375"
- width="1.0625"
- id="rect4480-6"
- style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <g
- style="display:inline"
- id="g4507-4"
- transform="matrix(0.92823291,-0.48059851,0.48059851,0.92823291,-312.89954,806.76727)"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <path
- sodipodi:nodetypes="csc"
- inkscape:connector-curvature="0"
- id="path4491-2"
- d="m 310.75659,223.79453 c 0.76095,-0.8373 1.2453,-2.02269 1.2453,-3.35786 0,-1.33796 -0.48156,-2.54257 -1.2453,-3.38009"
- style="fill:none;stroke:#555753;stroke-width:0.35579938;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <path
- style="fill:none;stroke:#555753;stroke-width:0.47089946;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="m 311.49266,224.75938 c 1.00712,-1.10816 1.64816,-2.67702 1.64816,-4.44411 0,-1.77079 -0.63735,-3.36509 -1.64816,-4.47354"
- id="path4496-2"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="csc" />
- <path
- sodipodi:nodetypes="csc"
- inkscape:connector-curvature="0"
- id="path4498-6"
- d="m 312.78041,226.18348 c 1.3429,-1.47763 2.19766,-3.56956 2.19766,-5.9258 0,-2.36118 -0.84984,-4.48703 -2.19766,-5.96505"
- style="fill:none;stroke:#555753;stroke-width:0.62789989;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <path
- sodipodi:nodetypes="ccccccc"
- inkscape:connector-curvature="0"
- id="path4500-4"
- d="m 309.34375,224.125 0,-7.375 -3.78125,2.07812 -3.4375,-0.10937 0,3.46875 3.4375,-0.125 z"
- style="fill:none;stroke:#555753;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- </g>
- <path
- sodipodi:type="arc"
- style="fill:none;stroke:#555753;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
- id="path4515-2"
- sodipodi:cx="284.78726"
- sodipodi:cy="220.62782"
- sodipodi:rx="7.4246211"
- sodipodi:ry="7.4246211"
- d="m 292.21188,220.62782 a 7.4246211,7.4246211 0 1 1 -14.84924,0 7.4246211,7.4246211 0 1 1 14.84924,0 z"
- transform="translate(-224.73743,661.76263)"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <path
- style="fill:none;stroke:#555753;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline"
- d="m 53.15626,883.15627 c 1.94168,0.712 4.31843,1.1563 6.90625,1.1563 2.58782,0 4.96457,-0.4443 6.90625,-1.1563"
- id="path4517-8"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="csc"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <path
- sodipodi:nodetypes="csc"
- inkscape:connector-curvature="0"
- id="path4528-8"
- d="m 60.45665,888.82867 c 0.71191,-1.9416 1.15625,-4.3184 1.15625,-6.9062 0,-2.5878 -0.44434,-4.9646 -1.15625,-6.9063"
- style="fill:none;stroke:#555753;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <text
- xml:space="preserve"
- style="font-size:3.72799897px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#555753;fill-opacity:1;stroke:none;display:inline;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans"
- x="51.803352"
- y="859.21899"
- id="text4532-2"
- sodipodi:linespacing="100%"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90"><tspan
- sodipodi:role="line"
- id="tspan4534-8"
- x="51.803352"
- y="859.21899"
- style="font-weight:bold;fill:#555753;-inkscape-font-specification:Liberation Sans Bold">Lorem Ip</tspan></text>
- <path
- style="fill:#555753;fill-opacity:1;stroke:#555753;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline"
- d="m 52.25001,862.61227 15.25,0"
- id="path4536-8"
- inkscape:connector-curvature="0"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <path
- inkscape:connector-curvature="0"
- id="path4538-8"
- d="m 52.25001,864.86227 15.25,0"
- style="fill:#555753;fill-opacity:1;stroke:#555753;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <path
- style="fill:#555753;fill-opacity:1;stroke:#555753;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline"
- d="m 52.25001,867.11227 15.25,0"
- id="path4540-6"
- inkscape:connector-curvature="0"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <path
- style="fill:none;stroke:#555753;stroke-width:0.82322329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
- d="m 242.49116,907.21887 5.125,-5.125 -5.125,-5.0937"
- id="rect4544-3"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccc"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <path
- sodipodi:nodetypes="ccc"
- inkscape:connector-curvature="0"
- id="path4549-8"
- d="m 237.98183,907.21887 -5.125,-5.125 5.125,-5.0937"
- style="fill:none;stroke:#555753;stroke-width:0.82322329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <g
- style="display:inline"
- id="g4213"
- transform="translate(49.48448,-140.79121)"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <path
- sodipodi:type="star"
- style="fill:#555753;fill-opacity:1;stroke:none"
- id="path4802"
- sodipodi:sides="8"
- sodipodi:cx="98.48214"
- sodipodi:cy="-10.267858"
- sodipodi:r1="9.1071424"
- sodipodi:r2="8.4139032"
- sodipodi:arg1="-1.5707963"
- sodipodi:arg2="-1.1780972"
- inkscape:flatsided="true"
- inkscape:rounded="0"
- inkscape:randomized="0"
- d="m 98.48214,-19.375 6.43972,2.66742 2.66742,6.439723 -2.66742,6.4397218 -6.439721,2.6674201 -6.439722,-2.6674204 -2.66742,-6.4397225 2.667421,-6.439722 z"
- transform="matrix(0.92307692,0.3846154,-0.3846154,0.92307692,-44.340246,974.7537)" />
- <path
- transform="matrix(0.74691191,0.31121331,-0.31121331,0.74691191,-26.237457,980.1736)"
- d="m 98.48214,-19.375 6.43972,2.66742 2.66742,6.439723 -2.66742,6.4397218 -6.439721,2.6674201 -6.439722,-2.6674204 -2.66742,-6.4397225 2.667421,-6.439722 z"
- inkscape:randomized="0"
- inkscape:rounded="0"
- inkscape:flatsided="true"
- sodipodi:arg2="-1.1780972"
- sodipodi:arg1="-1.5707963"
- sodipodi:r2="8.4139032"
- sodipodi:r1="9.1071424"
- sodipodi:cy="-10.267858"
- sodipodi:cx="98.48214"
- sodipodi:sides="8"
- id="path4804"
- style="fill:none;stroke:#d3d7cf;stroke-width:2.47171569;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- sodipodi:type="star" />
- <path
- style="fill:none;stroke:#555753;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 53.26552,1056.9525 -5.5,6.2008 5.5,6.2009"
- id="rect4806"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccc" />
- <path
- id="path4812"
- d="m 67.781143,1069.3407 5.46875,-6.2009 -5.46875,-6.1736"
- style="fill:none;stroke:#555753;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccc" />
- </g>
- <path
- style="fill:#555753;fill-opacity:1;stroke:none;display:inline"
- id="path4257"
- d="m 115.39024,855.00555 c 0.0904,0.0266 0.18708,0.0371 0.27111,0.0797 0.24682,0.12501 0.80382,0.53514 1.00046,0.67918 0.72548,0.53142 1.43751,1.08068 2.14837,1.63134 1.22364,0.99003 2.36274,2.09287 3.41202,3.2665 0.43117,0.4822 1.01205,1.207 1.42675,1.7166 0.97898,1.2314 2.022,2.4234 2.86791,3.7533 0.20576,0.2994 0.39551,0.6797 0.65579,0.9028 -0.10862,-0.1107 -0.10877,-0.099 0.0344,-0.01 0.19118,0.1291 -1.63528,2.8328 -1.82646,2.7036 l 0,0 c -0.18814,-0.022 -0.0511,0 -0.37755,-0.1793 -0.55628,-0.365 -1.09599,-0.7525 -1.61517,-1.1691 -1.27322,-1.0021 -2.36476,-2.2048 -3.47982,-3.3749 -1.53016,-1.5621 -3.0115,-3.1717 -4.57958,-4.6966 -0.94249,-1.01074 -1.92636,-2.0326 -2.54392,-3.28422 -0.14292,-0.18424 2.46273,-2.20539 2.60565,-2.02115 z"
- inkscape:connector-curvature="0"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <path
- style="fill:#555753;fill-opacity:1;stroke:none;display:inline"
- id="path4259"
- d="m 112.109,867.43007 c 0.0548,-0.091 0.10266,-0.1866 0.16432,-0.2731 0.23235,-0.3261 0.52565,-0.6137 0.79275,-0.9102 0.42229,-0.4689 0.38553,-0.4337 0.82852,-0.9537 1.44214,-1.6363 3.06836,-3.0981 4.69856,-4.5425 1.63203,-1.40989 3.17698,-2.9167 4.78859,-4.3486 0.46305,-0.4369 0.97793,-0.80137 1.52221,-1.12653 0.15824,-0.21119 3.14491,2.0267 2.98666,2.23789 l 0,0 c -0.2952,0.52243 -0.62275,1.02042 -1.01852,1.47475 -0.88192,1.11919 -1.78212,2.22369 -2.79371,3.23049 -0.29346,0.2921 -0.60222,0.5684 -0.90606,0.8497 -0.31321,0.2899 -0.63003,0.5759 -0.94504,0.8639 -1.67153,1.4209 -3.37366,2.8163 -5.22715,3.9963 -0.49876,0.3405 -0.57121,0.3777 -1.0203,0.7266 -0.39341,0.3057 -0.75974,0.6889 -1.26518,0.7962 -0.14292,0.1842 -2.74857,-1.8369 -2.60565,-2.0212 z"
- inkscape:connector-curvature="0"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <path
- inkscape:connector-curvature="0"
- d="m 135.39024,855.00555 c 0.0904,0.027 0.18708,0.037 0.27111,0.08 0.24682,0.125 0.80382,0.5352 1.00046,0.6792 0.72548,0.5314 1.43751,1.0807 2.14837,1.6314 1.22364,0.99 2.36274,2.0928 3.41202,3.26652 0.43117,0.4822 1.01205,1.207 1.42675,1.7166 0.97898,1.2314 2.022,2.4234 2.86791,3.7533 0.20576,0.2994 0.39551,0.6797 0.65579,0.9028 -0.10862,-0.1107 -0.10877,-0.099 0.0344,-0.01 0.19118,0.1291 -1.63528,2.8328 -1.82646,2.7036 l 0,0 c -0.18814,-0.022 -0.0511,0 -0.37755,-0.1793 -0.55628,-0.365 -1.09599,-0.7525 -1.61517,-1.1691 -1.27322,-1.0021 -2.36476,-2.2048 -3.47982,-3.3749 -1.53016,-1.5621 -3.0115,-3.1717 -4.57958,-4.6966 -0.94249,-1.01082 -1.92636,-2.03262 -2.54392,-3.28432 -0.14292,-0.1842 2.46273,-2.2054 2.60565,-2.0211 z"
- id="path4263"
- style="fill:#d3d7cf;fill-opacity:1;stroke:none;display:inline"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <path
- inkscape:connector-curvature="0"
- d="m 132.109,867.43017 c 0.0548,-0.091 0.10266,-0.1866 0.16432,-0.2731 0.23235,-0.3261 0.52565,-0.6137 0.79275,-0.9102 0.42229,-0.4689 0.38553,-0.4337 0.82852,-0.9537 1.44214,-1.6363 3.06836,-3.0981 4.69856,-4.5425 1.63203,-1.40992 3.17698,-2.91672 4.78859,-4.34862 0.46305,-0.4369 0.97793,-0.8014 1.52221,-1.1266 0.15824,-0.2112 3.14491,2.0267 2.98666,2.2379 l 0,0 c -0.2952,0.5224 -0.62275,1.0204 -1.01852,1.4748 -0.88192,1.11922 -1.78212,2.22372 -2.79371,3.23052 -0.29346,0.2921 -0.60222,0.5684 -0.90606,0.8497 -0.31321,0.2899 -0.63003,0.5759 -0.94504,0.8639 -1.67153,1.4209 -3.37366,2.8163 -5.22715,3.9963 -0.49876,0.3405 -0.57121,0.3777 -1.0203,0.7266 -0.39341,0.3057 -0.75974,0.6889 -1.26518,0.7962 -0.14292,0.1842 -2.74857,-1.8369 -2.60565,-2.0212 z"
- id="path4265"
- style="fill:#d3d7cf;fill-opacity:1;stroke:none;display:inline"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <g
- style="display:inline"
- id="g4283"
- transform="matrix(0.52823691,0.52823691,-0.52823691,0.52823691,773.22931,294.0656)"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <path
- sodipodi:nodetypes="ccccccc"
- inkscape:connector-curvature="0"
- id="path4269"
- d="m -44.467884,1107.2152 0,17.7252 1.161165,3.7983 c 1.200046,4.2782 1.065706,4.1105 2.322331,0 l 1.161165,-3.7983 0,-17.7252 z"
- style="fill:none;stroke:#555753;stroke-width:0.66930836;stroke-miterlimit:4;stroke-dasharray:none" />
- <path
- inkscape:connector-curvature="0"
- id="path4271"
- d="m -44.467884,1124.9404 4.644661,0"
- style="fill:none;stroke:#555753;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
- <path
- style="fill:none;stroke:#555753;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m -42.239747,1107.2336 0,17.6813"
- id="path4275"
- inkscape:connector-curvature="0" />
- <path
- sodipodi:nodetypes="cccc"
- inkscape:connector-curvature="0"
- id="path4279"
- d="m -43.348187,1128.4959 c 1.108441,-0.8952 1.929509,-0.3581 2.381097,0.045 -0.328428,1.1191 -1.190549,3.9391 -1.190549,3.9391 z"
- style="fill:#555753;stroke:#555753;stroke-width:0.66930836;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
- <rect
- ry="0.42804927"
- rx="0.37616169"
- y="1105.3309"
- x="-44.73621"
- height="1.8614606"
- width="5.1800866"
- id="rect4281"
- style="fill:#555753;fill-opacity:1;stroke:none" />
- </g>
- <rect
- style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
- id="rect4290"
- width="3.5355339"
- height="1.8561553"
- x="174.89275"
- y="859.06403"
- rx="1"
- ry="1"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <path
- style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
- d="m 214.75589,862.65317 c 3.31942,-0.632 4.06019,-2.1721 5.3033,-4.08897 0.42304,-0.6524 -0.64726,-2.63586 0,-3.13491 0.10703,-0.0825 0.93192,0 1.06066,0 2.52315,0 1.41421,3.50161 1.41421,4.77048 0,0.2317 -0.47723,0.6815 -0.17677,0.6815 2.44972,0 2.94209,0.3603 4.41942,1.4993 0.0697,0.054 0.31741,3.8443 0.17677,3.9527 -0.26074,0.201 -0.49042,0.5145 -0.7071,0.6815 -0.13627,0.105 0.38563,0.7684 0.17677,1.0904 -0.17664,0.2724 -0.85358,0.8061 -1.23743,0.9541 -0.36233,0.1398 -0.89015,0 -1.23744,0.1363 -1.96875,0.759 -2.1166,-0.9523 -3.18198,-1.363 -0.34866,-0.1344 -0.63592,-0.1088 -1.06066,-0.2726 -0.99671,-0.3842 -3.88909,0.6704 -3.88909,-0.2726 0,-1.2852 -0.2556,-3.5996 -1.06066,-4.6342 z"
- id="path4292"
- inkscape:connector-curvature="0"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <path
- inkscape:connector-curvature="0"
- id="path4294"
- d="m 205.42921,862.12677 c -3.31942,0.632 -4.06019,2.1721 -5.3033,4.089 -0.42304,0.6524 0.64726,2.6358 0,3.1349 -0.10703,0.082 -0.93192,0 -1.06066,0 -2.52315,0 -1.41421,-3.5016 -1.41421,-4.7705 0,-0.2317 0.47723,-0.6815 0.17677,-0.6815 -2.44972,0 -2.94209,-0.3603 -4.41942,-1.4993 -0.0697,-0.054 -0.31741,-3.84428 -0.17677,-3.95268 0.26074,-0.201 0.49042,-0.5145 0.7071,-0.6815 0.13627,-0.105 -0.38563,-0.7684 -0.17677,-1.0904 0.17664,-0.2724 0.85358,-0.8061 1.23743,-0.9541 0.36233,-0.1398 0.89015,0 1.23744,-0.1363 1.96875,-0.759 2.1166,0.9523 3.18198,1.363 0.34866,0.1344 0.63592,0.1088 1.06066,0.2726 0.99671,0.3842 3.88909,-0.6704 3.88909,0.2726 0,1.2852 0.2556,3.59958 1.06066,4.63418 z"
- style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <path
- transform="translate(-204.73743,661.76269)"
- d="m 292.21188,220.62782 a 7.4246211,7.4246211 0 1 1 -14.84924,0 7.4246211,7.4246211 0 1 1 14.84924,0 z"
- sodipodi:ry="7.4246211"
- sodipodi:rx="7.4246211"
- sodipodi:cy="220.62782"
- sodipodi:cx="284.78726"
- id="path4298"
- style="fill:none;stroke:#d3d7cf;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
- sodipodi:type="arc"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <path
- sodipodi:nodetypes="csc"
- inkscape:connector-curvature="0"
- id="path4300"
- d="m 73.15626,883.15627 c 1.94168,0.712 4.31843,1.1563 6.90625,1.1563 2.58782,0 4.96457,-0.4443 6.90625,-1.1563"
- style="fill:none;stroke:#d3d7cf;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <path
- style="fill:none;stroke:#d3d7cf;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 2;stroke-dashoffset:0;display:inline"
- d="m 80.45665,888.82867 c 0.71191,-1.9416 1.15625,-4.3184 1.15625,-6.9062 0,-2.5878 -0.44434,-4.9646 -1.15625,-6.9063"
- id="path4302"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="csc"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <path
- transform="translate(-184.73743,661.76263)"
- d="m 292.21188,220.62782 a 7.4246211,7.4246211 0 1 1 -14.84924,0 7.4246211,7.4246211 0 1 1 14.84924,0 z"
- sodipodi:ry="7.4246211"
- sodipodi:rx="7.4246211"
- sodipodi:cy="220.62782"
- sodipodi:cx="284.78726"
- id="path4306"
- style="fill:none;stroke:#555753;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
- sodipodi:type="arc"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <path
- style="fill:none;stroke:#555753;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
- d="m 94.285536,887.89997 11.048544,-11.0485"
- id="path4308"
- inkscape:connector-curvature="0"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <rect
- style="fill:#555753;stroke:none;display:inline"
- id="rect4310"
- width="3.3587573"
- height="12.020815"
- x="115.93771"
- y="876.12292"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <rect
- y="876.12292"
- x="120.53392"
- height="12.020815"
- width="3.3587573"
- id="rect4312"
- style="fill:#555753;stroke:none;display:inline"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <path
- style="fill:#555753;stroke:none;display:inline"
- d="m 134.32248,876.12297 11.31371,6.0104 -11.31371,6.0104 z"
- id="rect4314"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccc"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <g
- style="display:inline"
- transform="matrix(0.52823691,0.52823691,-0.52823691,0.52823691,773.22931,313.68781)"
- id="g4317"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <path
- style="fill:none;stroke:#555753;stroke-width:0.66930836;stroke-miterlimit:4;stroke-dasharray:none"
- d="m -44.467884,1107.2152 0,17.7252 1.161165,3.7983 c 1.200046,4.2782 1.065706,4.1105 2.322331,0 l 1.161165,-3.7983 0,-17.7252 z"
- id="path4319"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccccccc" />
- <path
- style="fill:none;stroke:#555753;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m -44.467884,1124.9404 4.644661,0"
- id="path4321"
- inkscape:connector-curvature="0" />
- <path
- inkscape:connector-curvature="0"
- id="path4323"
- d="m -42.239747,1107.2336 0,17.6813"
- style="fill:none;stroke:#555753;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
- <path
- style="fill:#555753;stroke:#555753;stroke-width:0.66930836;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
- d="m -43.348187,1128.4959 c 1.108441,-0.8952 1.929509,-0.3581 2.381097,0.045 -0.328428,1.1191 -1.190549,3.9391 -1.190549,3.9391 z"
- id="path4325"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccc" />
- <rect
- style="fill:#555753;fill-opacity:1;stroke:none"
- id="rect4327"
- width="5.1800866"
- height="1.8614606"
- x="-44.73621"
- y="1105.3309"
- rx="0.37616169"
- ry="0.42804927" />
- </g>
- <g
- style="display:inline"
- id="g4329"
- transform="matrix(0.24508333,0.24508333,-0.24508333,0.24508333,458.00011,612.37085)"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <path
- sodipodi:nodetypes="ccccccc"
- inkscape:connector-curvature="0"
- id="path4331"
- d="m -44.467884,1107.2152 0,17.7252 1.161165,3.7983 c 1.200046,4.2782 1.065706,4.1105 2.322331,0 l 1.161165,-3.7983 0,-17.7252 z"
- style="fill:none;stroke:#555753;stroke-width:0.66930836;stroke-miterlimit:4;stroke-dasharray:none" />
- <path
- inkscape:connector-curvature="0"
- id="path4333"
- d="m -44.467884,1124.9404 4.644661,0"
- style="fill:none;stroke:#555753;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
- <path
- style="fill:none;stroke:#555753;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m -42.239747,1107.2336 0,17.6813"
- id="path4335"
- inkscape:connector-curvature="0" />
- <path
- sodipodi:nodetypes="cccc"
- inkscape:connector-curvature="0"
- id="path4337"
- d="m -43.348187,1128.4959 c 1.108441,-0.8952 1.929509,-0.3581 2.381097,0.045 -0.328428,1.1191 -1.190549,3.9391 -1.190549,3.9391 z"
- style="fill:#555753;stroke:#555753;stroke-width:0.66930836;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
- <rect
- ry="0.42804927"
- rx="0.37616169"
- y="1105.3309"
- x="-44.73621"
- height="1.8614606"
- width="5.1800866"
- id="rect4339"
- style="fill:#555753;fill-opacity:1;stroke:none" />
- </g>
- <g
- id="layer1-2"
- transform="matrix(0.03334717,0,0,0.03334717,191.57984,885.59897)"
- style="fill:#555753;display:inline"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <path
- id="path11522"
- style="fill:#555753;fill-opacity:1"
- d="m 264.62704,45.67985 56.31152,-101.021534 0.2677,36.946034 118.51291,-0.267671 c 21.1765,-2.244605 39.74272,-10.852596 53.18801,-27.040291 C 449.99593,42.074998 437.6363,104.18491 348.60347,104.22236 l -27.39721,0 -0.2677,41.05114 -56.31152,-99.59365 z M 128.9798,105.11479 C 65.618201,85.84639 36.055796,7.7860213 7.07577,-47.220709 c 13.282679,12.076484 38.139773,29.363022 52.577167,29.364467 27.689982,0.06456 55.380063,0.116317 83.070083,0.174562 l 83.88712,0 -0.26776,122.43949 -0.26771,0.35698 -97.09487,0 z M 2.5,-79.206629 42.995596,-161.8012 3.5060915,-183.49253 l 118.3343785,0 57.2039,103.877161 -38.79429,-23.228801 c -12.44295,26.27544 -24.88589,52.550878 -37.32884,78.826316 C 88.601045,-24.268303 74.280847,-24.518751 59.960649,-24.769199 32.037317,-31.279427 12.61125,-53.254123 2.5,-79.206629 z m 395.45406,53.939396 -52.29561,-96.380927 105.66215,-63.98618 51.13531,102.449252 c 1.54832,24.517706 -38.03694,58.635841 -62.6066,58.370427 l -41.89525,-0.452572 z M 88.64259,-250.78088 l 53.98405,-80.90589 c 52.35957,-19.50079 82.68955,22.59846 101.8318,49.13587 l -50.86768,97.63029 -104.94817,-65.86027 z m 204.54178,43.54987 c -10.85783,-25.59753 -25.36515,-54.87764 -43.50654,-80.336 -16.24176,-22.7925 -35.86597,-42.67852 -50.7326,-51.5631 l 136.53974,-0.26767 c 24.52088,2.20137 36.43539,16.49668 49.43976,36.05358 l 19.63307,34.53651 30.34224,-19.3654 -57.11457,101.73554 -123.15347,0.26768 38.55237,-21.06114 z"
- inkscape:connector-curvature="0" />
- </g>
- <path
- style="fill:none;stroke:#555753;display:inline"
- d="m 219.92452,876.86347 1.33532,1.5307 -5.05101,4.4063 4.00584,4.592 5.05101,-4.4063 1.29423,1.4837 1.19091,-7.757 z"
- id="rect4425"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccccccc"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <rect
- style="fill:#555753;fill-opacity:1;stroke:none;display:inline"
- id="rect4564-9"
- width="10.935946"
- height="7.925663"
- x="71.833412"
- y="900.66992"
- rx="1.9019035"
- ry="2.3056474"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <rect
- style="fill:none;stroke:#555753;stroke-width:0.69802254;display:inline"
- id="rect4566-9"
- width="7.7661061"
- height="7.5413885"
- x="73.447395"
- y="896.3468"
- rx="1.9019035"
- ry="2.3056474"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <rect
- ry="2.3056474"
- rx="1.9019035"
- y="900.66992"
- x="92.208412"
- height="7.925663"
- width="10.935946"
- id="rect4506"
- style="fill:#555753;fill-opacity:1;stroke:none;display:inline"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <path
- style="fill:none;stroke:#555753;stroke-width:0.69802254;display:inline"
- d="m 108.78126,899.75007 0,-1.0938 c 0,-1.2773 -0.8526,-2.3124 -1.90625,-2.3124 l -3.96875,0 c -1.05366,0 -1.90625,1.0351 -1.90625,2.3124 l 0,2.9376"
- id="rect4508"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssssc"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <rect
- style="fill:#555753;stroke:none;display:inline"
- id="rect4514"
- width="19.512196"
- height="19.512196"
- x="150.24391"
- y="892.60608"
- rx="2.9268293"
- ry="2.9268293"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <rect
- ry="2.9268293"
- rx="2.9268293"
- y="892.60608"
- x="170.24391"
- height="19.512196"
- width="19.512196"
- id="rect4516"
- style="fill:#555753;stroke:none;display:inline"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <rect
- ry="2.3056474"
- rx="1.9019035"
- y="900.66992"
- x="151.83342"
- height="7.925663"
- width="10.935946"
- id="rect4518"
- style="fill:#eeeeec;fill-opacity:1;stroke:none;display:inline"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <rect
- ry="2.3056474"
- rx="1.9019035"
- y="896.3468"
- x="153.4474"
- height="7.5413885"
- width="7.7661061"
- id="rect4520"
- style="fill:none;stroke:#eeeeec;stroke-width:0.69802254;display:inline"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <rect
- style="fill:#eeeeec;fill-opacity:1;stroke:none;display:inline"
- id="rect4522"
- width="10.935946"
- height="7.925663"
- x="172.20842"
- y="900.66992"
- rx="1.9019035"
- ry="2.3056474"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <path
- sodipodi:nodetypes="cssssc"
- inkscape:connector-curvature="0"
- id="path4524"
- d="m 188.78127,899.75007 0,-1.0938 c 0,-1.2773 -0.85259,-2.3124 -1.90625,-2.3124 l -3.96875,0 c -1.05365,0 -1.90625,1.0351 -1.90625,2.3124 l 0,2.9376"
- style="fill:none;stroke:#eeeeec;stroke-width:0.69802254;display:inline"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <path
- style="fill:none;stroke:#555753;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
- d="m 61.2575,895.73577 c -0.85405,0.9453 -1.14575,2.2161 -0.88721,3.3884 l -8.17918,8.1791 c -0.14244,0.1425 -0.12201,0.3935 0.0507,0.5661 l 2.21807,2.2181 c 0.17268,0.1727 0.42791,0.1974 0.57035,0.055 l 8.13693,-8.1369 c 1.26093,0.3161 2.65155,-0.016 3.63762,-1.0013 0.66189,-0.6619 1.02334,-1.5095 1.09849,-2.3744 l -2.11666,2.1167 -3.2405,-0.8746 -0.87454,-3.2405 2.14201,-2.1419 c -0.88104,0.066 -1.74292,0.4331 -2.41663,1.1068 -0.0467,0.047 -0.0968,0.09 -0.13942,0.1395 z"
- id="path4529"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccsssscscccccsc"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <path
- style="fill:none;stroke:#555753;stroke-width:0.80000001;stroke-miterlimit:4;stroke-dasharray:none;display:inline"
- d="m 201.14016,895.80807 -8.25003,8.25 -0.94202,3.5156 2.58822,2.5882 3.10935,-0.8332 10.50754,-10.5075 -2e-5,-2.3881 -1.69404,-1.694 -1.94401,0 -9.97205,9.972 3e-5,1.972 0.61101,0.611 1.73597,0 9.36804,-9.368"
- id="path3395"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccccccccccccc"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <rect
- style="fill:#555753;stroke:none;display:inline"
- id="rect3397"
- width="19.512196"
- height="19.512196"
- x="210.24391"
- y="892.60608"
- rx="2.9268293"
- ry="2.9268293"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <path
- style="fill:none;stroke:#eeeeec;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
- d="m 214.67284,895.14537 c 7.11789,-1.5098 3.04383,2.9586 9.72807,1.6024 0.48786,-0.099 0.94287,0.3982 0.94287,0.8928 0,0 0,6.7482 0,6.9956 0,0.2473 -0.31338,0.7228 -0.94287,0.8928 -6.70194,1.3208 -2.58353,-3.1887 -9.72807,-1.6024 -0.39933,0.17 -0.94286,-0.3982 -0.94286,-0.8928 l 0,-6.9955 c 0,-0.4947 0.45501,-0.776 0.94286,-0.8929 z"
- id="rect3409"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccscccssc"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <rect
- style="fill:none;stroke:#eeeeec;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
- id="rect4190"
- width="1.125"
- height="16.3125"
- x="212.62502"
- y="894.73718"
- ry="0.40000001"
- rx="0.40000001"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <path
- inkscape:export-ydpi="90"
- inkscape:export-xdpi="90"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- transform="translate(-224.73743,701.76263)"
- d="m 292.21188,220.62782 a 7.4246211,7.4246211 0 1 1 -14.84924,0 7.4246211,7.4246211 0 1 1 14.84924,0 z"
- sodipodi:ry="7.4246211"
- sodipodi:rx="7.4246211"
- sodipodi:cy="220.62782"
- sodipodi:cx="284.78726"
- id="path4020"
- style="fill:none;stroke:#555753;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
- sodipodi:type="arc" />
- <path
- sodipodi:type="arc"
- style="fill:#555753;fill-opacity:1;stroke:#555753;stroke-width:1.62554049;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
- id="path4022"
- sodipodi:cx="284.78726"
- sodipodi:cy="220.62782"
- sodipodi:rx="7.4246211"
- sodipodi:ry="7.4246211"
- d="m 292.21188,220.62782 a 7.4246211,7.4246211 0 1 1 -14.84924,0 7.4246211,7.4246211 0 1 1 14.84924,0 z"
- transform="matrix(0.61517998,0,0,0.61517998,-115.14559,786.66463)"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <path
- inkscape:export-ydpi="90"
- inkscape:export-xdpi="90"
- inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
- sodipodi:type="arc"
- style="fill:none;stroke:#d3d7cf;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
- id="path4024"
- sodipodi:cx="284.78726"
- sodipodi:cy="220.62782"
- sodipodi:rx="7.4246211"
- sodipodi:ry="7.4246211"
- d="m 292.21188,220.62782 a 7.4246211,7.4246211 0 1 1 -14.84924,0 7.4246211,7.4246211 0 1 1 14.84924,0 z"
- transform="translate(-204.73743,701.76269)" />
- <g
- inkscape:label="#g3852"
- style="stroke:#888a85;display:inline;filter:url(#filter4064)"
- transform="matrix(0.43114968,0,0,0.43114968,-201.41936,955.6356)"
- id="g3139">
- <rect
- ry="6"
- rx="6"
- y="18.790752"
- x="470.35715"
- height="44.285713"
- width="44.285713"
- id="rect3141"
- style="fill:none;stroke:#888a85;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- </g>
- <g
- id="g3145"
- transform="matrix(0.43114968,0,0,0.43114968,-179.41936,955.6356)"
- style="stroke:#d3d7cf;display:inline;filter:url(#filter4064)"
- inkscape:label="#g3852">
- <rect
- style="fill:none;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect3147"
- width="44.285713"
- height="44.285713"
- x="470.35715"
- y="18.790752"
- rx="6"
- ry="6" />
- </g>
- <text
- xml:space="preserve"
- style="font-size:17.09149551px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#888a85;fill-opacity:1;stroke:none;font-family:FreeSans;-inkscape-font-specification:FreeSans Bold"
- x="5.6234956"
- y="979.64215"
- id="text3151"
- sodipodi:linespacing="100%"><tspan
- sodipodi:role="line"
- id="tspan3153"
- x="5.6234956"
- y="979.64215">?</tspan></text>
- <text
- sodipodi:linespacing="100%"
- id="text3155"
- y="979.64215"
- x="27.623495"
- style="font-size:17.09149551000000145px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#d3d7cf;fill-opacity:1;stroke:none;font-family:FreeSans;-inkscape-font-specification:FreeSans Bold"
- xml:space="preserve"><tspan
- y="979.64215"
- x="27.623495"
- id="tspan3157"
- sodipodi:role="line">?</tspan></text>
- </g>
-</svg>
diff --git a/view/theme/darkbubble/jot-header.tpl b/view/theme/darkbubble/jot-header.tpl
deleted file mode 100644
index 0093bf82a..000000000
--- a/view/theme/darkbubble/jot-header.tpl
+++ /dev/null
@@ -1,251 +0,0 @@
-
-<script language="javascript" type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
-<script language="javascript" type="text/javascript">
-
-var editor=false;
-var textlen = 0;
-
-function initEditor(cb) {
- if (editor==false) {
- $("#profile-jot-text-loading").show();
- tinyMCE.init({
- theme : "advanced",
- mode : "specific_textareas",
- editor_selector: /(profile-jot-text|prvmail-text)/,
- plugins : "bbcode,paste,fullscreen,autoresize",
- theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code,fullscreen",
- theme_advanced_buttons2 : "",
- theme_advanced_buttons3 : "",
- theme_advanced_toolbar_location : "top",
- theme_advanced_toolbar_align : "center",
- theme_advanced_blockformats : "blockquote,code",
- //theme_advanced_resizing : true,
- //theme_advanced_statusbar_location : "bottom",
- paste_text_sticky : true,
- entity_encoding : "raw",
- add_unload_trigger : false,
- remove_linebreaks : false,
- force_p_newlines : false,
- force_br_newlines : true,
- forced_root_block : '',
- convert_urls: false,
- content_css: "$baseurl/view/custom_tinymce.css",
- theme_advanced_path : false,
- setup : function(ed) {
- //Character count
- ed.onKeyUp.add(function(ed, e) {
- var txt = tinyMCE.activeEditor.getContent();
- textlen = txt.length;
- if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
- $('#profile-jot-desc').html(ispublic);
- }
- else {
- $('#profile-jot-desc').html(' ');
- }
-
- if(textlen <= 140) {
- $('#character-counter').removeClass('red');
- $('#character-counter').removeClass('orange');
- $('#character-counter').addClass('grey');
- }
- if((textlen > 140) && (textlen <= 420)) {
- $('#character-counter').removeClass('grey');
- $('#character-counter').removeClass('red');
- $('#character-counter').addClass('orange');
- }
- if(textlen > 420) {
- $('#character-counter').removeClass('grey');
- $('#character-counter').removeClass('orange');
- $('#character-counter').addClass('red');
- }
- $('#character-counter').text(textlen);
- });
- ed.onInit.add(function(ed) {
- ed.pasteAsPlainText = true;
- $("#profile-jot-text-loading").hide();
- $("#profile-jot-submit-wrapper").show();
- $("#profile-upload-wrapper").show();
- $("#profile-attach-wrapper").show();
- $("#profile-link-wrapper").show();
- $("#profile-youtube-wrapper").show();
- $("#profile-video-wrapper").show();
- $("#profile-audio-wrapper").show();
- $("#profile-location-wrapper").show();
- $("#profile-nolocation-wrapper").show();
- $("#profile-title-wrapper").show();
- $("#profile-jot-plugin-wrapper").show();
- $("#character-counter").show();
- if (typeof cb!="undefined") cb();
- });
- }
- });
- editor = true;
- // setup acl popup
- $("a#jot-perms-icon").fancybox({
- 'transitionIn' : 'none',
- 'transitionOut' : 'none'
- });
- } else {
- if (typeof cb!="undefined") cb();
- }
-} // initEditor
-</script>
-<script type="text/javascript" src="js/ajaxupload.js" ></script>
-<script>
- var ispublic = '$ispublic';
- $(document).ready(function() {
- /* enable tinymce on focus */
- $("#profile-jot-text").focus(function(){
- if (editor) return;
- $(this).val("");
- initEditor();
- });
- var uploader = new window.AjaxUpload(
- 'wall-image-upload',
- { action: 'wall_upload/$nickname',
- name: 'userfile',
- onSubmit: function(file,ext) { $('#profile-rotator').show(); },
- onComplete: function(file,response) {
- tinyMCE.execCommand('mceInsertRawHTML',false,response);
- $('#profile-rotator').hide();
- }
- }
- );
- var file_uploader = new window.AjaxUpload(
- 'wall-file-upload',
- { action: 'wall_attach/$nickname',
- name: 'userfile',
- onSubmit: function(file,ext) { $('#profile-rotator').show(); },
- onComplete: function(file,response) {
- tinyMCE.execCommand('mceInsertRawHTML',false,response);
- $('#profile-rotator').hide();
- }
- }
- );
- $('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
- var selstr;
- $('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
- selstr = $(this).text();
- $('#jot-perms-icon').removeClass('unlock').addClass('lock');
- $('#jot-public').hide();
- $('.profile-jot-net input').attr('disabled', 'disabled');
- });
- if(selstr == null) {
- $('#jot-perms-icon').removeClass('lock').addClass('unlock');
- $('#jot-public').show();
- $('.profile-jot-net input').attr('disabled', false);
- }
-
- }).trigger('change');
-
- });
-
- function deleteCheckedItems() {
- var checkedstr = '';
-
- $('.item-select').each( function() {
- if($(this).is(':checked')) {
- if(checkedstr.length != 0) {
- checkedstr = checkedstr + ',' + $(this).val();
- }
- else {
- checkedstr = $(this).val();
- }
- }
- });
- $.post('item', { dropitems: checkedstr }, function(data) {
- window.location.reload();
- });
- }
-
- function jotGetLink() {
- reply = prompt("$linkurl");
- if(reply && reply.length) {
- reply = bin2hex(reply);
- $('#profile-rotator').show();
- $.get('parse_url?url=' + reply, function(data) {
- tinyMCE.execCommand('mceInsertRawHTML',false,data);
- $('#profile-rotator').hide();
- });
- }
- }
-
- function jotGetVideo() {
- reply = prompt("$utubeurl");
- if(reply && reply.length) {
- tinyMCE.execCommand('mceInsertRawHTML',false,'[youtube]' + reply + '[/youtube]');
- }
- }
-
- function jotVideoURL() {
- reply = prompt("$vidurl");
- if(reply && reply.length) {
- tinyMCE.execCommand('mceInsertRawHTML',false,'[video]' + reply + '[/video]');
- }
- }
-
- function jotAudioURL() {
- reply = prompt("$audurl");
- if(reply && reply.length) {
- tinyMCE.execCommand('mceInsertRawHTML',false,'[audio]' + reply + '[/audio]');
- }
- }
-
-
- function jotGetLocation() {
- reply = prompt("$whereareu", $('#jot-location').val());
- if(reply && reply.length) {
- $('#jot-location').val(reply);
- }
- }
-
- function jotTitle() {
- reply = prompt("$title", $('#jot-title').val());
- if(reply && reply.length) {
- $('#jot-title').val(reply);
- }
- }
-
- function jotShare(id) {
- $('#like-rotator-' + id).show();
- $.get('share/' + id, function(data) {
- if (!editor) $("#profile-jot-text").val("");
- initEditor(function(){
- tinyMCE.execCommand('mceInsertRawHTML',false,data);
- $('#like-rotator-' + id).hide();
- $(window).scrollTop(0);
- });
- });
- }
-
- function linkdropper(event) {
- var linkFound = event.dataTransfer.types.contains("text/uri-list");
- if(linkFound)
- event.preventDefault();
- }
-
- function linkdrop(event) {
- var reply = event.dataTransfer.getData("text/uri-list");
- event.target.textContent = reply;
- event.preventDefault();
- if(reply && reply.length) {
- $('#profile-rotator').show();
- $.get('parse_url?url=' + reply, function(data) {
- if (!editor) $("#profile-jot-text").val("");
- initEditor(function(){
- tinyMCE.execCommand('mceInsertRawHTML',false,data);
- $('#profile-rotator').hide();
- });
- });
- }
- }
-
- function jotClearLocation() {
- $('#jot-coord').val('');
- $('#profile-nolocation-wrapper').hide();
- }
-
- $geotag
-
-</script>
-
diff --git a/view/theme/darkbubble/jot.tpl b/view/theme/darkbubble/jot.tpl
deleted file mode 100644
index d60e8adc2..000000000
--- a/view/theme/darkbubble/jot.tpl
+++ /dev/null
@@ -1,75 +0,0 @@
-
-<div id="profile-jot-wrapper" >
- <div id="profile-jot-banner-wrapper">
- <div id="profile-jot-desc" > </div>
- <div id="character-counter" class="grey" style="display: none;">0</div>
- <div id="profile-rotator-wrapper" style="display: $visitor;" >
- <img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display:none;" />
- </div>
- </div>
-
- <form id="profile-jot-form" action="$action" method="post" >
- <input type="hidden" name="type" value="wall" />
- <input type="hidden" name="profile_uid" value="$profile_uid" />
- <input type="hidden" name="return" value="$return_path" />
- <input type="hidden" name="location" id="jot-location" value="$defloc" />
- <input type="hidden" name="coord" id="jot-coord" value="" />
- <input type="hidden" name="title" id="jot-title" value="" />
- <input type="hidden" name="post_id" value="$post_id" />
-
- <img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
- <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
- {{ if $content }}<script>initEditor();</script>{{ endif }}
-
- <div id="profile-upload-wrapper" class="jot-tool" style="display: none;" >
- <div id="wall-image-upload-div" ><a onclick="return false;" id="wall-image-upload" class="icon border camera" title="$upload"></a></div>
- </div>
- <div id="profile-attach-wrapper" class="jot-tool" style="display: none;" >
- <div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon border attach" title="$attach"></a></div>
- </div>
- <div id="profile-link-wrapper" class="jot-tool" style="display: none;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
- <a id="profile-link" class="icon border link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
- </div>
- <div id="profile-youtube-wrapper" class="jot-tool" style="display: none;" >
- <a id="profile-youtube" class="icon border youtube" title="$youtube" onclick="jotGetVideo(); return false;"></a>
- </div>
- <div id="profile-video-wrapper" class="jot-tool" style="display: none;" >
- <a id="profile-video" class="icon border video" title="$video" onclick="jotVideoURL(); return false;"></a>
- </div>
- <div id="profile-audio-wrapper" class="jot-tool" style="display: none;" >
- <a id="profile-audio" class="icon border audio" title="$audio" onclick="jotAudioURL(); return false;"></a>
- </div>
- <div id="profile-location-wrapper" class="jot-tool" style="display: none;" >
- <a id="profile-location" class="icon border globe" title="$setloc" onclick="jotGetLocation(); return false;"></a>
- </div>
- <div id="profile-nolocation-wrapper" class="jot-tool" style="display: none;" >
- <a id="profile-nolocation" class="icon border noglobe" title="$noloc" onclick="jotClearLocation(); return false;"></a>
- </div>
- <div id="profile-title-wrapper" class="jot-tool" style="display: none;" >
- <a id="profile-title" class="icon border article" title="$title" onclick="jotTitle(); return false;"></a>
- </div>
-
- <div id="profile-jot-submit-wrapper" style="display:none;padding-left: 400px;">
- <input type="submit" id="profile-jot-submit" name="submit" value="$share" />
- <div id="profile-jot-perms" class="profile-jot-perms" style="display: $visitor;" >
- <a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate sharePerms" title="$permset"></a>$bang</div>
- </div>
-
- <div id="profile-jot-plugin-wrapper" style="display: none;">
- $jotplugins
- </div>
- <div id="profile-jot-tools-end"></div>
-
- <div style="display: none;">
- <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
- $acl
- <hr style="clear:both"/>
- <div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
- <div id="profile-jot-email-end"></div>
- $jotnets
- </div>
- </div>
-
-<div id="profile-jot-end"></div>
-</form>
-</div>
diff --git a/view/theme/darkbubble/login-bg.gif b/view/theme/darkbubble/login-bg.gif
deleted file mode 100644
index cde836c893f64bcfec04b9c817e3371ff122fe19..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 237
zcmV<J022R4Nk%w1VGsZi0K@<Q?d|R1;o{25%KZHN{%H*VYY@`X(*O4G|Ml+G)z#6&
zyzubw&CSjE`T5=5-Tq?(-qOnX@94+N&Bw>b{bmUKcqz}))c5uC(7v?)v4a2P)ZNa-
z@$&T2)z|&~{r~^}A^8LV00000EC2ui01yBW000GQ;3tk`X`bk)Wk@<6#nZYULKH{p
zEx|?+kif!I0vIL|#ZMubBmjWH2OtmxIFVa~6JQ7!1CK!f5W#StOTv&C3=E8h2vI1s
n+#cd5;2fT3B_0kF0v!+!GARoV78n&7dMN`JIW(4+BOw4gP{MS*
diff --git a/view/theme/darkbubble/login.tpl b/view/theme/darkbubble/login.tpl
deleted file mode 100644
index 2c879d69a..000000000
--- a/view/theme/darkbubble/login.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-
-<form action="" method="post" >
- <input type="hidden" name="auth-params" value="login" />
- <div id="login-name-wrapper">
- <label for="login-name" id="label-login-name">$namelabel</label>
- <input type="text" maxlength="60" name="openid_url" class="$classname" id="login-name" value="" />
- </div>
- <div id="login-name-end" ></div>
- <div id="login-password-wrapper">
- <label for="login-password" id="label-login-password">$passlabel</label>
- <input type="password" maxlength="60" name="password" id="login-password" value="" />
- </div>
- <div id="login-password-end"></div>
- <div id="login-submit-wrapper" >
- <input type="submit" name="submit" id="login-submit-button" value="$login" />
- <a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>
- </div>
- <div id="login-submit-end"></div>
- <div id="login-extra-links">
- <div id="login-extra-filler"> </div>
- $register_html
- </div>
- <div id="login-extra-end"></div>
-</form>
-
diff --git a/view/theme/darkbubble/lrarrow.gif b/view/theme/darkbubble/lrarrow.gif
deleted file mode 100644
index fa26769446d0c934b42ede073b15e7b792c519a5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 236
zcmZ?wbhEHbRA5kGSj4~}At9lzu5M~->f+)O92}en1ByRc7#SGY8FUzc0Hl_Id1J+{
zJO2!r%ogV^SXEQa=X0R+0=r)0iixMy=XibSd-HJLLWA|wtsiI{^mqNlTimR;mSuu!
z`^pstJ13hgZ<(LBS~_Lwp0lQ&KkUxm%b#lGH~szxi>VrAyB=5kn3H_w_tS*j`sV!V
zrk3Wm_Ku1+v+kbMzS4+^StYvd85xrj_-mtLVyAmc<OT$m%@cETFbvMNO<u?Dw^1&9
ii_v!1aD%OTbkr1Qn9kgP^w`XtQ>r3oF9>ilSOWk7D_}7I
diff --git a/view/theme/darkbubble/mail_head.tpl b/view/theme/darkbubble/mail_head.tpl
deleted file mode 100644
index 89615cbd0..000000000
--- a/view/theme/darkbubble/mail_head.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<h3>$messages</h3>
-
-<ul class="tabs-wrapper">
-<li><a href="message" class="tabs">$inbox</a></li>
-<li><a href="message/sent" class="tabs">$outbox</a></li>
-<li><a href="message/new" class="tabs">$new</a></li>
-</ul>
diff --git a/view/theme/darkbubble/menu-user-pin.png b/view/theme/darkbubble/menu-user-pin.png
deleted file mode 100644
index 6becfbb663c2726e085edfb5d6bfb42e06a35398..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 276
zcmV+v0qg#WP)<h;3K|Lk000e1NJLTq000aC000OG1^@s6&Ey{O0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUywn;=mRCwB4kV_82FbqT+w-uii7huIL
z;3#Q(y7orw*>M68Y6%I?#i>L`8rhD=9xJZvx)?%mpipRxF(yrmAChtI3C$~cOeu{@
z>KF9~j_{quhI@tJEFw4Jfrkl}7R5x-+*057M;V6UL2<!OH|<~rw{T+vj)fDtdM-F)
z@$=s2Q<6C-YsA@Yv7JGq1kMI(%~i~zMf2y7(KO9d&*J8C-IMi0+qNhDJ{AQw@7MjW
a00RIAA5ln%G~8+c0000<MNUMnLSTY<m~U_Z
diff --git a/view/theme/darkbubble/nav.tpl b/view/theme/darkbubble/nav.tpl
deleted file mode 100644
index a2171d431..000000000
--- a/view/theme/darkbubble/nav.tpl
+++ /dev/null
@@ -1,55 +0,0 @@
-<nav>
- $langselector
-
- <span id="banner">$banner</span>
-
- <div id="notifications">
- {{ if $nav.network }}<a id="net-update" class="nav-ajax-update" href="$nav.network.0" title="$nav.network.1"></a>{{ endif }}
- {{ if $nav.home }}<a id="home-update" class="nav-ajax-update" href="$nav.home.0" title="$nav.home.1"></a>{{ endif }}
- {{ if $nav.notifications }}<a id="notify-update" class="nav-ajax-update" href="$nav.notifications.0" title="$nav.notifications.1"></a>{{ endif }}
- {{ if $nav.messages }}<a id="mail-update" class="nav-ajax-update" href="$nav.messages.0" title="$nav.messages.1"></a>{{ endif }}
- </div>
-
- <div id="user-menu" >
- <a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="$nav.home.0">$sitelocation</a>
-
- <ul id="user-menu-popup"
- onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')"
- onmouseout="tmenu=setTimeout('closeMenu(\'user-menu-popup\');',200)">
-
- {{ if $nav.register }}<li><a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.1">$nav.register.1</a></li>{{ endif }}
-
- {{ if $nav.home }}<li><a id="nav-home-link" class="nav-commlink $nav.home.2" href="$nav.home.0">$nav.home.1</a></li>{{ endif }}
-
- {{ if $nav.network }}<li><a id="nav-network-link" class="nav-commlink $nav.network.2" href="$nav.network.0">$nav.network.1</a></li>{{ endif }}
-
- {{ if $nav.community }}
- <li><a id="nav-community-link" class="nav-commlink $nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a></li>
- {{ endif }}
-
- <li><a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.1">$nav.search.1</a></li>
- <li><a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.1">$nav.directory.1</a></li>
- {{ if $nav.apps }}<li><a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.1">$nav.apps.1</a></li>{{ endif }}
-
- {{ if $nav.notifications }}<li><a id="nav-notify-link" class="nav-commlink nav-sep $nav.notifications.2" href="$nav.notifications.0">$nav.notifications.1</a></li>{{ endif }}
- {{ if $nav.messages }}<li><a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0">$nav.messages.1</a></li>{{ endif }}
- {{ if $nav.contacts }}<li><a id="nav-contacts-link" class="nav-commlink $nav.contacts.2" href="$nav.contacts.0">$nav.contacts.1</a></li>{{ endif }}
-
- {{ if $nav.profiles }}<li><a id="nav-profiles-link" class="nav-commlink nav-sep $nav.profiles.2" href="$nav.profiles.0">$nav.profiles.1</a></li>{{ endif }}
- {{ if $nav.settings }}<li><a id="nav-settings-link" class="nav-commlink $nav.settings.2" href="$nav.settings.0">$nav.settings.1</a></li>{{ endif }}
-
- {{ if $nav.manage }}<li><a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0">$nav.manage.1</a></li>{{ endif }}
-
- {{ if $nav.admin }}<li><a id="nav-admin-link" class="nav-commlink $nav.admin.2" href="$nav.admin.0">$nav.admin.1</a></li>{{ endif }}
-
- <li><a id="nav-help-link" class="nav-link $nav.help.2" href="$nav.help.0" title="$nav.help.1">$nav.help.1</a></li>
-
- {{ if $nav.login }}<li><a id="nav-login-link" class="nav-link $nav.login.2" href="$nav.login.0" title="$nav.login.1">$nav.login.1</a></li> {{ endif }}
- {{ if $nav.logout }}<li><a id="nav-logout-link" class="nav-commlink nav-sep $nav.logout.2" href="$nav.logout.0">$nav.logout.1</a></li> {{ endif }}
- </ul>
- </div>
-
-
-
-</nav>
-
diff --git a/view/theme/darkbubble/next.png b/view/theme/darkbubble/next.png
deleted file mode 100644
index 353e2e72a6513fac3f3775b347354a4fbbb7c622..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 891
zcmV->1BCpEP)<h;3K|Lk000e1NJLTq000*N001Wl1^@s6<WSQM00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10{BTpK~zYIrPIG}8)Y2F@%Qs2xc-si8n@yPU|?WiWFk${f*_?X
zkoFoZandar`5#zVSi0Wi4Uuc=#Ex@;q|$X_j})j719Re9h4@E~v$-z=O%%1Z@3H$#
z);*tleZKd|j}j5e<?_{kCAu#{8Bxy_@?d>^<1w$f)Y{tG8_)l4Jq6x*Y3~WKzU_Hl
zXIfnUb<$cJ0s}0dW8b#z+|;-TUys@UFpPRr7ibZFNyyAkTcFiUyl0S`5BuGnNelFQ
z@4mmM;9+7?)b%jxHA<yY))ZGF!s6oM?6tRxKLRTT?>q^6(XD#D-b)H<fFKA4&7;;T
zP&L38(%F>J7wEGeK@bcI`Qj>~HVq0E)0s=#mSts(Z~)hJ`-LlS-3PW3c_mBecx-`w
z`GM=Y{X)KI0ky;exG}Ea75qZMJw(+F3+lrPl!%Oc%d)H#I^F<oCsv5s&t>OIl}aTX
zJNeo2JTD^FcY#JCuH>WcX}jh)PTFYlvt?OU3MEyP+)50?UM_R_PNh-_jc|bF<>gCr
zZ)U5&vO)ak=27c2WBfwFCh%!uSjnA<@biMpxh<4@k`S#;j02R*<*S1@`V*KN6AQ=w
zTZS#$wsV6xswTi7YImZ^ZQIU;QO^hFld?)=$$0WfU_@=KuRjWm@KULi4g1|4BN!ev
zkDq-7Flz#*v#A|~>jrSOdDL1Bf?xm%*Z&3F02UHiQJaN)@f?OR*Wa?N3`!a(Su&V-
ztB@~RuIu(MJ{)>1mStto@is6u3`36P1zZPi7{Ikr@GH3EIBAsBfSZY|sCpq^yf+Gl
z3uo>)PP%*At^pq#OuS93?|PmWjSJ~1;D!l&j(1Pn-URT92@EiE`1|1p3cgQFirPWU
zVSrgJd}EOFJMHd@@B79u{C_N05;D7;liruU@BcFi44?(|!^mAxKXp!eUrYl7=u9fJ
z1so39+wHWwpHB+|%p4pX^nd&HseAma`G-<c1XWeSx6R|$cl-PMBQJ=_`VVK<WtUF)
Rcnkml002ovPDHLkV1o5coE!iE
diff --git a/view/theme/darkbubble/notifications.png b/view/theme/darkbubble/notifications.png
deleted file mode 100644
index 803257fec0ae504c556d4076ff3150fa77df7954..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 6225
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
diff --git a/view/theme/darkbubble/photo_view.tpl b/view/theme/darkbubble/photo_view.tpl
deleted file mode 100644
index 4582751c6..000000000
--- a/view/theme/darkbubble/photo_view.tpl
+++ /dev/null
@@ -1,40 +0,0 @@
-<div id="live-display"></div>
-<h3><a href="$album.0">$album.1</a></h3>
-
-<div id="photo-edit-link-wrap">
-{{ if $tools }}
-<a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a>
--
-<a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a>
-{{ endif }}
-{{ if $lock }} - <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo$id');" /> {{ endif }}
-</div>
-
-<div id="photo-photo">
- {{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
- <a href="$photo.href" title="$photo.title"><img src="$photo.src" /></a>
- {{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
-</div>
-
-<div id="photo-photo-end"></div>
-<div id="photo-caption" >$desc</div>
-{{ if $tags }}
-<div id="in-this-photo-text">$tags.0</div>
-<div id="in-this-photo">$tags.1</div>
-{{ endif }}
-{{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }}
-
-{{ if $edit }}$edit{{ endif }}
-
-{{ if $likebuttons }}
-<div id="photo-like-div">
- $likebuttons
- $like
- $dislike
-</div>
-{{ endif }}
-
-$comments
-
-$paginate
-
diff --git a/view/theme/darkbubble/photography.png b/view/theme/darkbubble/photography.png
deleted file mode 100644
index 7ec919f2b3cf1d4d782a0b3009f8f7654cceca94..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 766
zcmV<a0s;MrP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!ph-kQRCwByQ%P$SK@@)7T}!VM2F4gB
zD#R#p%fvv;B_eo9Tyls<jqy*22mJ@)K}JOoJSlS(1;fN3L`4FkG34SwFyO`D0%~UK
zt-5`$X27dH_?W4x?|pA=V2pv30`fdJ5YEz4ePpb1`01YA<(x2B9>{n0m-7A{r3b^q
zdtKs^k7=4<7zP-D@4<GXX#zlS`&M<jR(p6Sj>3M%EFeo$1yK}37>1CfYCTozT(i;q
zoTRCKGZrq+pWoP6zXo}B#Bm*PYzab86cor&K>ZbHcS7iBbRbF88opgICMS-zIA^Yl
z&UVjPaIRA%Qz$^uNF<6PXtz7iY_=$CXf#?sneTgUp%8%U*uXdgW?5KUw>~oL3uIXa
z%IykK22x5L0MA8MEcQVk3eY8)CS%krQ~FFqAt<BnJC$hRU5aAORvVb-`QUmUaK^E&
z1mXmn6{p$E>DkvaGiN@bKw)+D)q&-u#Y2{584P);%Atj&=w4A|DJUgF*GVakk5AMt
z%wM_>T^l|-JNFI1Fkh}LAEb=PM>}J=rXz3<Fhx$a=a_yJLZvcx6CL05@B;C6>iCHd
z#33&E5L}J|(h+)*IEe@oEDmt*?v0aE$3`LoI)6uOtvs&}5{J0tV>>9|Tfk^^woRKz
zOXKQ>W-7W~-c?SAhW0(FFFqRhy7gs#bMxb*=LJB+NtFcGwZZdna(eE)v0x3lXdwj)
z!%lU3`&ac@{V@bV0epnxIC@GViFF_7%xozW49`uJCNVz<02fP-iHze?32Ey$;$)br
zfh$V?rL=#W)2HU%Tb3CoG3uxcEL<YVQQdYl1Q+^_-iVXLk^aT8H%3RtFVh!z6$6!M
wXW-u~L;OIzL#&a&ep;~q6zKFs8h->B0FuEU_j}EX-v9sr07*qoM6N<$g2<sz)&Kwi
diff --git a/view/theme/darkbubble/premium.png b/view/theme/darkbubble/premium.png
deleted file mode 100644
index 1ad601c0f1e3db18b9a8f4add6865bf6ad78611c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 2317
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
diff --git a/view/theme/darkbubble/prev.png b/view/theme/darkbubble/prev.png
deleted file mode 100644
index 0ae6022af5701934cfa5e3e7391fcab8827398c0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 853
zcmV-b1FHOqP)<h;3K|Lk000e1NJLTq000*N001Wl1^@s6<WSQM00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10@6uDK~zYIwU^6M6JZdAPfs$F5N={h*;_t>Rchfa8%+jGL}bvC
z!sTpv4;QRc?x=t;3715SXsPjjc>vkC(XGl=2q7WUE(lZtA=4q!%lS`zr>kfB?;c`i
zG!mw1s!OX&eG2UB4C-R$agW+G5{t#ws1dlX>z<a@=2;L2D-H;YE)>tX|2r4}82%z$
z_m7mhuIrwbHs1_@Pz~8P<%r;E2Qa|&qpr*i!_YuH4dQMmEir=Pnj40pL9wR*ID!GZ
zvaG2WqOz2Mdj#@KE}IWCGdsdd;DiwTCYR0kq*AFY0Mvw=rm2EB4&bIEmiVn#^X-8F
z;Lw_zrl~HkF2+F!3o?G^Rhzp<M@KixA6Cu01hxP~1mO2x&8P1N1Hge#u?&365lj35
zMOVnOto3Tg6`7l+sV=W9O^U$4$6DYDcpwmPFRw06fVfu#wv}KlFi?7-fk420s?$FK
z;I;t#X=}3(N+y#v!9XeV)1Cft0DX>F;?G-~g<vw7{3}QTu7!n#s~~<T(0<X}O~H6P
zE&>C90>vH{=)P)h?~Pb2wk8Gdz=4C8eP!fbwB27X7yuLko;YZ<BD>>*gM)2#!&$K(
z33TW4+qviU8YuC{GcUoE5NI#ti<|S2NTgK^XJ-EW>(4y^Q;uq;i=HM`Y_NB?lp1Lg
zvPKeh=wAD0GMVj;cK=;4%?RLKQ0#fbFj_=#0EkATg^m*^2LQ~93|z%$wG0m2=h0}i
z(9!NUL<UTkpxEi5p`m6Ge4jzm(Ezxd%V(<^96Ccw2K``42@I~}3L8)N8#pdSWz*kz
zNbgMlZqf7y0L!xSu$4Oi<^=F-UY|A>4u^e!AoJa*YcXPa4W`hs?TQR~Q1=R5w&m)z
zbOatd&i(vn-TOHJq|@oG^|fp-nC1`D5NNXTf1>IoT2Wn|GY!FaV_={!z)*%ke3qFl
fcGGxbEb;vxK8sTe6HUu~00000NkvXXu0mjf@o{<!
diff --git a/view/theme/darkbubble/profile_entry.tpl b/view/theme/darkbubble/profile_entry.tpl
deleted file mode 100644
index 82c04cc20..000000000
--- a/view/theme/darkbubble/profile_entry.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-
-<div class="profile-listing" >
-<div class="profile-listing-photo-wrapper" >
-<a href="profiles/$id" class="profile-listing-edit-link"><img class="profile-listing-photo" id="profile-listing-photo-$id" src="$photo" alt="$alt" /></a>
-</div>
-<div class="profile-listing-photo-end"></div>
-<div class="profile-listing-name" id="profile-listing-name-$id"><a href="profiles/$id" class="profile-listing-edit-link" >$profile_name</a></div>
-<div class='profile-visible'>$visible</div>
-</div>
-<div class="profile-listing-end"></div>
-
diff --git a/view/theme/darkbubble/profile_tabs.tpl b/view/theme/darkbubble/profile_tabs.tpl
deleted file mode 100644
index c236490b2..000000000
--- a/view/theme/darkbubble/profile_tabs.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-
-<div class="tabs-wrapper" >
- <a href="$url" id="profile-tab-status-link" class="tabs {{if $activetab==posts}}active{{endif}}" >$status</a>
- <a href="$url?tab=profile" id="profile-tab-profile-link" class="tabs {{if $activetab==profile}}active{{endif}}" >$profile</a>
- <a href="$phototab" id="profile-tab-photos-link" class="tabs {{if $activetab==photos}}active{{endif}}" >$photos</a>
- {{ if $events }}<a href="events" id="profile-tab-events-link" class="tabs {{if $activetab==events}}active{{endif}}" >$events</a>{{ endif }}
- {{ if $notes }}<a href="notes" id="profile-tab-notes-link" class="tabs {{if $activetab==notes}}active{{endif}}" >$notes</a>{{ endif }}
-<div class="tabs-end"></div>
-</div>
diff --git a/view/theme/darkbubble/profile_vcard.tpl b/view/theme/darkbubble/profile_vcard.tpl
deleted file mode 100644
index 0ee6919bc..000000000
--- a/view/theme/darkbubble/profile_vcard.tpl
+++ /dev/null
@@ -1,45 +0,0 @@
-<div class="vcard">
- <div class="fn label">$profile.name</div>
-
-
- {{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
- <div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo" alt="$profile.name"></div>
-
-
-
- {{ if $location }}
- <dl class="location"><dt class="location-label">$location</dt>
- <dd class="adr">
- {{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
- <span class="city-state-zip">
- <span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
- <span class="region">$profile.region</span>
- <span class="postal-code">$profile.postal-code</span>
- </span>
- {{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
- </dd>
- </dl>
- {{ endif }}
-
- {{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
-
- {{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
-
- {{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">♥</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
-
- {{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
-
- {{ inc diaspora_vcard.tpl }}{{ endinc }}
-
- <div id="profile-extra-links">
- <ul>
- {{ if $connect }}
- <li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
- {{ endif }}
- </ul>
- </div>
-</div>
-
-$contact_block
-
-
diff --git a/view/theme/darkbubble/search.png b/view/theme/darkbubble/search.png
deleted file mode 100644
index 51c428594b9a8d78f10e1968c1cdcdd236c9fcc0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 808
zcmV+@1K0eCP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!%1J~)RCwBCQcX|PP!zrGdwuV<Qy2(#
zU|@hm1M(s9Yt2Rzqgyv15j7DLS4PDjKq9V4*cx@gN@H}v#)TR*G0MW2pe7RIMk5;q
zhWVh(bUM?%dS5{VX>-z#ci(yEo^v6JA`M|pPToF#<nX|3XGf;c*4iAUTT=Oy(=?Mx
zIVr<1K-YE9G!6d0)MjUV{Kn|q%NKWaq6t+fLkZPt70O-(Jg<@qLOJBFyK_Mpf|PPM
z!TkKYky|&f%@_t{oU`~ORpk3sD3!{v?rwnVmWndcx^ubQN{A$Q=r#e7q5s&gcrD3f
zJ=nGlmT7_z0+_*o5DFUJxJiUTm_}8zihL&lUH<*+U_&wqmSqB}P@>|3Km<VJZ-82@
zrWBo}l#T|q0CqM(1!u%gSRhOR1m*v|LW#zqX?U{oLA7EUl!C8nu#JBNxRIk|&iO8v
zDXLIP1$w~+M|J2A*_#A4g((?hI%3yi6ca?i&{(yG23Lqq_7Lbjef_J78T*S1_ksh*
zr{g%U3}#>*iIdtUxOi#o1NIi`x)v`gBX`2&2H2K>gfLoDjr9*R&HI|_1^#0MEUE#S
znwmP4Y-q5)E`CnqSfRd6=~80e7#TH4sDadjS|zP%!9WyM&)GJA9f7}0sRS}HF(KMA
z9bs2@uUjk>%tAgV%H<NlIjHPE(Dmc|g)0k-Up{59cdA+<L{COC9Oi;O1(10)$|-E6
z3(<#YN0<l?v82*O9KC;cdU)yQcgOcJ&SC-9)>ffd%zrEv3&#|Jwza7dQHNlND#Ar1
z5GP6-?x_d&rq8(Ux+s@Qkk4fyn_U5XKTS^#_D49fWkL~TGbVKtG<5dayoCe{3A@f2
z8o6vgc{DSKgC(p)9V9#tP39S$QXON#iHUGT!x|1*HAYbLVXKvIh&SnU=Iz+k>(ARe
mI<qQ8#thlh+xPyD00RKpwlM>Izspeo0000<MNUMnLSTXz;bRm4
diff --git a/view/theme/darkbubble/search_item.tpl b/view/theme/darkbubble/search_item.tpl
deleted file mode 100644
index 7e5bfbe71..000000000
--- a/view/theme/darkbubble/search_item.tpl
+++ /dev/null
@@ -1,48 +0,0 @@
-<div class="wall-item-outside-wrapper$indent" id="wall-item-outside-wrapper-$id" >
- <div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
- <div class="wall-item-info" id="wall-item-info-$id">
- <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id"
- onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')"
- onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
- <a href="$profile_url" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">
- <img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" style="height: 80px; width: 80px;" alt="$name" /></a>
- <span onclick="openClose('wall-item-photo-menu-$id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$id">menu</span>
- <div class="wall-item-photo-menu" id="wall-item-photo-menu-$id">
- <ul>
- $item_photo_menu
- </ul>
- </div>
- </div>
- <div class="wall-item-photo-end"></div>
- <div class="wall-item-location" id="wall-item-location-$id">{{ if $location }}<span class="icon globe"></span>$location {{ endif }}</div>
- </div>
- <div class="wall-item-lock-wrapper">
- {{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div>
- {{ else }}<div class="wall-item-lock"></div>{{ endif }}
- </div>
- <div class="wall-item-tools" id="wall-item-tools-$id">
- <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
- {{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
- </div>
- {{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }}
- <div class="wall-item-delete-end"></div>
- </div>
- <div class="wall-item-content" id="wall-item-content-$id" >
- <div class="wall-item-title" id="wall-item-title-$id">$title</div>
- <div class="wall-item-title-end"></div>
- <div class="wall-item-body" id="wall-item-body-$id" >$body</div>
- </div>
- <div class="wall-item-author">
- <a href="$profile_url" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a>
- <div class="wall-item-ago" id="wall-item-ago-$id">$ago</div>
-
- </div>
-
- </div>
- <div class="wall-item-conv" id="wall-item-conv-$id" >
- {{ if $conv }}<a href='$conv.href' id='context-$id' title='$conv.title'>$conv.title</a>{{ endif }}
- </div>
- <div class="wall-item-wrapper-end"></div>
-</div>
-
-<div class="wall-item-outside-wrapper-end$indent" ></div>
diff --git a/view/theme/darkbubble/star.png b/view/theme/darkbubble/star.png
deleted file mode 100644
index a327ba14e462a494523d9d5be1195989b08b36ad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 2129
zcmZ8h3pf+%8=p&!&6Eg9TEpnJ86(!LT*9)MTji2z7<QPgZL*a_rCdTTr8AexwK#+&
zTH&<NMWe_q6;3WmTM8=`=RciJ&;L2!^Ss~pzVGvUFTeMBzBk$3%^3pH0|5X42;Rlf
zQ~qi#i^@v*otC@-0str(&>S4x@eU49cNQa*7D)vFxC)8h!x261T1zje1vR6om@o}h
zTzF<wh!@8p|5n5Sq1f-8Rl_EiyfXShe!Gz*t_C=m%D}Y6d<5bafNF!M7{{_8?OK#C
ze<Z;OGMJz+4^1@jQo8;5&hUcN#$<Agd}ZOVUyl}YmDWBlQk&>|>zLN?Ck3*;!`AQN
z#MCp|d*RNzSM}8KJ_u&j4ca3)QpRxQQgAQ-f||yRKD0T<vK2P!dxduJIY)D(FZn|O
z%2FgIuzkvvRX2uNGlCOF&!rh&3`JY+=BtW;ZT1+~#@*JJXd|<bfzAZ2F%$UpEJP}{
za*ro+JY-Lunrvnx`_!kvnrk^zc~z6E)9CzlZqH&<UT?HH&OA2(=)JcqP`Amhv4H7g
z^`_V|&R%R(tpRVElyYd7BvgK`@8&he`bKwyysIrDX%k?jWd1~tWX?US<}$hkZQ(on
zM&f=!c^cI=FLQO86E^h^Wo854SmMez_np|i)bx3tl`_uDnwh?7kk&irpM}{!G&CkI
zGrZp#<FQN0#r|Zveu(Kvro9@4AKY5;g`m9-wzs64#_{IWS@-QU&Auqncji6{RBt3}
z&->Rk%0|8wzB2Alzq>ZEt)Y0pLsFkGC9KoruRjq@DJ_l~-En(7Z#}&dtm3hhGG6OK
zramT}^yrVanmF&3`#l=mWu7B7KC;F~P58$Q`OB6_5Ghedl-u(BVdv{AjgI)k+i;bI
zUgGxm#@&SO>5#^jlzIDh-G%cg2fu=5BVvAv&8HXcV3U<GC#NU=I*9BC7T$RhF#7ej
zN)>`-m@d+p-xIrOrrDwy7udi^qLdFc_k>Irqx`1t^kfQ)YLDh*44KGm(<?OB)zvoF
z#_d<xdb23_x4i-m37}+5cgvk!k^MpAG&nY?dV6w4Wzd21q^%&v?`q^+HT(^iK}5~Y
z42jY$ufBi@S|HnIb_;WA{o?&;#EyL{$?N`n#zyE|v4|d1t%)UXn_fG#5nI?0pSg1=
zxXPAJ5vJnyR}OIy{ssznR#o<1?yBg0H92+y%q{-D^130YPjofVT>fEHnJ&I;006AH
zED8XAzAgZu5JL0z;rI{<m|zASK?z|5Q4w4^Q;r4zuw0B>rBgW+D3=}?#l~=LVLuQU
zxxVa1!k|AOoCsT(578a!z+h3KXapKz2E&1%P$-ra5{mJ3bov=Cw`^hI91atMM8?F#
zAYv>K3|1HtWn*K5G&4t<n{SsRwzGLr913@P6x;BhB>(1dq_TrqG$x0}h=MNXr35je
zIkqs^a-m=6XP<QDuR>AmpRDBkkX#BAi9(nme`S^jV&xn$4lF8#!(e$c7?C);<sm@v
zbV?Z2lS&EUVUhnu{49w@F8A?&ef>lFhgZ%T2a-qrJ3$<1{rFLJ`MRRv9qqiWH41VD
zBQ!m<+PmJ<%1~uA0pVgFqFt+A+b^{wI#C$^Ed`0YmehRB!*0dpIlQ}8JuV4mx&)R6
z`LB3Zj?+r?8!F?MJk<*x8VEJl?80l}J)D^%69&=+DRS6$veRrZQu~}ip4duf7Q!Qv
zV3}V+OD5B@a%LA|5&5$5Xr04W%5}WaK$G-0?=QWyH{AI5KG)<E7(%J%+9J~zE(Da=
zDdXz>LuTR52NWtSASpCSOM+Xu;B`>#O_UlyZi`jIxnl%)@mt~Rtl~|HL4FpBfBkK*
znI5VimD^F8t-GT;N3>Pol+!8`^#(l+J&IXWzR}5klIMG*Ea)RQ-#U<amm(?`nLNlI
zCbbu#!otFIHh{T>z>C2N!8Ri+43zD5Z;!92h*!7kK|i(J@cbOe>-y&K00YH_A~pXB
z9|V(hc~@ZzwDAgPhtS!{$yz(WY?~7HteJAKA<OLRrnB4bE4uQ?@!j2?GY7s>hGbRm
z3Y+d6vtqm$5YNeEDWMjX%&djC4>FEBOJ6l1k3>f+jetYU@dE*{@!xg5*l`5n_{$q)
z0cbVaH^8eWVY0EzbZ`FV=fDQj#Z$*6nGa_YR(%*gYq0C6B4fC@!>_7O5#daXa}CYC
zg|>+3uXm_vUZPS<KXhVGNGu5LF77YK!-@M|DOL7bSv}pwv@Y21|E$!wAIidasqyc<
zY&1%_p{J)!7KpDyFY!CFOCC}v5PSO7*+AzO=>vG<)cc+(be-;>JK*K_;BAi|cQ9I{
zQrzbVFWeUikro-5pGPn{0DV$TTX&uSpZT^pGS9Qia(vG`Ba9%y*KBq9MmmJny8wr`
zM??o`0)c01-0Z9mZ&7<7a;C&V0XNT3SK~EP+d{YLc%(+CaBHb|^;|zDv9Q`*34Z<#
zneT)zI<8EKs$cC)KZZ?Vy*UcxHl>`)*M2#xh?IpS*nmwt>are{#O#4xcJ0i!g%HI=
z+f;3&5HA)%@}V<Z;^6AwqScM8g^JUq1CKhs1E0(<YP@AyKOXbs4St2Je}18IzYIY;
z82gA4GmK0+m5|tPEI`w@Y*x)kOWy~9sMizS${vGw{4kq2E_P)8*!-!p>a82nKMB@a
z_1_OdwfoiIkZNaB;rZ&$4<!CEr%8)S0=;jV*|pZai$q$|@+!mcadWJ;KXmecl+d=w
diff --git a/view/theme/darkbubble/style.css b/view/theme/darkbubble/style.css
index 03434d7f8..2e180400b 100644
--- a/view/theme/darkbubble/style.css
+++ b/view/theme/darkbubble/style.css
@@ -1,7 +1,29 @@
@import url('../testbubble/style.css');
+.icon {
+ background-image: url('dbicons.png');
+}
+
body {
background: #000000;
color: #dddddd;
}
+.info-message {
+ color: #444444;
+}
+
+#id_openid_url {
+ background: url(../testbubble/login-bg.gif) no-repeat #ffffff;
+ background-position: 0 50%;
+ padding-left: 18px;
+ width: 385px;
+
+/* background: #FFFFFF;*/
+ color: #000000;
+
+}
+
+.fortunate {
+ color: #8888FF !important;
+}
\ No newline at end of file
diff --git a/view/theme/darkbubble/theme.php b/view/theme/darkbubble/theme.php
new file mode 100644
index 000000000..326c98bbd
--- /dev/null
+++ b/view/theme/darkbubble/theme.php
@@ -0,0 +1,4 @@
+<?php
+$a->theme_info = array(
+ 'extends' => 'testbubble',
+);
diff --git a/view/theme/darkbubble/user.png b/view/theme/darkbubble/user.png
deleted file mode 100644
index df899e7e08ad95deae68e481b798e50be1e22325..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 664
zcmV;J0%!e+P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!I!Q!9RCwB?Q%h?TQ4~IR?#$fDJd)-`
zEtO1ys0%@KQBX8gr54;MiUozbaN)uSSo8<DP;sRzq3TYMx^Pw0MKK$HfmXqGQ7AR3
z_()Ai=9P&v<GHD+MJf$+hL1UOFXy}8`Odi{iXzy`L$*pFY_P^=XW!@c@7w!y`{2OW
zZT;CwI-R_)C`{gnK>RluQMh~O_Jg+Xok%1M@LN9Ej(dXup}04(nSvBzs8U`U&1BM$
zMI=*w5I1xXMe$NE3X+IjhM`eajdd0zNrE5<!ErsM7Xk^P#SJ513geO?3L{K*0X^_~
zG0{g@$3{j!Q$c_ZM2adzFmt(Qn-Q=^qajXQzg9HO{NnJ@k%f37=_FI>M)B~G>0Cbl
zp-?dI{cjF<eTDJybB`PKS}`6s+NaNqy*hC4(4yygR_V>m;Pa`e^WVPzP%X=zELWDV
ztS8_;m`^4j-Ym_$zO3nb$2dXY;vxvc5PZK4mSsV0r3Te%6>Qr*zEJ*B>Y8XE_RP<{
zJKH~yg_x>hGX1L&6$W7dx)B4WP@r-EwV&ZF+*u>wt=mnhkWTbvfH4IKA<!Lh93a#Y
zfv2gcjN)F1q`!vNw^2i6R818$O~-bv5<vHg@DRyxkg%KpS}hk`$6{lrhSe9-ZyoVZ
zCnQu55q=!c;Q=A574R1c_%ClO_lGftF<mopCw@;ZSC)$NpFZxW*H%)^W>a_UX3Y0n
y60ZbLZ_Bc5%QCAID$F6#qYD?WzU2JB1sDK>D#xq$6bx?w0000<MNUMnLSTYwaw@w3
diff --git a/view/theme/darkbubble/wall_item.tpl b/view/theme/darkbubble/wall_item.tpl
deleted file mode 100644
index 70ec00dd9..000000000
--- a/view/theme/darkbubble/wall_item.tpl
+++ /dev/null
@@ -1,75 +0,0 @@
-<!-- test -->
-<div class="wall-item-outside-wrapper$indent" id="wall-item-outside-wrapper-$id" >
- <div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
- <div class="wall-item-info" id="wall-item-info-$id">
- <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id"
- onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')"
- onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
- <a href="$profile_url" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">
- <img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" style="height: 80px; width: 80px;" alt="$name" />
- </a>
- <span onclick="openClose('wall-item-photo-menu-$id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$id">menu</span>
- <div class="wall-item-photo-menu" id="wall-item-photo-menu-$id">
- <ul>
- $item_photo_menu
- </ul>
- </div>
- </div>
- <div class="wall-item-photo-end"></div>
- <div class="wall-item-location" id="wall-item-location-$id">{{ if $location }}<span class="icon globe"></span>$location {{ endif }}</div>
- </div>
- <div class="wall-item-lock-wrapper">
- {{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div>
- {{ else }}<div class="wall-item-lock"></div>{{ endif }}
- </div>
- <div class="wall-item-content" id="wall-item-content-$id" >
- <div class="wall-item-title" id="wall-item-title-$id">$title</div>
- <div class="wall-item-title-end"></div>
- <div class="wall-item-body" id="wall-item-body-$id" >$body</div>
- </div>
-
- <div class="wall-item-tools" id="wall-item-tools-$id">
- {{ if $vote }}
- <div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
- <a href="#" class="icon like" title="$vote.like.0" onclick="dolike($id,'like'); return false"></a>
- <a href="#" class="icon dislike" title="$vote.dislike.0" onclick="dolike($id,'dislike'); return false"></a>
- {{ if $vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title=""$vote.share.0" onclick="jotShare($id); return false"></a>{{ endif }}
- <img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
- </div>
- {{ endif }}
- {{ if $plink }}
- <div class="wall-item-links-wrapper"><a href="$plink.href" title="$plink.title" target="external-link" class="icon remote-link"></a></div>
- {{ endif }}
- {{ if $edpost }}
- <a class="editpost icon pencil" href="$edpost.0" title="$edpost.1"></a>
- {{ endif }}
-
- {{ if $star }}
- <a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
- {{ endif }}
-
- <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
- {{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
- </div>
- {{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }}
- <div class="wall-item-delete-end"></div>
-
-
- </div>
-
- <div class="wall-item-author">
- <a href="$profile_url" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a>
- <div class="wall-item-ago" id="wall-item-ago-$id">$ago</div>
-
- </div>
- </div>
- <div class="wall-item-wrapper-end"></div>
- <div class="wall-item-like" id="wall-item-like-$id">$like</div>
- <div class="wall-item-dislike" id="wall-item-dislike-$id">$dislike</div>
- <div class="wall-item-comment-wrapper" >
- $comment
- </div>
-</div>
-
-<div class="wall-item-outside-wrapper-end$indent" ></div>
-
diff --git a/view/theme/darkbubble/wallwall_item.tpl b/view/theme/darkbubble/wallwall_item.tpl
deleted file mode 100644
index 8819103a3..000000000
--- a/view/theme/darkbubble/wallwall_item.tpl
+++ /dev/null
@@ -1,74 +0,0 @@
-<div class="wall-item-outside-wrapper$indent wallwall" id="wall-item-outside-wrapper-$id" >
- <div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
- <div class="wall-item-info wallwall" id="wall-item-info-$id">
- <div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$id" >
- <a href="$owner_url" title="$olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$id">
- <img src="$owner_photo" class="wall-item-photo$osparkle" id="wall-item-ownerphoto-$id" style="height: 80px; width: 80px;" alt="$owner_name" /></a>
- </div>
- <div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$wall" /></div>
- <div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$id"
- onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')"
- onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
- <a href="$profile_url" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">
- <img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" style="height: 80px; width: 80px;" alt="$name" /></a>
- <span onclick="openClose('wall-item-photo-menu-$id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$id">menu</span>
- <div class="wall-item-photo-menu" id="wall-item-photo-menu-$id">
- <ul>
- $item_photo_menu
- </ul>
- </div>
-
- </div>
- <div class="wall-item-photo-end"></div>
- <div class="wall-item-location" id="wall-item-location-$id">{{ if $location }}<span class="icon globe"></span>$location {{ endif }}</div>
- </div>
- <div class="wall-item-lock-wrapper">
- {{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div>
- {{ else }}<div class="wall-item-lock"></div>{{ endif }}
- </div>
- <div class="wall-item-tools" id="wall-item-tools-$id">
- {{ if $vote }}
- <div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
- <a href="#" class="icon like" title="$vote.like.0" onclick="dolike($id,'like'); return false"></a>
- <a href="#" class="icon dislike" title="$vote.dislike.0" onclick="dolike($id,'dislike'); return false"></a>
- {{ if $vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title=""$vote.share.0" onclick="jotShare($id); return false"></a>{{ endif }}
- <img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
- </div>
- {{ endif }}
- {{ if $plink }}
- <div class="wall-item-links-wrapper"><a href="$plink.href" title="$plink.title" target="external-link" class="icon remote-link"></a></div>
- {{ endif }}
- {{ if $edpost }}
- <a class="editpost icon pencil" href="$edpost.0" title="$edpost.1"></a>
- {{ endif }}
-
- {{ if $star }}
- <a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
- {{ endif }}
-
- <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
- {{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
- </div>
- {{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }}
- <div class="wall-item-delete-end"></div>
- </div>
- <div class="wall-item-content" id="wall-item-content-$id" >
- <div class="wall-item-title" id="wall-item-title-$id">$title</div>
- <div class="wall-item-title-end"></div>
- <div class="wall-item-body" id="wall-item-body-$id" >$body</div>
- </div>
- <div class="wall-item-author">
- <a href="$profile_url" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a>
- <div class="wall-item-ago" id="wall-item-ago-$id">$ago</div>
- </div>
- </div>
- <div class="wall-item-wrapper-end"></div>
- <div class="wall-item-like" id="wall-item-like-$id">$like</div>
- <div class="wall-item-dislike" id="wall-item-dislike-$id">$dislike</div>
- <div class="wall-item-comment-wrapper" >
- $comment
- </div>
-</div>
-
-<div class="wall-item-outside-wrapper-end$indent" ></div>
-
From 8f47540e9b8e5bde94cf3acd7e27d0a4060315e9 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sat, 1 Oct 2011 04:37:28 -0700
Subject: [PATCH 13/46] darkbubble - event legibility
---
view/theme/darkbubble/style.css | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/view/theme/darkbubble/style.css b/view/theme/darkbubble/style.css
index 2e180400b..9336dc01b 100644
--- a/view/theme/darkbubble/style.css
+++ b/view/theme/darkbubble/style.css
@@ -18,10 +18,14 @@ body {
background-position: 0 50%;
padding-left: 18px;
width: 385px;
-
-/* background: #FFFFFF;*/
color: #000000;
-
+}
+
+.vevent, .eventcal {
+ color: #000000;
+}
+.event-list-date {
+ color: #DDDDDD;
}
.fortunate {
From 0ad9e7b5f4f72f789363ae1a1836e43d5707bf0a Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sat, 1 Oct 2011 06:20:41 -0700
Subject: [PATCH 14/46] option to not post photos to status stream
---
mod/photos.php | 13 +++++--------
view/photos_upload.tpl | 5 +++++
view/theme/duepuntozero/style.css | 6 ++++++
3 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/mod/photos.php b/mod/photos.php
index b6be8d025..1321af192 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -92,15 +92,11 @@ EOT;
function photos_post(&$a) {
- logger('mod/photos.php: photos_post(): begin' , 'LOGGER_DEBUG');
+ logger('mod-photos: photos_post(): begin' , 'LOGGER_DEBUG');
- foreach($_REQUEST AS $key => $val) {
- logger('mod/photos.php: photos_post(): $_REQUEST key: ' . $key . ' val: ' . $val , 'LOGGER_DEBUG');
- }
- foreach($_FILES AS $key => $val) {
- logger('mod/photos.php: photos_post(): $_FILES key: ' . $key . ' val: ' . $val , 'LOGGER_DEBUG');
- }
+ logger('mod_photos: REQUEST ' . print_r($_REQUEST,true), LOGGER_DATA);
+ logger('mod_photos: FILES ' . print_r($_FILES,true), LOGGER_DATA);
$can_post = false;
$visitor = 0;
@@ -585,7 +581,7 @@ function photos_post(&$a) {
else
$visible = 0;
- if(intval($_REQUEST,'not_visible'))
+ if(intval($_REQUEST['not_visible']))
$visible = 0;
$str_group_allow = perms2str(((is_array($_REQUEST['group_allow'])) ? $_REQUEST['group_allow'] : explode(',',$_REQUEST['group_allow'])));
@@ -895,6 +891,7 @@ function photos_content(&$a) {
'$nickname' => $a->data['user']['nickname'],
'$newalbum' => t('New album name: '),
'$existalbumtext' => t('or existing album name: '),
+ '$nosharetext' => t('Do not show a status post for this upload'),
'$albumselect' => template_escape($albumselect),
'$permissions' => t('Permissions'),
'$aclselect' => (($visitor) ? '' : template_escape(populate_acl($a->user, $celeb))),
diff --git a/view/photos_upload.tpl b/view/photos_upload.tpl
index c7c61c6db..318a92427 100644
--- a/view/photos_upload.tpl
+++ b/view/photos_upload.tpl
@@ -13,6 +13,11 @@
</div>
<div id="photos-upload-exist-end"></div>
+ <div id="photos-upload-noshare-div" class="photos-upload-noshare-div" >
+ <input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" />
+ <label id="photos-upload-noshare-text" for="photos-upload-noshare" >$nosharetext</label>
+ </div>
+
<div id="photos-upload-perms" class="photos-upload-perms" >
<a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="button" />
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 1fe8fb2f4..4769da8af 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -1559,6 +1559,8 @@ input#dfrn-url {
display:block!important;
}
+
+
#acl-wrapper {
width: 690px;
float:left;
@@ -1917,6 +1919,10 @@ a.mail-list-link {
float: left;
width: 175px;
}
+
+#photos-upload-noshare {
+ margin-bottom: 10px;
+}
#photos-upload-existing-album-text {
float: left;
width: 175px;
From 96e735fdd27bbf18a3a2d916882e574ec22fea21 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sat, 1 Oct 2011 18:54:48 -0700
Subject: [PATCH 15/46] zot protocol update
---
boot.php | 2 +-
zot.txt | 124 +++++++++++++++++++++++++++++++++++++++++--------------
2 files changed, 93 insertions(+), 33 deletions(-)
diff --git a/boot.php b/boot.php
index 59eeb4643..61f5fb9f5 100644
--- a/boot.php
+++ b/boot.php
@@ -8,7 +8,7 @@ require_once("include/pgettext.php");
require_once('include/nav.php');
define ( 'FRIENDIKA_PLATFORM', 'Free Friendika');
-define ( 'FRIENDIKA_VERSION', '2.3.1120' );
+define ( 'FRIENDIKA_VERSION', '2.3.1121' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1093 );
diff --git a/zot.txt b/zot.txt
index 300b695ff..b160788e7 100644
--- a/zot.txt
+++ b/zot.txt
@@ -1,7 +1,7 @@
This is the Zot! social communications protocol.
Specification revision: 1
-15 September 2011
+2 October 2011
Mike Macgirvin
This specification is public domain.
@@ -78,16 +78,21 @@ zot:env
*******
This consists of RFC822-style header fields representing the sender and
-recipient(s). Example:
+recipient(s). Line lengths have no defined limit and RFC822 continuation
+lines are not supported. If an inbound server is not able to process an
+envelope or post due to size constraints, it SHOULD return a
+"413 Entity too large" HTTP response.
-From: bob@example.com
-Sender: bob@example.com
-To: alice@example.com
+Example:
-Both "From:" and "Sender:" MUST be provided, and represent a webfinger
-address of the author and sender respectively. The webfinger address for
-the From address MUST contain a discoverable salmon public key that
-is needed to verify the enclosed salmon data. Sender is used to indicate
+Z-From: zot:bob@example.com
+Z-Sender: zot:bob@example.com
+Z-To: zot:alice@example.com
+
+Both "Z-From:" and "Z-Sender:" MUST be provided, and represent a single
+webfinger address of the author and sender respectively. The webfinger
+address for the From address MUST contain a discoverable salmon public key
+which is needed to verify the enclosed salmon data. Sender is used to indicate
the webfinger identity responsible for transmitting this message. From
indicates the message author.
@@ -95,46 +100,91 @@ In web-based social systems, a reply to a message SHOULD be conveyed to all of
the original message participants. Only the author of the original message
may know all the recipients (such as those contained in Bcc: elements). The
author of a message always provides 'From'. They MUST duplicate this
-information as 'Sender'.
+information as 'Sender' when posting a followup message.
-A reply to a given message MUST be sent to the original From address, and MAY
-be sent to any additional addresses in the recipient list. The original author
-MUST send the reply to all known recipients of the original message, with
-their webfinger identity as Sender, and the comment/reply author as From.
+A reply to a given message MUST be sent to the From address of the original
+post, and MAY be sent to any additional addresses in the recipient list. The
+original post author MUST send the reply to all known recipients of the
+original message, with their webfinger identity as Sender, and the
+comment/reply author as From.
Receiving agents SHOULD validate the From identity as the signer of the salmon
magic envelope, and MAY reject it. They SHOULD also verify the Sender signature
of the zot packet if it is different than the salmon signature. They MAY
reject the message if the Sender is not allowed in their "friend list", or if
they do not have a suitable relationship with the Sender, or if either
-signature fails to validate.
+signature fails to validate. Rejected messages for one of these reasons SHOULD
+be indicated with a "400 Bad Request" HTTP response.
-To: *
+Z-To: *
indicates a public message with no specifically enumerated recipients.
-The fields To:, Cc:, and/or Bcc: MAY be present. At least one recipient field
-MUST be present. These fields may use the entire syntax specified by RFC822,
-for example:
+The fields Z-To: and/or Z-Bcc: MAY be present. At least one recipient field
+MUST be present.
-To: "Bob Smith" <bob@example.com>, "Alice Jones" <alice@example.com>
+Z-To: zot:bob@example.com, zot:alice@example.com, mailto:dave@example.com
+Z-Bcc: zot:https://example.com/profile/richard
-is a valid entry. A zot envelope is UTF-8 encoded, which differs from RFC822.
-The host component MUST be US-ASCII, with punycode translation of
-internationalised domain names applied.
+are valid entries. Adresses are comma separated and individual entries MUST NOT
+contain commas. There MAY be any number of ASCII space characters between
+entries for legibility. Header lines are terminated with a linefeed character
+(ASCII 0x0A).
-The entire envelope is then encrypted using alg with env_key and env_iv and
+This specification provides the following foreign protocol address prefixes
+for use in Z-To: or Z-Bcc: elements:
+
+zot: - normal zot delivery using webfinger or LRDD resolvable address
+ostatus: - normal OStatus delivery using webfinger or LRDD resovable address
+diaspora: - Diaspora network delivery using webfinger address
+facebook: - Facebook profile page URL
+twitter: - Twitter personal page URL without AJAX '#!' fragment
+mailto: - email RFC822/ESMTP address
+
+Examples:
+
+twitter:http://twitter.com/bjensen
+facebook:http://facebook.com/profile.php?id=000000001
+
+Foreign protocol addresses which have not been defined in this specification
+or future revisions of this specification and which are unknown to the
+recipient delivery process MAY be ignored.
+
+In cases where an address may contain either a webfinger or LRDD address, the
+webfinger address SHOULD be used preferentially.
+
+
+Z-Bcc:
+******
+
+The Z-Bcc element may contain one or more addresses which are hidden from end
+user presentation. A zot receiving system MUST NOT store or allow for
+the display of the Bcc information. Implementations which require extreme
+privacy SHOULD send individual posts to each of the Bcc: recipients containing
+only a single address. They MAY send all Bcc: posts using bulk delivery,
+however this may have privacy implications as there is no guarantee a
+receiving system will not log, store, or otherwise reveal the contents of the
+Bcc recipient list.
+
+Z-To: addresses MAY be shown to an end user.
+
+
+Envelope encryption
+*******************
+
+
+The entire envelope is encrypted using alg with env_key and env_iv and
base64url encoded for transmission.
-The zot envelope MAY include remote addresses. A zot delivery agent MUST parse
-all addresses and determine whether a delivery address to the current endpoint
-is valid. This may be the result of:
+The zot envelope MAY include remote addresses. A zot inbound delivery agent
+MUST parse the envelope and determine whether a delivery address to the
+current endpoint is valid. This may be the result of:
1. An address contains the public message wildcard '*'
2. The current endpoint is a personal endpoint and one of the recipients
-listed in the To:, Cc:, or Bcc: addresses matches the webfinger address of
+listed in the Z-To: or Z-Bcc: addresses matches the webfinger address of
the "owner" of the endpoint.
3. The current endpoint is a bulk delivery endpoint. The bulk delivery
@@ -219,7 +269,8 @@ We anticipate this specification will in the future allow for a close variant
of "message/rfc822" and which may include MIME. This may also be used to
embed alternate message formats and protocols such as
"application/x-diaspora+xml". If a delivery agent is unable to provide any
-acceptable data format, the delivery MUST be terminated/cancelled.
+acceptable data format to the remote system, the delivery to that system MUST
+be terminated/cancelled.
Foreign Messages
****************
@@ -233,9 +284,18 @@ systems MAY reject foreign messages.
-**********************
-* Zid authentication *
-**********************
+
+
+*******************************
+* Zid (Zot-ID) authentication *
+*******************************
+
+This section of the document is considered separate from the delivery
+specification precding it and represents a different protocol, which is
+currently incomplete. This will be split off into another document in the
+future, but is presented here as a synergistic component of the Zot network
+model.
+
URLs may be present within a zot message which refer to private and/or
protected resources. Zid uses OpenID to gain access to these protected
From 7d7a1498118f0101f31b711b30d2e21533bb01fe Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sat, 1 Oct 2011 23:19:20 -0700
Subject: [PATCH 16/46] db updates for server batch key caching, group
visibility
---
boot.php | 2 +-
database.sql | 10 ++++++++++
update.php | 15 ++++++++++++++-
3 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/boot.php b/boot.php
index 61f5fb9f5..97a4f96cd 100644
--- a/boot.php
+++ b/boot.php
@@ -10,7 +10,7 @@ require_once('include/nav.php');
define ( 'FRIENDIKA_PLATFORM', 'Free Friendika');
define ( 'FRIENDIKA_VERSION', '2.3.1121' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
-define ( 'DB_UPDATE_VERSION', 1093 );
+define ( 'DB_UPDATE_VERSION', 1094 );
define ( 'EOL', "<br />\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
diff --git a/database.sql b/database.sql
index f39728a33..15e2f2cca 100644
--- a/database.sql
+++ b/database.sql
@@ -114,6 +114,7 @@ CREATE TABLE IF NOT EXISTS `contact` (
CREATE TABLE IF NOT EXISTS `group` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`uid` int(10) unsigned NOT NULL,
+ `visible` tinyint(1) NOT NULL DEFAULT '0',
`deleted` tinyint(1) NOT NULL DEFAULT '0',
`name` char(255) NOT NULL,
PRIMARY KEY (`id`)
@@ -632,3 +633,12 @@ CREATE TABLE IF NOT EXISTS `search` (
INDEX ( `uid` ),
INDEX ( `term` )
) ENGINE = MyISAM DEFAULT CHARSET=utf8;
+
+CREATE TABLE IF NOT EXISTS `fserver` (
+`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+`server` CHAR( 255 ) NOT NULL ,
+`posturl` CHAR( 255 ) NOT NULL ,
+`key` TEXT NOT NULL,
+INDEX ( `server` )
+) ENGINE = MyISAM DEFAULT CHARSET=utf8;
+
diff --git a/update.php b/update.php
index 0dd599e83..723f12c1a 100644
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
<?php
-define( 'UPDATE_VERSION' , 1093 );
+define( 'UPDATE_VERSION' , 1094 );
/**
*
@@ -773,4 +773,17 @@ function update_1091() {
function update_1092() {
q("ALTER TABLE `user` ADD INDEX ( `login_date` ) ");
q("ALTER TABLE `user` ADD INDEX ( `account_expired` ) ");
+}
+
+function update_1093() {
+ q("CREATE TABLE IF NOT EXISTS `fserver` (
+ `id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+ `server` CHAR( 255 ) NOT NULL ,
+ `posturl` CHAR( 255 ) NOT NULL ,
+ `key` TEXT NOT NULL,
+ INDEX ( `server` )
+ ) ENGINE = MYISAM ");
+
+ q("ALTER TABLE `group` ADD `visible` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `uid` ");
+
}
\ No newline at end of file
From c72883f06822658491134d41a3b8ab83d9984b86 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sun, 2 Oct 2011 01:21:51 -0700
Subject: [PATCH 17/46] malformed xml in ping
---
mod/ping.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mod/ping.php b/mod/ping.php
index 30f1dc837..544a42e14 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -114,7 +114,7 @@ function ping_init(&$a) {
function xmlize($href, $name, $url, $photo, $date, $message){
$notsxml = '<note href="%s" name="%s" url="%s" photo="%s" date="%s">%s</note>';
return sprintf ( $notsxml,
- $href, $name, $url, $photo, $date, $message
+ xmlify($href), xmlify($name), xmlify($url), xmlify($photo), xmlify($date), xmlify($message)
);
}
From 8c9a6b0512da3bd73f28989bc179c4e417b267d8 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sun, 2 Oct 2011 02:46:54 -0700
Subject: [PATCH 18/46] fix notifications duepuntozero
---
js/main.js | 10 ++++++++++
view/theme/duepuntozero/nav.tpl | 2 +-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/js/main.js b/js/main.js
index 896cbeb56..e0694e47f 100644
--- a/js/main.js
+++ b/js/main.js
@@ -95,6 +95,16 @@
if(home == 0) { home = ''; $('#home-update').removeClass('show') } else { $('#home-update').addClass('show') }
$('#home-update').html(home);
+ var intro = $(data).find('intro').text();
+ if(intro == 0) { intro = ''; $('#intro-update').removeClass('show') } else { $('#intro-update').addClass('show') }
+ $('#intro-update').html(intro);
+
+ var mail = $(data).find('mail').text();
+ if(mail == 0) { mail = ''; $('#mail-update').removeClass('show') } else { $('#mail-update').addClass('show') }
+ $('#mail-update').html(mail);
+
+
+
var eNotif = $(data).find('notif')
notif = eNotif.attr('count');
if (notif>0){
diff --git a/view/theme/duepuntozero/nav.tpl b/view/theme/duepuntozero/nav.tpl
index 82ac178e8..efc95bde1 100644
--- a/view/theme/duepuntozero/nav.tpl
+++ b/view/theme/duepuntozero/nav.tpl
@@ -32,7 +32,7 @@
{{ endif }}
{{ if $nav.notifications }}
<a id="nav-notify-link" class="nav-commlink $nav.notifications.2 $sel.notifications" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
- <span id="notify-update" class="nav-ajax-left"></span>
+ <span id="intro-update" class="nav-ajax-left"></span>
{{ endif }}
{{ if $nav.messages }}
<a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0 $sel.messages" title="$nav.messages.3" >$nav.messages.1</a>
From 7c1968907d26a66581d362475a6b557e53e159cb Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sun, 2 Oct 2011 05:32:05 -0700
Subject: [PATCH 19/46] attack of the zombie orphans
---
include/delivery.php | 2 ++
include/notifier.php | 3 +++
2 files changed, 5 insertions(+)
diff --git a/include/delivery.php b/include/delivery.php
index 3ab820b62..46112d78e 100644
--- a/include/delivery.php
+++ b/include/delivery.php
@@ -96,6 +96,8 @@ function delivery_run($argv, $argc){
$uid = $r[0]['uid'];
$updated = $r[0]['edited'];
+ if(! $parent_id)
+ return;
$items = q("SELECT `item`.*, `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer`
diff --git a/include/notifier.php b/include/notifier.php
index 864fa517b..d1cd1cc73 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -123,6 +123,9 @@ function notifier_run($argv, $argc){
$uid = $r[0]['uid'];
$updated = $r[0]['edited'];
+ if(! $parent_id)
+ return;
+
$items = q("SELECT `item`.*, `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer`
FROM `item` LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` WHERE `parent` = %d ORDER BY `id` ASC",
intval($parent_id)
From 8f9656da926b402e16432de3363e6dc1cef1ef8a Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sun, 2 Oct 2011 16:18:01 -0700
Subject: [PATCH 20/46] basic support for AS friend requests
---
boot.php | 4 +++-
include/items.php | 44 +++++++++++++++++++++++++++++++++++---------
2 files changed, 38 insertions(+), 10 deletions(-)
diff --git a/boot.php b/boot.php
index 97a4f96cd..471231820 100644
--- a/boot.php
+++ b/boot.php
@@ -8,7 +8,7 @@ require_once("include/pgettext.php");
require_once('include/nav.php');
define ( 'FRIENDIKA_PLATFORM', 'Free Friendika');
-define ( 'FRIENDIKA_VERSION', '2.3.1121' );
+define ( 'FRIENDIKA_VERSION', '2.3.1122' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1094 );
@@ -152,6 +152,8 @@ define ( 'ACTIVITY_DISLIKE', NAMESPACE_DFRN . '/dislike' );
define ( 'ACTIVITY_OBJ_HEART', NAMESPACE_DFRN . '/heart' );
define ( 'ACTIVITY_FRIEND', NAMESPACE_ACTIVITY_SCHEMA . 'make-friend' );
+define ( 'ACTIVITY_REQ_FRIEND', NAMESPACE_ACTIVITY_SCHEMA . 'request-friend' );
+define ( 'ACTIVITY_UNFRIEND', NAMESPACE_ACTIVITY_SCHEMA . 'remove-friend' );
define ( 'ACTIVITY_FOLLOW', NAMESPACE_ACTIVITY_SCHEMA . 'follow' );
define ( 'ACTIVITY_UNFOLLOW', NAMESPACE_ACTIVITY_SCHEMA . 'stop-following' );
define ( 'ACTIVITY_POST', NAMESPACE_ACTIVITY_SCHEMA . 'post' );
diff --git a/include/items.php b/include/items.php
index a1baf7471..32f0728c3 100644
--- a/include/items.php
+++ b/include/items.php
@@ -1491,6 +1491,20 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $secure_fee
lose_follower($importer,$contact,$datarray,$item);
return;
}
+
+ if(activity_match($datarray['verb'],ACTIVITY_REQ_FRIEND)) {
+ logger('consume-feed: New friend request');
+ new_follower($importer,$contact,$datarray,$item,true);
+ return;
+ }
+ if(activity_match($datarray['verb'],ACTIVITY_UNFRIEND)) {
+ lose_sharer($importer,$contact,$datarray,$item);
+ return;
+ }
+
+
+
+
if(! is_array($contact))
return;
@@ -1522,7 +1536,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $secure_fee
}
}
-function new_follower($importer,$contact,$datarray,$item) {
+function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
$url = notags(trim($datarray['author-link']));
$name = notags(trim($datarray['author-name']));
$photo = notags(trim($datarray['author-avatar']));
@@ -1532,14 +1546,14 @@ function new_follower($importer,$contact,$datarray,$item) {
$nick = $rawtag[0]['child'][NAMESPACE_POCO]['preferredUsername'][0]['data'];
if(is_array($contact)) {
- if($contact['network'] == 'stat' && $contact['rel'] == CONTACT_IS_SHARING) {
+ if(($contact['network'] == NETWORK_OSTATUS && $contact['rel'] == CONTACT_IS_SHARING)
+ || ($sharing && $contact['rel'] == CONTACT_IS_FOLLOWER)) {
$r = q("UPDATE `contact` SET `rel` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval(CONTACT_IS_FRIEND),
intval($contact['id']),
intval($importer['uid'])
);
}
-
// send email notification to owner?
}
else {
@@ -1555,13 +1569,12 @@ function new_follower($importer,$contact,$datarray,$item) {
dbesc($name),
dbesc($nick),
dbesc($photo),
- dbesc('stat'),
- intval(CONTACT_IS_FOLLOWER)
+ dbesc(($sharing) ? NETWORK_ZOT : NETWORK_OSTATUS),
+ intval(($sharing) ? CONTACT_IS_SHARING : CONTACT_IS_FOLLOWER)
);
- $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `pending` = 1 AND `rel` = %d LIMIT 1",
+ $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `pending` = 1 LIMIT 1",
intval($importer['uid']),
- dbesc($url),
- intval(CONTACT_IS_FOLLOWER)
+ dbesc($url)
);
if(count($r))
$contact_record = $r[0];
@@ -1593,7 +1606,7 @@ function new_follower($importer,$contact,$datarray,$item) {
'$sitename' => $a->config['sitename']
));
$res = mail($r[0]['email'],
- t("You have a new follower at ") . $a->config['sitename'],
+ (($sharing) ? t('A new person is sharing with you at ') : t("You have a new follower at ")) . $a->config['sitename'],
$email,
'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
. 'Content-type: text/plain; charset=UTF-8' . "\n"
@@ -1617,6 +1630,19 @@ function lose_follower($importer,$contact,$datarray,$item) {
}
}
+function lose_sharer($importer,$contact,$datarray,$item) {
+
+ if(($contact['rel'] == CONTACT_IS_FRIEND) || ($contact['rel'] == CONTACT_IS_FOLLOWER)) {
+ q("UPDATE `contact` SET `rel` = %d WHERE `id` = %d LIMIT 1",
+ intval(CONTACT_IS_FOLLOWER),
+ intval($contact['id'])
+ );
+ }
+ else {
+ contact_remove($contact['id']);
+ }
+}
+
function subscribe_to_hub($url,$importer,$contact,$submode = 'subscribe') {
From f6f5e5b99389019bdd6a3258de19cdda2d014b97 Mon Sep 17 00:00:00 2001
From: Devlon Duthie <duthied@gmail.com>
Date: Sun, 2 Oct 2011 18:38:08 -0500
Subject: [PATCH 21/46] aspect ratio fixes for photos in testbubble theme some
other testbubble styling tweaks
---
view/theme/testbubble/photo_album.tpl | 8 ++++
view/theme/testbubble/photo_top.tpl | 8 ++++
view/theme/testbubble/style.css | 64 ++++++++++++++++-----------
3 files changed, 54 insertions(+), 26 deletions(-)
create mode 100644 view/theme/testbubble/photo_album.tpl
create mode 100644 view/theme/testbubble/photo_top.tpl
diff --git a/view/theme/testbubble/photo_album.tpl b/view/theme/testbubble/photo_album.tpl
new file mode 100644
index 000000000..a0e3f46c4
--- /dev/null
+++ b/view/theme/testbubble/photo_album.tpl
@@ -0,0 +1,8 @@
+<div class="photo-album-image-wrapper" id="photo-album-image-wrapper-$id">
+ <a href="$photolink" class="photo-album-photo-link" id="photo-album-photo-link-$id" title="$phototitle">
+ <img src="$imgsrc" alt="$imgalt" title="$phototitle" class="photo-album-photo lframe resize" id="photo-album-photo-$id" />
+ </div>
+ <p class='caption'>$desc</p>
+ </a>
+ </div>
+<div class="photo-album-image-wrapper-end"></div>
diff --git a/view/theme/testbubble/photo_top.tpl b/view/theme/testbubble/photo_top.tpl
new file mode 100644
index 000000000..d552409c4
--- /dev/null
+++ b/view/theme/testbubble/photo_top.tpl
@@ -0,0 +1,8 @@
+
+<div class="photo-top-image-wrapper lframe" id="photo-top-image-wrapper-$id">
+ <div id="photo-album-wrapper-inner">
+ <a href="$photolink" class="photo-top-photo-link" id="photo-top-photo-link-$id" title="$phototitle"><img src="$imgsrc" alt="$imgalt" title="$phototitle" class="photo-top-photo" id="photo-top-photo-$id" /></a>
+ </div>
+ <div class="photo-top-album-name"><a href="$albumlink" class="photo-top-album-link" title="$albumalt" >$albumname</a></div>
+</div>
+<div class="photo-top-image-wrapper-end"></div>
diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css
index 85a01d0d2..36fe1bbc1 100644
--- a/view/theme/testbubble/style.css
+++ b/view/theme/testbubble/style.css
@@ -840,11 +840,16 @@ profile-jot-banner-wrapper {
/* = Posts = */
/* ========= */
-.wall-item-outside-wrapper {
- margin-top: 50px;
+.wall-item-outside-wrapper {
+ max-width: 85%;
+ border-bottom: 1px solid #dedede;
+ margin-top: 20px;
+ padding-right: 10px;
+ overflow: hidden;
}
+
.wall-item-outside-wrapper-end { clear: both;}
-.wall-item-content-wrapper { position: relative; max-width: 95%; }
+.wall-item-content-wrapper { position: relative; max-width: 100%; }
.wall-item-photo-menu { display: none;}
.wall-item-photo-menu-button {
display:none;
@@ -890,12 +895,13 @@ profile-jot-banner-wrapper {
}
.wall-item-outside-wrapper.comment .wall-item-tools {
- margin: 5px 5px 10px 60px;
+ margin: 5px 5px 10px 70px;
float: left;
}
.wall-item-like-buttons {
float: left;
+ padding-left: 10px;
}
.wall-item-like-buttons a.icon {
float: left;
@@ -924,9 +930,13 @@ profile-jot-banner-wrapper {
float: left;
}
.wall-item-title { font-size: 1.2em; font-weight: bold;}
-.wall-item-body { margin-left: 140px; padding-right: 20px; }
+.wall-item-body {
+ margin-left: 140px;
+ padding-right: 10px;
+ max-width: 85%;
+}
+
.wall-item-body p {
- max-width: 600px;
font-size: 0.8em;
}
.wall-item-lock-wrapper { float: right; }
@@ -936,6 +946,7 @@ profile-jot-banner-wrapper {
clear: left;
font-size: 0.9em;
margin: 4px 0px 0px 140px;
+ padding-left: 10px;
font-variant:small-caps;
}
@@ -1042,11 +1053,7 @@ profile-jot-banner-wrapper {
.icon.drop,
.icon.drophide { float: left; }
#item-delete-selected { overflow: auto; width: 100%;}
-.wall-item-outside-wrapper {
- max-width: 83%;
- border-bottom: 1px solid #dedede;
- margin-top: 20px;
-}
+
/* ============ */
/* = Comments = */
@@ -1055,11 +1062,11 @@ profile-jot-banner-wrapper {
.ccollapse-wrapper {
font-size: 0.9em;
color: #898989;
- margin-left: 80px;
+ margin-left: 60px;
font-variant:small-caps;
}
-.wall-item-outside-wrapper.comment { margin-left: 80px; }
+.wall-item-outside-wrapper.comment { margin-left: 70px; }
.wall-item-outside-wrapper.comment .wall-item-photo {
width: 40px!important;
height: 40px!important;
@@ -1072,7 +1079,13 @@ profile-jot-banner-wrapper {
background-position: 35px center;
}
.wall-item-outside-wrapper.comment .wall-item-info { width: 60px; }
-.wall-item-outside-wrapper.comment .wall-item-body { margin-left: 60px; max-width: 85%;}
+.wall-item-outside-wrapper.comment .wall-item-body {
+ margin-left: 70px;
+ max-width: 85%;
+ padding-right: 10px;
+ padding-left: 10px;
+}
+
.wall-item-outside-wrapper.comment .wall-item-author { margin-left: 60px;}
.wall-item-outside-wrapper.comment .wall-item-photo-menu {
@@ -1249,9 +1262,18 @@ div[id$="wrapper"] br { clear: left; }
/* = Photos = */
/* ========== */
+#side-bar-photos-albums h3:before {
+ content: url("photography.png");
+ padding-right: 10px;
+ vertical-align: middle;
+}
+
#side-bar-photos-albums li {
font-size: 14px;
font-variant: none;
+ text-align: left;
+ padding-left: 20px;
+ margin-bottom: 5px;
}
#photo-top-links {
@@ -1303,7 +1325,7 @@ div[id$="wrapper"] br { clear: left; }
overflow: hidden;
}
-#photo-photo { max-width: 100% }
+#photo-photo { max-width: 85%; height: auto; }
#photo-photo img { max-width: 100% }
.photo-top-image-wrapper a:hover,
@@ -1511,16 +1533,6 @@ input#photo_edit_form {
margin-left: 190px;
}
-#side-bar-photos-albums h3:before {
- content: url("photography.png");
- padding-right: 10px;
- vertical-align: middle;
-}
-
-#side-bar-photos-albums li {
- margin-bottom: 5px;
-}
-
#photo-album-edit-wrapper {
margin-bottom: 10px;
}
@@ -1699,7 +1711,7 @@ margin-left: 0px;
#prvmail-subject {
font-weight: bold;
- border: none;
+ border: 1px solid #dddddd;
}
/* ================= */
From da53ebf4b3431559d2383dd9e0651de44e9714e8 Mon Sep 17 00:00:00 2001
From: Devlon Duthie <duthied@gmail.com>
Date: Sun, 2 Oct 2011 20:37:47 -0500
Subject: [PATCH 22/46] added activetab var to message.php for templates
(testbubble only) added logic to photo header to make tab 'sticky' (active
class for styling) (testbubble only) css fix for avatars in wallitems
---
mod/message.php | 16 ++++++++++++----
view/theme/testbubble/mail_head.tpl | 6 +++---
view/theme/testbubble/style.css | 17 ++++++++++-------
3 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/mod/message.php b/mod/message.php
index 1bee45d48..d4772d026 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -45,13 +45,21 @@ function message_content(&$a) {
$myprofile = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
-
+ if (($a->argc > 1) && ($a->argv[1] === 'new')) {
+ $tab = 'new';
+ } else if ($a->argc == 2 && $a->argv[1] === 'sent') {
+ $tab = 'sent';
+ } else {
+ $tab = 'inbox';
+ }
+
$tpl = get_markup_template('mail_head.tpl');
$header = replace_macros($tpl, array(
'$messages' => t('Messages'),
'$inbox' => t('Inbox'),
'$outbox' => t('Outbox'),
- '$new' => t('New Message')
+ '$new' => t('New Message'),
+ '$activetab' => $tab
));
@@ -90,6 +98,8 @@ function message_content(&$a) {
if(($a->argc > 1) && ($a->argv[1] === 'new')) {
+ $o .= $header;
+
$tpl = get_markup_template('msg-header.tpl');
$a->page['htmlhead'] .= replace_macros($tpl, array(
@@ -114,7 +124,6 @@ function message_content(&$a) {
'$upload' => t('Upload photo'),
'$insert' => t('Insert web link'),
'$wait' => t('Please wait')
-
));
return $o;
@@ -248,7 +257,6 @@ function message_content(&$a) {
'$upload' => t('Upload photo'),
'$insert' => t('Insert web link'),
'$wait' => t('Please wait')
-
));
return $o;
diff --git a/view/theme/testbubble/mail_head.tpl b/view/theme/testbubble/mail_head.tpl
index 2a4fc42ea..2a4596cd6 100644
--- a/view/theme/testbubble/mail_head.tpl
+++ b/view/theme/testbubble/mail_head.tpl
@@ -1,7 +1,7 @@
<h3>$messages</h3>
<ul class="tabs-wrapper">
-<li><a href="message" class="tabs button">$inbox</a></li>
-<li><a href="message/sent" class="tabs button">$outbox</a></li>
-<li><a href="message/new" class="tabs button">$new</a></li>
+<li><a href="message" class="tabs button {{if $activetab==inbox}}active{{endif}}">$inbox</a></li>
+<li><a href="message/sent" class="tabs button {{if $activetab==sent}}active{{endif}}">$outbox</a></li>
+<li><a href="message/new" class="tabs button {{if $activetab==new}}active{{endif}}">$new</a></li>
</ul>
diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css
index 36fe1bbc1..8ef2b6619 100644
--- a/view/theme/testbubble/style.css
+++ b/view/theme/testbubble/style.css
@@ -361,7 +361,7 @@ ul#user-menu-popup li a.nav-sep { border-top: 1px solid #989898; border-style:in
#notifications {
height: 32px;
position: absolute;
- top:10px; left: 650px;
+ top:10px; left: 40%;
}
.nav-ajax-update {
width: 44px;
@@ -373,10 +373,10 @@ ul#user-menu-popup li a.nav-sep { border-top: 1px solid #989898; border-style:in
padding-top: 0.5em;
float: left;
padding-left: 11px;
- display: none;
+ /*display: none;*/
}
#net-update { background-position: 0px 0px; }
-#mail-update { background-position: 0px -42px; }
+#mail-update { background-position: 0px -40px; }
#notify-update { background-position: 0px -84px; }
#home-update { background-position: 0px -126px; }
@@ -1146,11 +1146,14 @@ profile-jot-banner-wrapper {
}
.wall-item-body code {
- border-color: #CCCCCC;
- border-style: solid;
+ font-family: Courier, monospace;
+ white-space: pre;
+ display: block;
+ overflow: auto;
+ border: 1px solid #cccccc;
border-width: 1px 1px 1px 10px;
- display: block;
- padding-left: 10px;
+ padding-left: 10px;
+ margin-top: 20px;
}
/* =========== */
From f84c208ac577cb43d24a8a33bbcb865677e1c7ae Mon Sep 17 00:00:00 2001
From: Devlon Duthie <duthied@gmail.com>
Date: Mon, 3 Oct 2011 01:45:27 -0500
Subject: [PATCH 23/46] broke 'find similar' matches content into a tpl in
core, added an extended tpl to testbubble that lists the profile tags
---
mod/match.php | 17 +++++----
view/match.tpl | 12 +++++++
view/theme/testbubble/match.tpl | 10 ++++++
view/theme/testbubble/style.css | 63 +++++++++------------------------
4 files changed, 48 insertions(+), 54 deletions(-)
create mode 100644 view/match.tpl
create mode 100644 view/theme/testbubble/match.tpl
diff --git a/mod/match.php b/mod/match.php
index 5dd80fe3e..eea2dad4f 100644
--- a/mod/match.php
+++ b/mod/match.php
@@ -22,6 +22,7 @@ function match_content(&$a) {
$params = array();
$tags = trim($r[0]['pub_keywords'] . ' ' . $r[0]['prv_keywords']);
+
if($tags) {
$params['s'] = $tags;
if($a->pager['page'] != 1)
@@ -40,15 +41,17 @@ function match_content(&$a) {
}
if(count($j->results)) {
+
+ $tpl = get_markup_template('match.tpl');
foreach($j->results as $jj) {
-
- $o .= '<div class="profile-match-wrapper"><div class="profile-match-photo">';
- $o .= '<a href="' . $jj->url . '">' . '<img src="' . $jj->photo . '" alt="' . $jj->name . '" title="' . $jj->name . '[' . $jj->tags . ']' . '" /></a></div>';
- $o .= '<div class="profile-match-break"></div>';
- $o .= '<div class="profile-match-name"><a href="' . $jj->url . '" title="' . $jj->name . '[' . $jj->url .']' . '">' . $jj->name . '</a></div>';
- $o .= '<div class="profile-match-end"></div></div>';
+
+ $o .= replace_macros($tpl,array(
+ '$url' => $jj->url,
+ '$name' => $jj->name,
+ '$photo' => $jj->photo,
+ '$tags' => $jj->tags
+ ));
}
- $o .= '<div id="profile-match-wrapper-end"></div>';
}
else {
info( t('No matches') . EOL);
diff --git a/view/match.tpl b/view/match.tpl
new file mode 100644
index 000000000..330245a2a
--- /dev/null
+++ b/view/match.tpl
@@ -0,0 +1,12 @@
+<div class="profile-match-wrapper">
+ <div class="profile-match-photo">
+ <a href="$url">
+ <img src="$photo" alt="$name" title="$name[$tags]" />
+ </a>
+ </div>
+ <div class="profile-match-break"></div>
+ <div class="profile-match-name">
+ <a href="$url" title="$name[$tags]">$name</a>
+ </div>
+ <div class="profile-match-end"></div>
+</div>
\ No newline at end of file
diff --git a/view/theme/testbubble/match.tpl b/view/theme/testbubble/match.tpl
new file mode 100644
index 000000000..49c3c81e4
--- /dev/null
+++ b/view/theme/testbubble/match.tpl
@@ -0,0 +1,10 @@
+<div class="profile-match-wrapper">
+ <div class="profile-match-photo">
+ <a href="$url">
+ <img src="$photo" alt="$name" />
+ </a>
+ </div>
+ <span><a href="$url">$name</a> is interested in:<br />$tags</span>
+ <div class="profile-match-break"></div>
+ <div class="profile-match-end"></div>
+</div>
\ No newline at end of file
diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css
index 8ef2b6619..a468296fb 100644
--- a/view/theme/testbubble/style.css
+++ b/view/theme/testbubble/style.css
@@ -841,11 +841,10 @@ profile-jot-banner-wrapper {
/* ========= */
.wall-item-outside-wrapper {
- max-width: 85%;
+ max-width: 83%;
border-bottom: 1px solid #dedede;
margin-top: 20px;
padding-right: 10px;
- overflow: hidden;
}
.wall-item-outside-wrapper-end { clear: both;}
@@ -1251,14 +1250,26 @@ div[id$="wrapper"] br { clear: left; }
}
.profile-match-wrapper {
- width: 300px;
- padding: 5px;
+ width: 80%;
+ padding: 15px;
margin-bottom:10px;
+ margin-left: 20px;
background-color: #f6f6f6;
border: 1px solid #dddddd;
-moz-box-shadow: 3px 3px 4px #959494;
-webkit-box-shadow: 3px 3px 4px #959494;
- box-shadow: 3px 3px 4px #959494;
+ box-shadow: 3px 3px 4px #959494;
+ clear: both;
+}
+
+.profile-match-end {
+ clear: both;
+}
+
+.profile-match-photo {
+ float: left;
+ margin-right: 10px;
+ margin-bottom: 5px;
}
/* ========== */
@@ -1717,48 +1728,6 @@ margin-left: 0px;
border: 1px solid #dddddd;
}
-/* ================= */
-/* = Notifications = */
-/* ================= */
-
-/*#notification-show-hide-wrapper {
- width: 160px;
- -moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
- -webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
- box-shadow:inset 0px 1px 0px 0px #cfcfcf;
- background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
- background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
- filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
- background-color:#bdbdbd;
- -moz-border-radius:5px;
- -webkit-border-radius:5px;
- border-radius:5px;
- padding: 5px 10px 5px 10px;
- margin-right: 5px;
- margin-top: 10px;
- font-style: bold;
- color: #efefef;
- text-align: center;
-}
-
-#notification-show-hide-wrapper:hover {
- color: #efefef;
- background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );
- background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% );
- filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808');
- background-color:#b20202;
-}
-
-#notification-show-hide-wrapper:active {
- background-color: #b20202;
- position:relative;
- top:1px;
-}
-
-#notification-show-hide-wrapper a {
- color: #efefef;
-}*/
-
/* ============ */
/* = Contacts = */
/* ============ */
From b476575a982746551619dd920a934b44d013f083 Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Mon, 3 Oct 2011 09:38:17 +0200
Subject: [PATCH 24/46] quattro: add comment box
---
view/theme/quattro/colors.less | 5 +++
view/theme/quattro/quattro.less | 40 ++++++++++++++++++---
view/theme/quattro/style.css | 39 ++++++++++++++++++---
view/wall_item.tpl | 4 ++-
view/wallwall_item.tpl | 62 +++------------------------------
5 files changed, 83 insertions(+), 67 deletions(-)
diff --git a/view/theme/quattro/colors.less b/view/theme/quattro/colors.less
index 12b0d08a6..564cf6d24 100644
--- a/view/theme/quattro/colors.less
+++ b/view/theme/quattro/colors.less
@@ -67,3 +67,8 @@
@NoticeBackgroundColor: #511919;
@ThreadBackgroundColor: #f6f7f8;
+
+@CommentBoxEmptyColor: @Grey3;
+@CommentBoxEmptyBorderColor: @Grey3;
+@CommentBoxFullColor: @Grey5;
+@CommentBoxFullBorderColor: @Grey5;
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index 1be65ea91..31a25694f 100644
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -3,7 +3,7 @@
/* global */
body {
font-family: Liberation Sans,helvetica,arial,clean,sans-serif;
- font-size: 10px;
+ font-size: 12px;
background-color: @BodyBackground;
color: @BodyColor;
margin: 50px 0px 0px 0px;
@@ -324,18 +324,17 @@ section {
.wall-item-ago { padding-right: 40px; }
.wall-item-name { font-weight: bold; }
- .wall-item-actions-author { float: left; width: 25%; margin-top: 0.5em; }
- .wall-item-actions-social { float: left; width: 50%; margin-top: 0.5em;
+ .wall-item-actions-author { float: left; width: 20em; margin-top: 0.5em; }
+ .wall-item-actions-social { float: left; margin-top: 0.5em;
a { margin-right: 3em; }
}
- .wall-item-actions-tools { float: right; width: 25%;
+ .wall-item-actions-tools { float: right; width: 15%;
a { float: right; }
input { float: right; }
}
}
-
.wall-item-container.comment {
margin-top: 50px;
.wall-item-photo { width: 32px; height: 32px; margin-left: 16px;}
@@ -345,3 +344,34 @@ section {
}
.wall-item-links { padding-left: 12px; }
}
+
+.wall-item-comment-wrapper {
+ margin: 30px 2em 2em 60px;
+ .comment-edit-photo { display: none; }
+ textarea {
+ height: 1em; width: 100%; font-size: 10px;
+ color: @CommentBoxEmptyColor;
+ border: 1px solid @CommentBoxEmptyBorderColor;
+ padding:0.3em;
+ }
+ .comment-edit-text-full {
+ font-size: 14px;
+ height: 4em;
+ color: @CommentBoxFullColor;
+ border: 1px solid @CommentBoxFullBorderColor;
+ }
+}
+
+#profile-jot-wrapper {
+ width: 100%;
+ margin: 0px 2em 20px 0px;
+
+
+}
+.profile-jot-text {
+ height: 1em; width: 100%; font-size: 10px;
+ color: @CommentBoxEmptyColor;
+ border: 1px solid @CommentBoxEmptyBorderColor;
+ padding:0.3em;
+}
+
diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css
index 4d9e12540..f3237801d 100644
--- a/view/theme/quattro/style.css
+++ b/view/theme/quattro/style.css
@@ -153,7 +153,7 @@
/* global */
body {
font-family: Liberation Sans, helvetica, arial, clean, sans-serif;
- font-size: 10px;
+ font-size: 12px;
background-color: #ffffff;
color: #2d2d2d;
margin: 50px 0px 0px 0px;
@@ -574,12 +574,11 @@ section {
}
.wall-item-container .wall-item-actions-author {
float: left;
- width: 25%;
+ width: 20em;
margin-top: 0.5em;
}
.wall-item-container .wall-item-actions-social {
float: left;
- width: 50%;
margin-top: 0.5em;
}
.wall-item-container .wall-item-actions-social a {
@@ -587,7 +586,7 @@ section {
}
.wall-item-container .wall-item-actions-tools {
float: right;
- width: 25%;
+ width: 15%;
}
.wall-item-container .wall-item-actions-tools a {
float: right;
@@ -610,3 +609,35 @@ section {
.wall-item-container.comment .wall-item-links {
padding-left: 12px;
}
+.wall-item-comment-wrapper {
+ margin: 30px 2em 2em 60px;
+}
+.wall-item-comment-wrapper .comment-edit-photo {
+ display: none;
+}
+.wall-item-comment-wrapper textarea {
+ height: 1em;
+ width: 100%;
+ font-size: 10px;
+ color: #999999;
+ border: 1px solid #999999;
+ padding: 0.3em;
+}
+.wall-item-comment-wrapper .comment-edit-text-full {
+ font-size: 14px;
+ height: 4em;
+ color: #2d2d2d;
+ border: 1px solid #2d2d2d;
+}
+#profile-jot-wrapper {
+ width: 100%;
+ margin: 0px 2em 20px 0px;
+}
+.profile-jot-text {
+ height: 1em;
+ width: 100%;
+ font-size: 10px;
+ color: #999999;
+ border: 1px solid #999999;
+ padding: 0.3em;
+}
diff --git a/view/wall_item.tpl b/view/wall_item.tpl
index 7db8b8697..cec5e5404 100644
--- a/view/wall_item.tpl
+++ b/view/wall_item.tpl
@@ -66,4 +66,6 @@
</div>
</div>
</div>
-
+<div class="wall-item-comment-wrapper" >
+ $comment
+</div>
diff --git a/view/wallwall_item.tpl b/view/wallwall_item.tpl
index 502bdda32..2429bc20f 100644
--- a/view/wallwall_item.tpl
+++ b/view/wallwall_item.tpl
@@ -1,58 +1,3 @@
-{#<div class="wall-item-outside-wrapper$indent wallwall" id="wall-item-outside-wrapper-$id" >
- <div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
- <div class="wall-item-info wallwall" id="wall-item-info-$id">
- <div class="wall-item-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$id" >
- <a href="$owner_url" target="redir" title="$olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$id">
- <img src="$owner_photo" class="wall-item-photo$osparkle" id="wall-item-ownerphoto-$id" style="height: 80px; width: 80px;" alt="$owner_name" /></a>
- </div>
- <div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$wall" /></div>
- <div class="wall-item-photo-wrapper mframe wwfrom" id="wall-item-photo-wrapper-$id"
- onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')"
- onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
- <a href="$profile_url" target="redir" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">
- <img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" style="height: 80px; width: 80px;" alt="$name" /></a>
- <span onclick="openClose('wall-item-photo-menu-$id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$id">menu</span>
- <div class="wall-item-photo-menu" id="wall-item-photo-menu-$id">
- <ul>
- $item_photo_menu
- </ul>
- </div>
-
- </div>
- <div class="wall-item-photo-end"></div>
- <div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
- $lock
- <div class="wall-item-location" id="wall-item-location-$id">$location</div>
- </div>
- </div>
- <div class="wall-item-author">
- <a href="$profile_url" target="redir" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a> $to <a href="$owner_url" target="redir" title="$olinktitle" class="wall-item-name-link"><span class="wall-item-name$osparkle" id="wall-item-ownername-$id">$owner_name</span></a> $vwall<br />
- <div class="wall-item-ago" id="wall-item-ago-$id">$ago</div>
- </div>
- <div class="wall-item-content" id="wall-item-content-$id" >
- <div class="wall-item-title" id="wall-item-title-$id">$title</div>
- <div class="wall-item-title-end"></div>
- <div class="wall-item-body" id="wall-item-body-$id" >$body</div>
- </div>
- <div class="wall-item-tools" id="wall-item-tools-$id">
- $vote
- $plink
- $edpost
- $star
- $drop
- </div>
- </div>
- <div class="wall-item-wrapper-end"></div>
- <div class="wall-item-like" id="wall-item-like-$id">$like</div>
- <div class="wall-item-dislike" id="wall-item-dislike-$id">$dislike</div>
- <div class="wall-item-comment-separator"></div>
- <div class="wall-item-comment-wrapper" >
- $comment
- </div>
-
-<div class="wall-item-outside-wrapper-end$indent" ></div>
-</div> #}
-
{{ if $indent }}{{ else }}
<div class="wall-item-decor">
<span class="icon s22 star $isstarred" id="starred-$id" title="$star.starred">$star.starred</span>
@@ -63,12 +8,12 @@
<div class="wall-item-container $indent">
<div class="wall-item-item">
<div class="wall-item-info">
- <div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$id" >
+ <div class="wall-item-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$id" >
<a href="$owner_url" target="redir" title="$olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$id">
<img src="$owner_photo" class="wall-item-photo$osparkle" id="wall-item-ownerphoto-$id" alt="$owner_name" />
</a>
</div>
- <div class="wall-item-photo-wrapper wwfrom"
+ <div class="wall-item-photo-wrapper mframe wwfrom"
onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')"
onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
<a href="$profile_url" target="redir" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">
@@ -128,3 +73,6 @@
</div>
</div>
</div>
+<div class="wall-item-comment-wrapper" >
+ $comment
+</div>
From 4d5580ab7781eea81dc4cb3d67b7376f49357bef Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Mon, 3 Oct 2011 09:38:58 +0200
Subject: [PATCH 25/46] fix typo
---
include/conversation.php | 22 +++++++++++-----------
view/conversation.tpl | 5 +++--
2 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/include/conversation.php b/include/conversation.php
index 64ad5d0b1..10b34ebe6 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -142,8 +142,8 @@ function conversation(&$a, $items, $mode, $update) {
// array with html for each thread (parent+comments)
- $treads = array();
- $treadsid = -1;
+ $threads = array();
+ $threadsid = -1;
if(count($items)) {
@@ -155,7 +155,7 @@ function conversation(&$a, $items, $mode, $update) {
$tpl = get_markup_template('search_item.tpl');
foreach($items as $item) {
- $treadsid++;
+ $threadsid++;
$comment = '';
$owner_url = '';
@@ -254,7 +254,7 @@ function conversation(&$a, $items, $mode, $update) {
$arr = array('item' => $item, 'output' => $tmp_item);
call_hooks('display_item', $arr);
- $treads[$treadsid] .= $arr['output'];
+ $threads[$threadsid] .= $arr['output'];
}
@@ -336,8 +336,8 @@ function conversation(&$a, $items, $mode, $update) {
$comments_seen = 0;
$comments_collapsed = false;
- $treadsid++;
- $treads[$treadsid] = "";
+ $threadsid++;
+ $threads[$threadsid] = "";
}
else {
// prevent private email from leaking into public conversation
@@ -351,7 +351,7 @@ function conversation(&$a, $items, $mode, $update) {
if(($comments[$item['parent']] > 2) && ($comments_seen <= ($comments[$item['parent']] - 2)) && ($item['gravity'] == 6)) {
if(! $comments_collapsed) {
- $treads[$treadsid] .= '<div class="ccollapse-wrapper fakelink" id="ccollapse-wrapper-' . $item['parent']
+ $threads[$threadsid] .= '<div class="ccollapse-wrapper fakelink" id="ccollapse-wrapper-' . $item['parent']
. '" onclick="openClose(' . '\'ccollapse-' . $item['parent'] . '\'); $(\'#ccollapse-wrapper-' . $item['parent'] . '\').hide();" >'
. sprintf( t('See all %d comments'), $comments[$item['parent']]) . '</div>'
. '<div class="ccollapse" id="ccollapse-' . $item['parent'] . '" style="display: none;" >';
@@ -359,7 +359,7 @@ function conversation(&$a, $items, $mode, $update) {
}
}
if(($comments[$item['parent']] > 2) && ($comments_seen == ($comments[$item['parent']] - 1))) {
- $treads[$treadsid] .= '</div>';
+ $threads[$threadsid] .= '</div>';
}
$redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
@@ -564,7 +564,7 @@ function conversation(&$a, $items, $mode, $update) {
$arr = array('item' => $item, 'output' => $tmp_item);
call_hooks('display_item', $arr);
- $treads[$treadsid] .= $arr['output'];
+ $threads[$threadsid] .= $arr['output'];
}
}
}
@@ -573,11 +573,11 @@ function conversation(&$a, $items, $mode, $update) {
// if author collapsing is in force but didn't get closed, close it off now.
/*if($blowhard_count >= 3)
- $treads[$treadsid] .= '</div>';*/
+ $threads[$threadsid] .= '</div>';*/
$page_template = get_markup_template("conversation.tpl");
$o .= replace_macros($page_template, array(
- '$treads' => $treads,
+ '$threads' => $threads,
'$dropping' => ($dropping?t('Delete Selected Items'):False),
));
diff --git a/view/conversation.tpl b/view/conversation.tpl
index e509ddb22..446814959 100644
--- a/view/conversation.tpl
+++ b/view/conversation.tpl
@@ -1,8 +1,9 @@
-{{ for $treads as $tread }}
+{{ for $threads as $thread }}
<div class="tread-wrapper">
- $tread
+ $thread
</div>
{{ endfor }}
+
{{ 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>
From 209958a58434ba7740f762ed2026e04254edbf9c Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Mon, 3 Oct 2011 09:39:41 +0200
Subject: [PATCH 26/46] move call to ping before call to update_*
---
js/main.js | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/js/main.js b/js/main.js
index e0694e47f..430f216d1 100644
--- a/js/main.js
+++ b/js/main.js
@@ -164,6 +164,15 @@
});
function NavUpdate() {
+ if(! stopped) {
+ $.get("ping",function(data) {
+ $(data).find('result').each(function() {
+ // send nav-update event
+ $('nav').trigger('nav-update', this);
+ });
+ }) ;
+ }
+
if($('#live-network').length) { src = 'network'; liveUpdate(); }
if($('#live-profile').length) { src = 'profile'; liveUpdate(); }
@@ -182,14 +191,6 @@
}
}
- if(! stopped) {
- $.get("ping",function(data) {
- $(data).find('result').each(function() {
- // send nav-update event
- $('nav').trigger('nav-update', this);
- });
- }) ;
- }
timer = setTimeout(NavUpdate,30000);
}
From 60147d893cc367b56d23971c2483deeb91a19759 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 3 Oct 2011 01:58:01 -0700
Subject: [PATCH 27/46] ?f did not have = after it
---
mod/search.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mod/search.php b/mod/search.php
index 396b50738..034794e17 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -13,7 +13,7 @@ function search_saved_searches() {
$o .= '<h3>' . t('Saved Searches') . '</h3>' . "\r\n";
$o .= '<ul id="saved-search-ul">' . "\r\n";
foreach($r as $rr) {
- $o .= '<li class="saved-search-li clear"><a href="search/?f=&remove=1&search=' . $rr['term'] . '" class="icon drophide savedsearchdrop" title="' . t('Remove term') . '" onclick="return confirmDelete();" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a> <a href="search/?f&search=' . $rr['term'] . '" class="savedsearchterm" >' . $rr['term'] . '</a></li>' . "\r\n";
+ $o .= '<li class="saved-search-li clear"><a href="search/?f=&remove=1&search=' . $rr['term'] . '" class="icon drophide savedsearchdrop" title="' . t('Remove term') . '" onclick="return confirmDelete();" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a> <a href="search/?f=&search=' . $rr['term'] . '" class="savedsearchterm" >' . $rr['term'] . '</a></li>' . "\r\n";
}
$o .= '</ul></div>' . "\r\n";
}
From 70911731313d58458e48a50e76c4b3b8a4d2c934 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 3 Oct 2011 02:39:19 -0700
Subject: [PATCH 28/46] removing another potential way a post could have a zero
parent.
---
mod/item.php | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/mod/item.php b/mod/item.php
index e5d4eea82..b8c0683aa 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -779,6 +779,11 @@ function item_post(&$a) {
}
}
+ // fallback so that parent always gets set to non-zero.
+
+ if(! $parent)
+ $parent = $post_id;
+
$r = q("UPDATE `item` SET `parent` = %d, `parent-uri` = '%s', `plink` = '%s', `changed` = '%s', `last-child` = 1, `visible` = 1
WHERE `id` = %d LIMIT 1",
intval($parent),
From 8edab8067390a5f565f6abb889ec8dd1b18583d4 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 3 Oct 2011 05:10:15 -0700
Subject: [PATCH 29/46] add tagmatch
---
mod/tagmatch.php | 54 ++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 54 insertions(+)
create mode 100644 mod/tagmatch.php
diff --git a/mod/tagmatch.php b/mod/tagmatch.php
new file mode 100644
index 000000000..b2313694b
--- /dev/null
+++ b/mod/tagmatch.php
@@ -0,0 +1,54 @@
+<?php
+
+
+function tagmatch_content(&$a) {
+
+ $search = $_REQUEST['search'];
+
+ $o = '';
+ if(! local_user())
+ return;
+
+ $o .= '<h2>' . t('Tag Match') . ' - ' . notags($search) . '</h2>';
+
+
+ if($search) {
+ $params['s'] = $search;
+ if($a->pager['page'] != 1)
+ $params['p'] = $a->pager['page'];
+
+ if(strlen(get_config('system','directory_submit_url')))
+ $x = fetch_url('http://dir.friendika.com/lsearch?f=&search=' . urlencode($search));
+// else
+// $x = post_url($a->get_baseurl() . '/msearch', $params);
+
+ $j = json_decode($x);
+
+ if($j->total) {
+ $a->set_pager_total($j->total);
+ $a->set_pager_itemspage($j->items_page);
+ }
+
+ if(count($j->results)) {
+
+ $tpl = get_markup_template('match.tpl');
+ foreach($j->results as $jj) {
+
+ $o .= replace_macros($tpl,array(
+ '$url' => $jj->url,
+ '$name' => $jj->name,
+ '$photo' => $jj->photo,
+ '$tags' => $jj->tags
+ ));
+ }
+ }
+ else {
+ info( t('No matches') . EOL);
+ }
+
+ }
+
+ $o .= '<div class="clear"></div>';
+ $o .= paginate($a);
+ return $o;
+}
From c6ac4387350eefce8ba68485c49ba8da60ff437b Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 3 Oct 2011 06:04:17 -0700
Subject: [PATCH 30/46] item_store: prevent storing a duplicate item with same
uri+uid
---
include/items.php | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/include/items.php b/include/items.php
index 32f0728c3..d907aeddb 100644
--- a/include/items.php
+++ b/include/items.php
@@ -807,6 +807,14 @@ function item_store($arr,$force_parent = false) {
}
}
+ $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+ dbesc($arr['uri']),
+ dbesc($arr['uid'])
+ );
+ if($r && count($r)) {
+ logger('item-store: duplicate item ignored. ' . print_r($arr,true));
+ return 0;
+ }
call_hooks('post_remote',$arr);
From dfd5cc57c2134067dc6229b8583b5e808f160004 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 3 Oct 2011 14:47:18 -0700
Subject: [PATCH 31/46] tagmatch available to anon, add paging variable to
query
---
boot.php | 2 +-
mod/tagmatch.php | 18 ++++++++----------
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/boot.php b/boot.php
index 471231820..770667177 100644
--- a/boot.php
+++ b/boot.php
@@ -8,7 +8,7 @@ require_once("include/pgettext.php");
require_once('include/nav.php');
define ( 'FRIENDIKA_PLATFORM', 'Free Friendika');
-define ( 'FRIENDIKA_VERSION', '2.3.1122' );
+define ( 'FRIENDIKA_VERSION', '2.3.1123' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1094 );
diff --git a/mod/tagmatch.php b/mod/tagmatch.php
index b2313694b..8023fa433 100644
--- a/mod/tagmatch.php
+++ b/mod/tagmatch.php
@@ -3,24 +3,22 @@
function tagmatch_content(&$a) {
- $search = $_REQUEST['search'];
+ $search = notags(trim($_REQUEST['search']));
$o = '';
- if(! local_user())
- return;
-
- $o .= '<h2>' . t('Tag Match') . ' - ' . notags($search) . '</h2>';
+ $o .= '<h2>' . t('Tag Match') . ' - ' . $search . '</h2>';
if($search) {
- $params['s'] = $search;
- if($a->pager['page'] != 1)
- $params['p'] = $a->pager['page'];
+
+ $p = (($a->pager['page'] != 1) ? '&p=' . $a->pager['page'] : '');
if(strlen(get_config('system','directory_submit_url')))
- $x = fetch_url('http://dir.friendika.com/lsearch?f=&search=' . urlencode($search));
+ $x = fetch_url('http://dir.friendika.com/lsearch?f=' . $p . '&search=' . urlencode($search));
+
+//TODO fallback local search if global dir not available.
// else
-// $x = post_url($a->get_baseurl() . '/msearch', $params);
+// $x = post_url($a->get_baseurl() . '/lsearch', $params);
$j = json_decode($x);
From 3deaafe320e43927f0b784ccbd25b7b8caf001f2 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 4 Oct 2011 01:47:19 -0700
Subject: [PATCH 32/46] lrdd attributes for zot changed
---
zot.txt | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/zot.txt b/zot.txt
index b160788e7..2c3bbb180 100644
--- a/zot.txt
+++ b/zot.txt
@@ -132,10 +132,11 @@ contain commas. There MAY be any number of ASCII space characters between
entries for legibility. Header lines are terminated with a linefeed character
(ASCII 0x0A).
-This specification provides the following foreign protocol address prefixes
+This specification provides the following protocol address prefixes
for use in Z-To: or Z-Bcc: elements:
zot: - normal zot delivery using webfinger or LRDD resolvable address
+dfrn: - legacy DFRN mode delivery using webfinger or LRDD resovable address
ostatus: - normal OStatus delivery using webfinger or LRDD resovable address
diaspora: - Diaspora network delivery using webfinger address
facebook: - Facebook profile page URL
@@ -253,15 +254,12 @@ This specification is subject to change. The current version which is in
effect at a given site may be noted by XRD properties. The following
properties MUST be present in the XRD providing the relevant endpoint:
-<Property xmlns:zot="http://purl.og/zot/1.0"
- type="http://purl.org/zot/1.0/version"
- zot:version="1" />
+<Property type="http://purl.org/zot/1.0/version">1</Property>
+<Property type="http://purl.org/zot/1.0/accept">application/atom+xml</Property>
-<Property xmlns:zot="http://purl.og/zot/1.0"
- type="http://purl.org/zot/1.0/accept"
- zot:accept="application/atom+xml" />
Version is specified in this document and indicates the current revision.
+Version is an increasing non-zero integer value. There are no minor versions.
Implementations MAY provide compatibility to multiple incompatible versions
by using this version indication. The "accept" indicates a range of document
content types which may be enclosed in the underlying salmon magic envelope.
From c0cda02963a880f1f01f60c47040c425231f19d5 Mon Sep 17 00:00:00 2001
From: Olivier Migeot <olivier@migeot.org>
Date: Tue, 4 Oct 2011 12:06:01 +0200
Subject: [PATCH 33/46] Updated french locale.
---
view/fr/messages.po | 1292 ++++++++++++++++++++++++++++++-------------
view/fr/strings.php | 73 ++-
2 files changed, 971 insertions(+), 394 deletions(-)
diff --git a/view/fr/messages.po b/view/fr/messages.po
index c31197d40..00a1d5462 100644
--- a/view/fr/messages.po
+++ b/view/fr/messages.po
@@ -6,19 +6,18 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 2.2.1081\n"
+"Project-Id-Version: 2.3.1123\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-24 15:28+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-10-04 11:11+0200\n"
+"PO-Revision-Date: 2011-10-04 12:05:+0200\n"
+"Last-Translator: Olivier Migeot <olivier@migeot.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
+# "Plural-Forms: nplurals=2; plural=(n != 1)\n"
#: ../../include/auth.php:27
msgid "Logged out."
msgstr "Déconnecté."
@@ -29,12 +28,15 @@ msgstr "Déconnecté."
#: ../../include/auth.php:192 ../../mod/openid.php:118
#: ../../include/auth.php:120 ../../include/auth.php:145
#: ../../include/auth.php:198 ../../mod/openid.php:122
+#: ../../include/auth.php:121 ../../include/auth.php:146
+#: ../../include/auth.php:200 ../../mod/openid.php:63 ../../mod/openid.php:123
msgid "Login failed."
msgstr "Échec de connexion."
#: ../../include/auth.php:194 ../../mod/openid.php:73
#: ../../include/auth.php:212 ../../mod/openid.php:82
-#: ../../include/auth.php:218
+#: ../../include/auth.php:218 ../../include/auth.php:220
+#: ../../mod/openid.php:83
msgid "Welcome back "
msgstr "Bienvenue à nouveau, "
@@ -57,7 +59,10 @@ msgstr "Bienvenue à nouveau, "
#: ../../mod/photos.php:890 ../../mod/photos.php:1278
#: ../../mod/photos.php:1289 ../../mod/photos.php:45 ../../mod/photos.php:143
#: ../../mod/photos.php:857 ../../mod/photos.php:926 ../../mod/photos.php:941
-#: ../../mod/photos.php:1332 ../../mod/photos.php:1344
+#: ../../mod/photos.php:1332 ../../mod/photos.php:1344 ../../mod/photos.php:50
+#: ../../mod/photos.php:144 ../../mod/photos.php:862 ../../mod/photos.php:932
+#: ../../mod/photos.php:947 ../../mod/photos.php:1347
+#: ../../mod/photos.php:1359
msgid "Contact Photos"
msgstr "Photos du contact"
@@ -77,7 +82,8 @@ msgstr "Groupes"
#: ../../include/nav.php:117 ../../mod/contacts.php:321
#: ../../include/acl_selectors.php:141 ../../include/acl_selectors.php:156
#: ../../include/nav.php:110 ../../mod/contacts.php:322
-#: ../../mod/contacts.php:358
+#: ../../mod/contacts.php:358 ../../include/nav.php:128
+#: ../../mod/contacts.php:350
msgid "Contacts"
msgstr "Contacts"
@@ -187,7 +193,7 @@ msgstr "Fétichiste"
#: ../../include/profile_selectors.php:19
msgid "Oodles"
-msgstr "Oodles"
+msgstr ""
#: ../../include/profile_selectors.php:19
msgid "Nonsexual"
@@ -231,7 +237,7 @@ msgstr "Amis par intérêt"
#: ../../include/profile_selectors.php:33
msgid "Casual"
-msgstr "Casual"
+msgstr "Relation informelle"
#: ../../include/profile_selectors.php:33
msgid "Engaged"
@@ -243,7 +249,7 @@ msgstr "Marié"
#: ../../include/profile_selectors.php:33
msgid "Partners"
-msgstr "Partenaire"
+msgstr "Avec partenaire"
#: ../../include/profile_selectors.php:33
msgid "Cohabiting"
@@ -322,36 +328,44 @@ msgid "Reputable, has my trust"
msgstr "Réputé, a toute ma confiance"
#: ../../include/contact_selectors.php:55
+#: ../../include/contact_selectors.php:56
msgid "Frequently"
msgstr "Fréquemment"
#: ../../include/contact_selectors.php:56
+#: ../../include/contact_selectors.php:57
msgid "Hourly"
msgstr "Toutes les heures"
#: ../../include/contact_selectors.php:57
+#: ../../include/contact_selectors.php:58
msgid "Twice daily"
msgstr "Deux fois par jour"
#: ../../include/contact_selectors.php:58
+#: ../../include/contact_selectors.php:59
msgid "Daily"
msgstr "Chaque jour"
#: ../../include/contact_selectors.php:59
+#: ../../include/contact_selectors.php:60
msgid "Weekly"
msgstr "Chaque semaine"
#: ../../include/contact_selectors.php:60
+#: ../../include/contact_selectors.php:61
msgid "Monthly"
msgstr "Chaque mois"
#: ../../include/group.php:130 ../../include/group.php:145
#: ../../include/group.php:146 ../../include/group.php:147
+#: ../../include/group.php:165
msgid "Create a new group"
msgstr "Créer un nouveau groupe"
#: ../../include/group.php:131 ../../include/group.php:146
#: ../../include/group.php:147 ../../include/group.php:148
+#: ../../include/group.php:166
msgid "Everybody"
msgstr "Tout le monde"
@@ -435,6 +449,7 @@ msgstr " auparavant"
#: ../../include/items.php:1027 ../../include/items.php:1073
#: ../../include/profile_advanced.php:36 ../../include/items.php:1071
#: ../../include/items.php:1072 ../../include/items.php:1155
+#: ../../include/items.php:1215
msgid "Birthday:"
msgstr "Anniversaire:"
@@ -442,14 +457,15 @@ msgstr "Anniversaire:"
#: ../../include/items.php:1411 ../../mod/dfrn_request.php:538
#: ../../include/items.php:1409 ../../include/items.php:1426
#: ../../mod/dfrn_request.php:542 ../../include/items.php:1537
-#: ../../mod/dfrn_request.php:539
+#: ../../mod/dfrn_request.php:539 ../../include/items.php:1610
+#: ../../mod/dfrn_request.php:540
#, fuzzy
msgid "[Name Withheld]"
msgstr "[Nom non-publié]"
#: ../../include/items.php:1371 ../../include/items.php:1418
#: ../../include/items.php:1416 ../../include/items.php:1433
-#: ../../include/items.php:1544
+#: ../../include/items.php:1544 ../../include/items.php:1617
#, fuzzy
msgid "You have a new follower at "
msgstr "Vous avez un nouvel abonné à "
@@ -476,18 +492,22 @@ msgstr "Vous avez un nouvel abonné à "
#: ../../mod/lostpass.php:44 ../../mod/lostpass.php:106
#: ../../mod/regmod.php:54 ../../mod/dfrn_notify.php:294
#: ../../mod/dfrn_notify.php:552 ../../mod/dfrn_request.php:548
+#: ../../include/items.php:1619 ../../mod/dfrn_confirm.php:702
+#: ../../mod/dfrn_request.php:549
msgid "Administrator"
msgstr "Administrateur"
#: ../../include/dba.php:31
#, fuzzy, php-format
msgid "Cannot locate DNS info for database server '%s'"
-msgstr "Impossible de localiser les informations DNS pour le serveur de base de données '%s'"
+msgstr ""
+"Impossible de localiser les informations DNS pour le serveur de base de "
+"données '%s'"
#: ../../include/nav.php:38 ../../boot.php:837 ../../boot.php:839
#: ../../include/nav.php:39 ../../boot.php:842 ../../boot.php:854
#: ../../boot.php:855 ../../include/nav.php:41 ../../boot.php:865
-#: ../../boot.php:667
+#: ../../boot.php:667 ../../include/nav.php:44 ../../boot.php:673
msgid "Logout"
msgstr "Se déconnecter"
@@ -495,13 +515,15 @@ msgstr "Se déconnecter"
#: ../../boot.php:819 ../../boot.php:825 ../../include/nav.php:45
#: ../../boot.php:822 ../../boot.php:828 ../../boot.php:834 ../../boot.php:840
#: ../../boot.php:835 ../../boot.php:841 ../../boot.php:843 ../../boot.php:849
-#: ../../boot.php:645 ../../boot.php:651
+#: ../../boot.php:645 ../../boot.php:651 ../../include/nav.php:62
+#: ../../boot.php:657
msgid "Login"
msgstr "Connexion"
#: ../../include/nav.php:56 ../../include/nav.php:91 ../../include/nav.php:57
#: ../../include/nav.php:92 ../../include/nav.php:98 ../../include/nav.php:97
-#: ../../include/nav.php:55 ../../include/nav.php:93
+#: ../../include/nav.php:55 ../../include/nav.php:93 ../../include/nav.php:73
+#: ../../include/nav.php:111
msgid "Home"
msgstr "Accueil"
@@ -510,12 +532,14 @@ msgstr "Accueil"
#: ../../boot.php:814 ../../boot.php:826 ../../boot.php:827
#: ../../mod/register.php:466 ../../include/nav.php:59
#: ../../mod/register.php:471 ../../boot.php:835 ../../mod/register.php:529
-#: ../../boot.php:637
+#: ../../boot.php:637 ../../include/nav.php:77 ../../mod/register.php:528
+#: ../../boot.php:643
msgid "Register"
msgstr "S'inscrire"
#: ../../include/nav.php:64 ../../include/nav.php:65 ../../include/nav.php:71
#: ../../include/nav.php:70 ../../include/nav.php:68 ../../include/nav.php:67
+#: ../../include/nav.php:85
#, fuzzy
msgid "Apps"
msgstr "Applications"
@@ -526,45 +550,50 @@ msgstr "Applications"
#: ../../boot.php:2093 ../../mod/search.php:21 ../../boot.php:2042
#: ../../include/nav.php:73 ../../include/nav.php:71 ../../mod/search.php:26
#: ../../boot.php:2060 ../../include/text.php:610 ../../include/nav.php:69
+#: ../../include/text.php:623 ../../include/nav.php:87 ../../mod/search.php:83
msgid "Search"
msgstr "Recherche"
#: ../../include/nav.php:77 ../../include/nav.php:78 ../../include/nav.php:84
-#: ../../include/nav.php:83 ../../include/nav.php:81
+#: ../../include/nav.php:83 ../../include/nav.php:81 ../../include/nav.php:99
msgid "Directory"
msgstr "Annuaire"
#: ../../include/nav.php:87 ../../include/nav.php:88 ../../include/nav.php:94
-#: ../../include/nav.php:93 ../../include/nav.php:91
+#: ../../include/nav.php:93 ../../include/nav.php:91 ../../include/nav.php:109
msgid "Network"
msgstr "Réseau"
#: ../../include/nav.php:96 ../../include/nav.php:97 ../../include/nav.php:103
#: ../../include/nav.php:102 ../../include/nav.php:99
+#: ../../include/nav.php:117
msgid "Notifications"
msgstr "Notifications"
#: ../../include/nav.php:100 ../../mod/message.php:125
#: ../../include/nav.php:101 ../../include/nav.php:107
#: ../../include/nav.php:106 ../../include/nav.php:102
-#: ../../mod/message.php:51
+#: ../../mod/message.php:51 ../../include/nav.php:120 ../../mod/message.php:58
msgid "Messages"
msgstr "Messages"
#: ../../include/nav.php:104 ../../include/nav.php:105
#: ../../include/nav.php:111 ../../include/nav.php:110
+#: ../../include/nav.php:123
#, fuzzy
msgid "Manage"
msgstr "Gérer"
#: ../../include/nav.php:107 ../../include/nav.php:108
#: ../../include/nav.php:114 ../../include/nav.php:113 ../../mod/admin.php:554
+#: ../../include/nav.php:126 ../../mod/admin.php:558
msgid "Settings"
msgstr "Réglages"
#: ../../include/nav.php:109 ../../include/nav.php:110
#: ../../mod/profiles.php:456 ../../include/nav.php:116
#: ../../include/nav.php:115 ../../mod/profiles.php:458
+#: ../../include/nav.php:127 ../../boot.php:870
msgid "Profiles"
msgstr "Profils"
@@ -613,7 +642,9 @@ msgstr ""
#: ../../mod/invite.php:81 ../../mod/fsuggest.php:78 ../../mod/attach.php:33
#: ../../mod/photos.php:122 ../../mod/photos.php:849
#: ../../mod/notifications.php:62 ../../mod/contacts.php:132
-#: ../../index.php:266
+#: ../../index.php:266 ../../include/items.php:2050 ../../mod/events.php:109
+#: ../../mod/item.php:113 ../../mod/crepair.php:56 ../../mod/photos.php:123
+#: ../../mod/photos.php:854 ../../mod/contacts.php:125 ../../index.php:279
msgid "Permission denied."
msgstr "Permission refusée."
@@ -689,11 +720,18 @@ msgstr "Poster sur Facebook par défaut"
#: ../../mod/photos.php:877 ../../mod/photos.php:934 ../../mod/photos.php:1144
#: ../../mod/photos.php:1184 ../../mod/photos.php:1223
#: ../../mod/photos.php:1254 ../../mod/contacts.php:298
+#: ../../include/conversation.php:434 ../../mod/localtime.php:45
+#: ../../mod/admin.php:303 ../../mod/admin.php:468 ../../mod/admin.php:594
+#: ../../mod/admin.php:659 ../../mod/events.php:340 ../../mod/crepair.php:104
+#: ../../mod/photos.php:882 ../../mod/photos.php:940 ../../mod/photos.php:1159
+#: ../../mod/photos.php:1199 ../../mod/photos.php:1238
+#: ../../mod/photos.php:1269 ../../mod/contacts.php:292
msgid "Submit"
msgstr "Envoyer"
#: ../../addon/facebook/facebook.php:174 ../../addon/facebook/facebook.php:354
#: ../../addon/facebook/facebook.php:423
+#: ../../include/contact_selectors.php:78
#, fuzzy
msgid "Facebook"
msgstr "Facebook"
@@ -975,6 +1013,7 @@ msgstr "Déposer des fichiers ici pour les téléverser"
#: ../../mod/tagrm.php:94 ../../mod/dfrn_request.php:628
#: ../../mod/dfrn_request.php:630 ../../mod/dfrn_request.php:644
#: ../../addon/js_upload/js_upload.php:45 ../../mod/dfrn_request.php:642
+#: ../../mod/dfrn_request.php:651
msgid "Cancel"
msgstr "Annuler"
@@ -1003,7 +1042,7 @@ msgstr "Le fichier téléversé est trop volumineux"
#: ../../addon/js_upload/js_upload.php:306 ../../mod/photos.php:559
#: ../../mod/photos.php:563 ../../addon/js_upload/js_upload.php:310
-#: ../../mod/photos.php:608
+#: ../../mod/photos.php:608 ../../mod/photos.php:613
msgid "Image exceeds size limit of "
msgstr "L'image dépasse la taille maximale de "
@@ -1068,7 +1107,7 @@ msgid "Age: "
msgstr "Age: "
#: ../../mod/profiles.php:422 ../../mod/profiles.php:470
-#: ../../mod/profiles.php:468
+#: ../../mod/profiles.php:468 ../../boot.php:887
msgid "Profile Image"
msgstr "Image du profil"
@@ -1079,6 +1118,7 @@ msgstr "L'image excède la taille limite de %d"
#: ../../mod/wall_upload.php:65 ../../mod/profile_photo.php:118
#: ../../mod/photos.php:571 ../../mod/photos.php:575 ../../mod/photos.php:630
+#: ../../mod/photos.php:635
msgid "Unable to process image."
msgstr "Impossible de traiter l'image."
@@ -1086,7 +1126,7 @@ msgstr "Impossible de traiter l'image."
#: ../../mod/wall_upload.php:95 ../../mod/message.php:93
#: ../../mod/item.php:212 ../../mod/item.php:214 ../../include/message.php:82
#: ../../mod/wall_upload.php:81 ../../mod/wall_upload.php:90
-#: ../../mod/wall_upload.php:97 ../../mod/item.php:296
+#: ../../mod/wall_upload.php:97 ../../mod/item.php:296 ../../mod/item.php:299
msgid "Wall Photos"
msgstr "Photos du mur"
@@ -1094,7 +1134,8 @@ msgstr "Photos du mur"
#: ../../mod/photos.php:589 ../../mod/profile_photo.php:232
#: ../../mod/profile_photo.php:236 ../../mod/profile_photo.php:241
#: ../../mod/photos.php:593 ../../mod/wall_upload.php:84
-#: ../../mod/photos.php:650
+#: ../../mod/photos.php:650 ../../mod/profile_photo.php:247
+#: ../../mod/photos.php:655
#, fuzzy
msgid "Image upload failed."
msgstr "Le téléversement de l'image a échoué."
@@ -1167,7 +1208,9 @@ msgstr "Une erreur est survenue lors de l'inscription. Merci de recommencer."
#: ../../mod/register.php:216 ../../mod/register.php:234
#: ../../mod/register.php:237 ../../mod/register.php:265
msgid "An error occurred creating your default profile. Please try again."
-msgstr "Une erreur est survenue lors de la création de votre profil par défaut. Merci de recommencer."
+msgstr ""
+"Une erreur est survenue lors de la création de votre profil par défaut. "
+"Merci de recommencer."
#: ../../mod/register.php:267 ../../mod/register.php:274
#: ../../mod/register.php:281 ../../mod/profile_photo.php:58
@@ -1186,7 +1229,10 @@ msgstr "Une erreur est survenue lors de la création de votre profil par défaut
#: ../../mod/photos.php:890 ../../mod/register.php:316
#: ../../mod/register.php:323 ../../mod/register.php:330
#: ../../mod/photos.php:143 ../../mod/photos.php:577 ../../mod/photos.php:926
-#: ../../mod/photos.php:941
+#: ../../mod/photos.php:941 ../../mod/profile_photo.php:166
+#: ../../mod/profile_photo.php:242 ../../mod/profile_photo.php:251
+#: ../../mod/photos.php:144 ../../mod/photos.php:579 ../../mod/photos.php:932
+#: ../../mod/photos.php:947
msgid "Profile Photos"
msgstr "Photos du profil"
@@ -1273,7 +1319,7 @@ msgstr "Inclure votre profil dans l'annuaire des membres?"
#: ../../mod/profiles.php:354 ../../mod/register.php:498
#: ../../mod/settings.php:415 ../../mod/settings.php:421
#: ../../mod/settings.php:429 ../../mod/settings.php:433
-#: ../../mod/dfrn_request.php:632
+#: ../../mod/dfrn_request.php:632 ../../mod/dfrn_request.php:641
msgid "Yes"
msgstr "Oui"
@@ -1286,7 +1332,7 @@ msgstr "Oui"
#: ../../mod/profiles.php:355 ../../mod/register.php:499
#: ../../mod/settings.php:415 ../../mod/settings.php:421
#: ../../mod/settings.php:429 ../../mod/settings.php:433
-#: ../../mod/dfrn_request.php:633
+#: ../../mod/dfrn_request.php:633 ../../mod/dfrn_request.php:642
msgid "No"
msgstr "Non"
@@ -1313,26 +1359,27 @@ msgstr ""
#: ../../mod/register.php:431 ../../mod/register.php:449
#: ../../mod/register.php:452 ../../mod/register.php:457
#: ../../mod/register.php:515 ../../mod/admin.php:301
+#: ../../mod/register.php:514 ../../mod/admin.php:304
msgid "Registration"
msgstr "Inscription"
#: ../../mod/register.php:439 ../../mod/register.php:457
#: ../../mod/register.php:460 ../../mod/register.php:465
-#: ../../mod/register.php:523
+#: ../../mod/register.php:523 ../../mod/register.php:522
#, fuzzy
msgid "Your Full Name (e.g. Joe Smith): "
msgstr "Votre nom complet (p.ex. Michel Dupont): "
#: ../../mod/register.php:440 ../../mod/register.php:458
#: ../../mod/register.php:461 ../../mod/register.php:466
-#: ../../mod/register.php:524
+#: ../../mod/register.php:524 ../../mod/register.php:523
#, fuzzy
msgid "Your Email Address: "
msgstr "Votre adresse courriel: "
#: ../../mod/register.php:441 ../../mod/register.php:459
#: ../../mod/register.php:462 ../../mod/register.php:467
-#: ../../mod/register.php:525
+#: ../../mod/register.php:525 ../../mod/register.php:524
#, fuzzy
msgid ""
"Choose a profile nickname. This must begin with a text character. Your "
@@ -1344,11 +1391,11 @@ msgstr ""
#: ../../mod/register.php:442 ../../mod/register.php:460
#: ../../mod/register.php:463 ../../mod/register.php:468
-#: ../../mod/register.php:526
+#: ../../mod/register.php:526 ../../mod/register.php:525
msgid "Choose a nickname: "
msgstr "Choisir un pseudo: "
-#: ../../mod/apps.php:6
+#: ../../mod/apps.php:6 ../../mod/apps.php:4
#, fuzzy
msgid "Applications"
msgstr "Applications"
@@ -1367,6 +1414,7 @@ msgstr "Vue des nouveautés"
#: ../../mod/profile.php:130 ../../mod/network.php:75
#: ../../mod/profile.php:131 ../../include/conversation.php:674
#: ../../include/conversation.php:699 ../../mod/message.php:98
+#: ../../include/conversation.php:747 ../../mod/message.php:108
#, fuzzy
msgid "Please enter a link URL:"
msgstr "Entrez un lien web:"
@@ -1375,7 +1423,7 @@ msgstr "Entrez un lien web:"
#: ../../mod/profile.php:138 ../../mod/mprofile.php:137
#: ../../mod/network.php:78 ../../mod/profile.php:131 ../../mod/network.php:76
#: ../../mod/profile.php:132 ../../include/conversation.php:675
-#: ../../include/conversation.php:700
+#: ../../include/conversation.php:700 ../../include/conversation.php:748
#, fuzzy
msgid "Please enter a YouTube link:"
msgstr "Entrez un lien Youtube:"
@@ -1384,7 +1432,7 @@ msgstr "Entrez un lien Youtube:"
#: ../../mod/profile.php:139 ../../mod/mprofile.php:138
#: ../../mod/network.php:79 ../../mod/profile.php:132 ../../mod/network.php:77
#: ../../mod/profile.php:133 ../../include/conversation.php:676
-#: ../../include/conversation.php:701
+#: ../../include/conversation.php:701 ../../include/conversation.php:749
#, fuzzy
msgid "Please enter a video(.ogg) link/URL:"
msgstr "Entrez un lien vidéo (.ogg):"
@@ -1393,7 +1441,7 @@ msgstr "Entrez un lien vidéo (.ogg):"
#: ../../mod/profile.php:140 ../../mod/mprofile.php:139
#: ../../mod/network.php:80 ../../mod/profile.php:133 ../../mod/network.php:78
#: ../../mod/profile.php:134 ../../include/conversation.php:677
-#: ../../include/conversation.php:702
+#: ../../include/conversation.php:702 ../../include/conversation.php:750
#, fuzzy
msgid "Please enter an audio(.ogg) link/URL:"
msgstr "Entrez un lien audio (.ogg):"
@@ -1402,7 +1450,7 @@ msgstr "Entrez un lien audio (.ogg):"
#: ../../mod/profile.php:141 ../../mod/mprofile.php:140
#: ../../mod/network.php:81 ../../mod/profile.php:134 ../../mod/network.php:79
#: ../../mod/profile.php:135 ../../include/conversation.php:678
-#: ../../include/conversation.php:703
+#: ../../include/conversation.php:703 ../../include/conversation.php:751
#, fuzzy
msgid "Where are you right now?"
msgstr "Où êtes-vous présentemment?"
@@ -1422,6 +1470,7 @@ msgstr "Où êtes-vous présentemment?"
#: ../../include/conversation.php:359 ../../include/conversation.php:718
#: ../../mod/photos.php:1111 ../../include/conversation.php:392
#: ../../include/conversation.php:746 ../../mod/photos.php:1164
+#: ../../include/conversation.php:794 ../../mod/photos.php:1179
#, fuzzy
msgid "Share"
msgstr "Partager"
@@ -1436,7 +1485,8 @@ msgstr "Partager"
#: ../../mod/profile.php:160 ../../include/conversation.php:719
#: ../../mod/editpost.php:89 ../../include/conversation.php:747
#: ../../mod/message.php:114 ../../mod/message.php:248
-#: ../../mod/editpost.php:91
+#: ../../mod/editpost.php:91 ../../include/conversation.php:795
+#: ../../mod/message.php:124 ../../mod/message.php:257
msgid "Upload photo"
msgstr "Joindre photo"
@@ -1450,7 +1500,8 @@ msgstr "Joindre photo"
#: ../../mod/profile.php:161 ../../include/conversation.php:720
#: ../../mod/editpost.php:90 ../../include/conversation.php:749
#: ../../mod/message.php:115 ../../mod/message.php:249
-#: ../../mod/editpost.php:93
+#: ../../mod/editpost.php:93 ../../include/conversation.php:797
+#: ../../mod/message.php:125 ../../mod/message.php:258
msgid "Insert web link"
msgstr "Insérer lien web"
@@ -1461,7 +1512,7 @@ msgstr "Insérer lien web"
#: ../../mod/profile.php:161 ../../mod/network.php:106
#: ../../mod/profile.php:162 ../../include/conversation.php:721
#: ../../mod/editpost.php:91 ../../include/conversation.php:750
-#: ../../mod/editpost.php:94
+#: ../../mod/editpost.php:94 ../../include/conversation.php:798
#, fuzzy
msgid "Insert YouTube video"
msgstr "Insérer une vidéo Youtube"
@@ -1473,7 +1524,7 @@ msgstr "Insérer une vidéo Youtube"
#: ../../mod/profile.php:162 ../../mod/network.php:107
#: ../../mod/profile.php:163 ../../include/conversation.php:722
#: ../../mod/editpost.php:92 ../../include/conversation.php:751
-#: ../../mod/editpost.php:95
+#: ../../mod/editpost.php:95 ../../include/conversation.php:799
#, fuzzy
msgid "Insert Vorbis [.ogg] video"
msgstr "Insérer un lien vidéo Vorbis [.ogg]"
@@ -1485,7 +1536,7 @@ msgstr "Insérer un lien vidéo Vorbis [.ogg]"
#: ../../mod/profile.php:163 ../../mod/network.php:108
#: ../../mod/profile.php:164 ../../include/conversation.php:723
#: ../../mod/editpost.php:93 ../../include/conversation.php:752
-#: ../../mod/editpost.php:96
+#: ../../mod/editpost.php:96 ../../include/conversation.php:800
#, fuzzy
msgid "Insert Vorbis [.ogg] audio"
msgstr "Insérer un lien audio Vorbis [.ogg]"
@@ -1497,7 +1548,7 @@ msgstr "Insérer un lien audio Vorbis [.ogg]"
#: ../../mod/profile.php:164 ../../mod/network.php:109
#: ../../mod/profile.php:165 ../../include/conversation.php:724
#: ../../mod/editpost.php:94 ../../include/conversation.php:753
-#: ../../mod/editpost.php:97
+#: ../../mod/editpost.php:97 ../../include/conversation.php:801
#, fuzzy
msgid "Set your location"
msgstr "Définir votre localisation"
@@ -1509,7 +1560,7 @@ msgstr "Définir votre localisation"
#: ../../mod/profile.php:165 ../../mod/network.php:110
#: ../../mod/profile.php:166 ../../include/conversation.php:725
#: ../../mod/editpost.php:95 ../../include/conversation.php:754
-#: ../../mod/editpost.php:98
+#: ../../mod/editpost.php:98 ../../include/conversation.php:802
#, fuzzy
msgid "Clear browser location"
msgstr "Effacer la localisation du navigateur"
@@ -1533,7 +1584,10 @@ msgstr "Effacer la localisation du navigateur"
#: ../../mod/editpost.php:96 ../../include/conversation.php:393
#: ../../include/conversation.php:756 ../../mod/message.php:116
#: ../../mod/message.php:250 ../../mod/photos.php:1165
-#: ../../mod/editpost.php:99
+#: ../../mod/editpost.php:99 ../../include/conversation.php:251
+#: ../../include/conversation.php:559 ../../include/conversation.php:804
+#: ../../mod/message.php:126 ../../mod/message.php:259
+#: ../../mod/photos.php:1180
msgid "Please wait"
msgstr "Patientez"
@@ -1544,7 +1598,7 @@ msgstr "Patientez"
#: ../../mod/profile.php:168 ../../mod/network.php:113
#: ../../mod/profile.php:169 ../../include/conversation.php:728
#: ../../mod/editpost.php:97 ../../include/conversation.php:757
-#: ../../mod/editpost.php:100
+#: ../../mod/editpost.php:100 ../../include/conversation.php:805
#, fuzzy
msgid "Permission settings"
msgstr "Réglages des permissions"
@@ -1556,7 +1610,7 @@ msgstr "Réglages des permissions"
#: ../../mod/profile.php:175 ../../mod/network.php:119
#: ../../mod/profile.php:176 ../../include/conversation.php:734
#: ../../mod/editpost.php:103 ../../include/conversation.php:765
-#: ../../mod/editpost.php:108
+#: ../../mod/editpost.php:108 ../../include/conversation.php:813
#, fuzzy
msgid "CC: email addresses"
msgstr "CC: adresse de courriel"
@@ -1568,26 +1622,27 @@ msgstr "CC: adresse de courriel"
#: ../../mod/profile.php:177 ../../mod/network.php:121
#: ../../mod/profile.php:178 ../../include/conversation.php:736
#: ../../mod/editpost.php:105 ../../include/conversation.php:768
-#: ../../mod/editpost.php:111
+#: ../../mod/editpost.php:111 ../../include/conversation.php:816
#, fuzzy
msgid "Example: bob@example.com, mary@example.com"
msgstr "Exemple: bob@exemple.com, mary@exemple.com"
#: ../../mod/network.php:156 ../../mod/network.php:158
#: ../../mod/network.php:166 ../../mod/network.php:164
-#: ../../mod/network.php:126
+#: ../../mod/network.php:126 ../../mod/network.php:270
msgid "No such group"
msgstr "Groupe inexistant"
#: ../../mod/network.php:167 ../../mod/network.php:169
#: ../../mod/network.php:177 ../../mod/network.php:175
-#: ../../mod/network.php:137
+#: ../../mod/network.php:137 ../../mod/network.php:281
msgid "Group is empty"
msgstr "Groupe vide"
#: ../../mod/network.php:171 ../../mod/network.php:173
#: ../../mod/network.php:181 ../../mod/network.php:179
#: ../../mod/network.php:141 ../../mod/network.php:180
+#: ../../mod/network.php:286
msgid "Group: "
msgstr "Groupe: "
@@ -1607,7 +1662,7 @@ msgstr "Voir le profil de $name"
#: ../../mod/network.php:346 ../../mod/search.php:140
#: ../../include/conversation.php:134 ../../include/conversation.php:132
#: ../../include/conversation.php:142 ../../include/conversation.php:200
-#: ../../include/conversation.php:230
+#: ../../include/conversation.php:230 ../../include/conversation.php:250
msgid "View in context"
msgstr "Voir dans le contexte"
@@ -1620,6 +1675,7 @@ msgstr "Voir dans le contexte"
#: ../../include/conversation.php:250 ../../mod/photos.php:965
#: ../../include/conversation.php:309 ../../mod/photos.php:989
#: ../../include/conversation.php:342 ../../mod/photos.php:1040
+#: ../../include/conversation.php:369 ../../mod/photos.php:1055
msgid "Private Message"
msgstr "Message privé"
@@ -1632,6 +1688,7 @@ msgstr "Message privé"
#: ../../include/conversation.php:298 ../../mod/photos.php:1087
#: ../../include/conversation.php:357 ../../mod/photos.php:1109
#: ../../include/conversation.php:390 ../../mod/photos.php:1162
+#: ../../include/conversation.php:416 ../../mod/photos.php:1177
#, fuzzy
msgid "I like this (toggle)"
msgstr "I like this (bascule)"
@@ -1645,6 +1702,7 @@ msgstr "I like this (bascule)"
#: ../../include/conversation.php:299 ../../mod/photos.php:1088
#: ../../include/conversation.php:358 ../../mod/photos.php:1110
#: ../../include/conversation.php:391 ../../mod/photos.php:1163
+#: ../../include/conversation.php:417 ../../mod/photos.php:1178
#, fuzzy
msgid "I don't like this (toggle)"
msgstr "I don't like this (bascule)"
@@ -1663,6 +1721,8 @@ msgstr "I don't like this (bascule)"
#: ../../mod/photos.php:1167 ../../mod/photos.php:1198
#: ../../include/conversation.php:406 ../../mod/photos.php:1181
#: ../../mod/photos.php:1220 ../../mod/photos.php:1251
+#: ../../include/conversation.php:431 ../../mod/photos.php:1196
+#: ../../mod/photos.php:1235 ../../mod/photos.php:1266
msgid "This is you"
msgstr "C'est vous"
@@ -1677,6 +1737,8 @@ msgstr "C'est vous"
#: ../../include/group.php:169 ../../mod/editpost.php:88
#: ../../include/conversation.php:417 ../../include/group.php:172
#: ../../include/group.php:173 ../../mod/editpost.php:90
+#: ../../include/conversation.php:441 ../../include/group.php:190
+#: ../../include/group.php:191
#, fuzzy
msgid "Edit"
msgstr "Éditer"
@@ -1694,6 +1756,8 @@ msgstr "Éditer"
#: ../../include/conversation.php:174 ../../include/conversation.php:386
#: ../../mod/photos.php:1228 ../../include/conversation.php:427
#: ../../mod/admin.php:471 ../../mod/group.php:154 ../../mod/photos.php:1281
+#: ../../include/conversation.php:211 ../../include/conversation.php:454
+#: ../../mod/admin.php:475 ../../mod/photos.php:1296
#, fuzzy
msgid "Delete"
msgstr "Supprimer"
@@ -1710,7 +1774,7 @@ msgstr "Voir le profil de $owner_name"
#: ../../mod/network.php:565 ../../mod/display.php:266
#: ../../include/conversation.php:363 ../../include/conversation.php:378
#: ../../include/conversation.php:388 ../../include/conversation.php:443
-#: ../../include/conversation.php:490
+#: ../../include/conversation.php:490 ../../include/conversation.php:533
#, fuzzy
msgid "to"
msgstr "à"
@@ -1720,7 +1784,7 @@ msgstr "à"
#: ../../mod/network.php:566 ../../mod/display.php:267
#: ../../include/conversation.php:364 ../../include/conversation.php:379
#: ../../include/conversation.php:389 ../../include/conversation.php:444
-#: ../../include/conversation.php:491
+#: ../../include/conversation.php:491 ../../include/conversation.php:534
#, fuzzy
msgid "Wall-to-Wall"
msgstr "Inter-mur"
@@ -1730,7 +1794,7 @@ msgstr "Inter-mur"
#: ../../mod/network.php:567 ../../mod/display.php:268
#: ../../include/conversation.php:365 ../../include/conversation.php:380
#: ../../include/conversation.php:390 ../../include/conversation.php:445
-#: ../../include/conversation.php:492
+#: ../../include/conversation.php:492 ../../include/conversation.php:535
#, fuzzy
msgid "via Wall-To-Wall:"
msgstr "en Inter-mur:"
@@ -1739,6 +1803,8 @@ msgstr "en Inter-mur:"
#: ../../include/conversation.php:20 ../../mod/photos.php:473
#: ../../include/conversation.php:31 ../../include/diaspora.php:786
#: ../../mod/like.php:106 ../../mod/photos.php:508
+#: ../../include/diaspora.php:841 ../../mod/like.php:127
+#: ../../mod/photos.php:510
#, fuzzy
msgid "photo"
msgstr "la photo"
@@ -1747,6 +1813,7 @@ msgstr "la photo"
#: ../../addon/facebook/facebook.php:745 ../../include/conversation.php:26
#: ../../include/conversation.php:35 ../../include/diaspora.php:786
#: ../../addon/facebook/facebook.php:958 ../../mod/like.php:106
+#: ../../include/diaspora.php:841 ../../mod/like.php:127
#, fuzzy
msgid "status"
msgstr "le statut"
@@ -1754,13 +1821,15 @@ msgstr "le statut"
#: ../../mod/like.php:127 ../../include/conversation.php:25
#: ../../addon/facebook/facebook.php:749 ../../include/conversation.php:43
#: ../../include/diaspora.php:802 ../../addon/facebook/facebook.php:962
-#: ../../mod/like.php:123
+#: ../../mod/like.php:123 ../../include/diaspora.php:857
+#: ../../mod/like.php:144
#, fuzzy, php-format
msgid "%1$s likes %2$s's %3$s"
msgstr "%1$s aime %3$s de %2$s"
#: ../../mod/like.php:129 ../../include/conversation.php:28
#: ../../include/conversation.php:46 ../../mod/like.php:125
+#: ../../mod/like.php:146
#, fuzzy, php-format
msgid "%1$s doesn't like %2$s's %3$s"
msgstr "%1$s n'aime pas %3$s de %2$s"
@@ -1768,7 +1837,8 @@ msgstr "%1$s n'aime pas %3$s de %2$s"
#: ../../mod/dfrn_confirm.php:114 ../../mod/contacts.php:209
#: ../../mod/contacts.php:214 ../../mod/crepair.php:68
#: ../../mod/fsuggest.php:20 ../../mod/fsuggest.php:92
-#: ../../mod/contacts.php:242
+#: ../../mod/contacts.php:242 ../../mod/crepair.php:70
+#: ../../mod/contacts.php:235
msgid "Contact not found."
msgstr "Contact introuvable."
@@ -1829,6 +1899,7 @@ msgstr "Pas d'entrée pour ce contact sur notre site."
#: ../../mod/dfrn_confirm.php:555 ../../mod/dfrn_confirm.php:560
#: ../../mod/dfrn_confirm.php:562 ../../mod/dfrn_confirm.php:600
+#: ../../mod/dfrn_confirm.php:605
msgid ""
"The ID provided by your system is a duplicate on our system. It should work "
"if you try again."
@@ -1838,16 +1909,20 @@ msgstr ""
#: ../../mod/dfrn_confirm.php:566 ../../mod/dfrn_confirm.php:571
#: ../../mod/dfrn_confirm.php:573 ../../mod/dfrn_confirm.php:611
+#: ../../mod/dfrn_confirm.php:616
msgid "Unable to set your contact credentials on our system."
msgstr "Impossible de vous définir des permissions sur notre système."
#: ../../mod/dfrn_confirm.php:619 ../../mod/dfrn_confirm.php:624
#: ../../mod/dfrn_confirm.php:626 ../../mod/dfrn_confirm.php:665
+#: ../../mod/dfrn_confirm.php:670
msgid "Unable to update your contact profile details on our system"
-msgstr "Impossible de mettre les détails de votre profil à jour sur notre système"
+msgstr ""
+"Impossible de mettre les détails de votre profil à jour sur notre système"
#: ../../mod/dfrn_confirm.php:648 ../../mod/dfrn_confirm.php:653
#: ../../mod/dfrn_confirm.php:655 ../../mod/dfrn_confirm.php:695
+#: ../../mod/dfrn_confirm.php:700
#, fuzzy, php-format
msgid "Connection accepted at %s"
msgstr "Connexion acceptée avec %s"
@@ -1859,6 +1934,7 @@ msgstr "Connexion acceptée avec %s"
#: ../../mod/display.php:142 ../../mod/item.php:609
#: ../../include/items.php:1860 ../../mod/display.php:112
#: ../../mod/admin.php:118 ../../mod/admin.php:505
+#: ../../include/items.php:1962 ../../mod/admin.php:509
msgid "Item not found."
msgstr "Élément introuvable."
@@ -1889,72 +1965,75 @@ msgstr "Message envoyé."
msgid "Message could not be sent."
msgstr "Impossible d'envoyer le message."
-#: ../../mod/message.php:126 ../../mod/message.php:52
+#: ../../mod/message.php:126 ../../mod/message.php:52 ../../mod/message.php:59
msgid "Inbox"
msgstr "Messages entrants"
-#: ../../mod/message.php:127 ../../mod/message.php:53
+#: ../../mod/message.php:127 ../../mod/message.php:53 ../../mod/message.php:60
msgid "Outbox"
msgstr "Messages sortants"
-#: ../../mod/message.php:128 ../../mod/message.php:54
+#: ../../mod/message.php:128 ../../mod/message.php:54 ../../mod/message.php:61
msgid "New Message"
msgstr "Nouveau message"
-#: ../../mod/message.php:142 ../../mod/message.php:68
+#: ../../mod/message.php:142 ../../mod/message.php:68 ../../mod/message.php:76
msgid "Message deleted."
msgstr "Message supprimé."
-#: ../../mod/message.php:158 ../../mod/message.php:84
+#: ../../mod/message.php:158 ../../mod/message.php:84 ../../mod/message.php:92
msgid "Conversation removed."
msgstr "Conversation supprimée."
#: ../../mod/message.php:178 ../../mod/message.php:180
-#: ../../mod/message.php:106
+#: ../../mod/message.php:106 ../../mod/message.php:116
msgid "Send Private Message"
msgstr "Envoyer un message privé"
#: ../../mod/message.php:179 ../../mod/message.php:313
#: ../../mod/message.php:181 ../../mod/message.php:315
#: ../../mod/message.php:107 ../../mod/message.php:241
+#: ../../mod/message.php:117 ../../mod/message.php:250
msgid "To:"
msgstr "À:"
#: ../../mod/message.php:180 ../../mod/message.php:314
#: ../../mod/message.php:182 ../../mod/message.php:316
#: ../../mod/message.php:108 ../../mod/message.php:242
+#: ../../mod/message.php:118 ../../mod/message.php:251
msgid "Subject:"
msgstr "Sujet:"
#: ../../mod/message.php:183 ../../mod/message.php:317 ../../mod/invite.php:59
#: ../../mod/message.php:185 ../../mod/message.php:319 ../../mod/invite.php:63
#: ../../mod/message.php:111 ../../mod/message.php:245
-#: ../../mod/invite.php:101
+#: ../../mod/invite.php:101 ../../mod/message.php:121
+#: ../../mod/message.php:254
msgid "Your message:"
msgstr "Votre message:"
#: ../../mod/message.php:222 ../../mod/message.php:224
-#: ../../mod/message.php:150
+#: ../../mod/message.php:150 ../../mod/message.php:159
msgid "No messages."
msgstr "Aucun message."
#: ../../mod/message.php:235 ../../mod/message.php:237
-#: ../../mod/message.php:163
+#: ../../mod/message.php:163 ../../mod/message.php:172
msgid "Delete conversation"
msgstr "Effacer conversation"
#: ../../mod/message.php:265 ../../mod/message.php:267
-#: ../../mod/message.php:193
+#: ../../mod/message.php:193 ../../mod/message.php:202
msgid "Message not available."
msgstr "Message indisponible."
#: ../../mod/message.php:302 ../../mod/message.php:304
-#: ../../mod/message.php:230
+#: ../../mod/message.php:230 ../../mod/message.php:239
msgid "Delete message"
msgstr "Effacer message"
#: ../../mod/message.php:312 ../../mod/message.php:314
-#: ../../mod/message.php:240
+#: ../../mod/message.php:240 ../../mod/message.php:249
msgid "Send Reply"
msgstr "Répondre"
@@ -2003,7 +2082,9 @@ msgstr "Bienvenue sur Friendika."
#: ../../mod/install.php:124 ../../mod/install.php:138
#: ../../mod/install.php:148 ../../mod/install.php:153
msgid "Could not find a command line version of PHP in the web server PATH."
-msgstr "Impossible de trouver la version \"ligne de commande\" de PHP dans le PATH du serveur web."
+msgstr ""
+"Impossible de trouver la version \"ligne de commande\" de PHP dans le PATH "
+"du serveur web."
#: ../../mod/install.php:125 ../../mod/install.php:139
#: ../../mod/install.php:149 ../../mod/install.php:154
@@ -2235,11 +2316,12 @@ msgstr "Visible par:"
msgid "Welcome to %s"
msgstr "Bienvenue sur %s"
-#: ../../mod/item.php:37 ../../mod/item.php:81
+#: ../../mod/item.php:37 ../../mod/item.php:81 ../../mod/item.php:84
msgid "Unable to locate original post."
msgstr "Impossible de localiser l'article original."
#: ../../mod/item.php:126 ../../mod/item.php:128 ../../mod/item.php:196
+#: ../../mod/item.php:199
msgid "Empty post discarded."
msgstr "Article vide défaussé."
@@ -2254,11 +2336,13 @@ msgid "%s posted on your profile wall at %s"
msgstr "%s a posté sur votre mur : %s"
#: ../../mod/item.php:523 ../../mod/item.php:534 ../../mod/item.php:765
+#: ../../mod/item.php:808
#, fuzzy
msgid "System error. Post not saved."
msgstr "Erreur système.Publication non sauvée."
#: ../../mod/item.php:541 ../../mod/item.php:553 ../../mod/item.php:784
+#: ../../mod/item.php:833
#, fuzzy, php-format
msgid ""
"This message was sent to you by %s, a member of the Friendika social network."
@@ -2271,6 +2355,7 @@ msgid "You may visit them online at"
msgstr "Vous pouvez leur faire une visite sur"
#: ../../mod/item.php:545 ../../mod/item.php:556 ../../mod/item.php:787
+#: ../../mod/item.php:836
#, fuzzy
msgid ""
"Please contact the sender by replying to this post if you do not wish to "
@@ -2280,6 +2365,7 @@ msgstr ""
"souhaitez pas recevoir ces messages."
#: ../../mod/item.php:547 ../../mod/item.php:558 ../../mod/item.php:789
+#: ../../mod/item.php:838
#, fuzzy, php-format
msgid "%s posted an update."
msgstr "%s a publié une mise à jour."
@@ -2307,7 +2393,7 @@ msgstr "Liste des membres mise à jour."
#: ../../mod/group.php:88 ../../index.php:250 ../../index.php:264
#: ../../mod/group.php:67 ../../mod/profperm.php:19 ../../index.php:266
-#: ../../index.php:265
+#: ../../index.php:265 ../../index.php:278
msgid "Permission denied"
msgstr "Permission refusée"
@@ -2329,7 +2415,7 @@ msgstr "Image envoyée, mais impossible de la retailler."
#: ../../mod/profile_photo.php:61 ../../mod/profile_photo.php:68
#: ../../mod/profile_photo.php:75 ../../mod/profile_photo.php:237
#: ../../mod/profile_photo.php:239 ../../mod/profile_photo.php:243
-#: ../../mod/profile_photo.php:248
+#: ../../mod/profile_photo.php:248 ../../mod/profile_photo.php:254
#, fuzzy, php-format
msgid "Image size reduction [%s] failed."
msgstr "Réduction de la taille de l'image [%s] échouée."
@@ -2340,6 +2426,7 @@ msgstr "Impossible de traiter l'image"
#: ../../mod/profile_photo.php:228 ../../mod/profile_photo.php:230
#: ../../mod/profile_photo.php:234 ../../mod/profile_photo.php:239
+#: ../../mod/profile_photo.php:245
#, fuzzy
msgid "Image uploaded successfully."
msgstr "Image téléversée avec succès."
@@ -2353,14 +2440,14 @@ msgstr "Annuaire global"
#: ../../mod/contacts.php:315 ../../mod/contacts.php:323
#: ../../mod/contacts.php:325 ../../mod/directory.php:44
#: ../../mod/contacts.php:326 ../../mod/directory.php:55
-#: ../../mod/contacts.php:362
+#: ../../mod/contacts.php:362 ../../mod/contacts.php:354
msgid "Finding: "
msgstr "Trouvé: "
#: ../../mod/viewcontacts.php:17 ../../boot.php:2038 ../../boot.php:2039
#: ../../boot.php:2041 ../../boot.php:2049 ../../boot.php:2061
#: ../../boot.php:2051 ../../boot.php:1996 ../../mod/viewcontacts.php:25
-#: ../../boot.php:2014 ../../include/text.php:555
+#: ../../boot.php:2014 ../../include/text.php:555 ../../include/text.php:564
msgid "View Contacts"
msgstr "Voir les contacts"
@@ -2380,7 +2467,7 @@ msgstr "Visiter le profil de $username"
#: ../../mod/mprofile.php:8 ../../boot.php:2213 ../../boot.php:2221
#: ../../boot.php:2233 ../../boot.php:2248 ../../boot.php:2197
#: ../../mod/profile.php:11 ../../boot.php:2216 ../../mod/hcard.php:10
-#: ../../mod/profile.php:10 ../../boot.php:792
+#: ../../mod/profile.php:10 ../../boot.php:792 ../../boot.php:802
msgid "No profile"
msgstr "Aucun profil"
@@ -2486,6 +2573,8 @@ msgstr "Choisir une identité à gérer: "
#: ../../mod/item.php:734 ../../mod/dfrn_notify.php:296
#: ../../mod/dfrn_notify.php:506 ../../mod/dfrn_notify.php:553
#: ../../mod/dfrn_notify.php:639 ../../mod/dfrn_notify.php:685
+#: ../../mod/item.php:640 ../../mod/item.php:685 ../../mod/item.php:729
+#: ../../mod/item.php:772
#, fuzzy
msgid "noreply"
msgstr "noreply"
@@ -2500,6 +2589,7 @@ msgstr "Nouvel email reçu à "
#: ../../mod/dfrn_notify.php:403 ../../mod/dfrn_notify.php:489
#: ../../mod/dfrn_notify.php:493 ../../mod/item.php:670
#: ../../mod/dfrn_notify.php:555 ../../mod/dfrn_notify.php:687
+#: ../../mod/item.php:687
#, fuzzy, php-format
msgid "%s commented on an item at %s"
msgstr "%s a commenté sur une publication : %s"
@@ -2520,25 +2610,26 @@ msgstr "Cette introduction a déjà été acceptée."
#: ../../mod/dfrn_request.php:116 ../../mod/dfrn_request.php:347
#: ../../mod/dfrn_request.php:120 ../../mod/dfrn_request.php:351
-#: ../../mod/dfrn_request.php:348
+#: ../../mod/dfrn_request.php:348 ../../mod/dfrn_request.php:349
msgid "Profile location is not valid or does not contain profile information."
-msgstr "L'emplacement du profil est invalide ou ne contient pas de profil valide."
+msgstr ""
+"L'emplacement du profil est invalide ou ne contient pas de profil valide."
#: ../../mod/dfrn_request.php:121 ../../mod/dfrn_request.php:352
#: ../../mod/dfrn_request.php:125 ../../mod/dfrn_request.php:356
-#: ../../mod/dfrn_request.php:353
+#: ../../mod/dfrn_request.php:353 ../../mod/dfrn_request.php:354
msgid "Warning: profile location has no identifiable owner name."
msgstr "Attention: l'emplacement du profil n'a pas de nom identifiable."
#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:354
#: ../../mod/dfrn_request.php:127 ../../mod/dfrn_request.php:358
-#: ../../mod/dfrn_request.php:355
+#: ../../mod/dfrn_request.php:355 ../../mod/dfrn_request.php:356
msgid "Warning: profile location has no profile photo."
msgstr "Attention: l'emplacement du profil n'a pas de photo de profil."
#: ../../mod/dfrn_request.php:126 ../../mod/dfrn_request.php:357
#: ../../mod/dfrn_request.php:130 ../../mod/dfrn_request.php:361
-#: ../../mod/dfrn_request.php:358
+#: ../../mod/dfrn_request.php:358 ../../mod/dfrn_request.php:359
#, php-format
msgid "%d required parameter was not found at the given location"
msgid_plural "%d required parameters were not found at the given location"
@@ -2582,50 +2673,51 @@ msgid "Invalid locator"
msgstr "Localisateur invalide"
#: ../../mod/dfrn_request.php:292 ../../mod/dfrn_request.php:296
-#: ../../mod/dfrn_request.php:293
+#: ../../mod/dfrn_request.php:293 ../../mod/dfrn_request.php:294
msgid "Unable to resolve your name at the provided location."
msgstr "Impossible de résoudre votre nom à l'emplacement fourni."
#: ../../mod/dfrn_request.php:305 ../../mod/dfrn_request.php:309
-#: ../../mod/dfrn_request.php:306
+#: ../../mod/dfrn_request.php:306 ../../mod/dfrn_request.php:307
msgid "You have already introduced yourself here."
msgstr "Vous vous êtes déjà présenté ici."
#: ../../mod/dfrn_request.php:309 ../../mod/dfrn_request.php:313
-#: ../../mod/dfrn_request.php:310
+#: ../../mod/dfrn_request.php:310 ../../mod/dfrn_request.php:311
#, fuzzy, php-format
msgid "Apparently you are already friends with %s."
msgstr "Il semblerait que vous soyez déjà ami avec %s."
#: ../../mod/dfrn_request.php:330 ../../mod/dfrn_request.php:334
-#: ../../mod/dfrn_request.php:331
+#: ../../mod/dfrn_request.php:331 ../../mod/dfrn_request.php:332
msgid "Invalid profile URL."
msgstr "URL de profil invalide."
#: ../../mod/dfrn_request.php:336 ../../mod/dfrn_request.php:340
#: ../../mod/follow.php:16 ../../mod/dfrn_request.php:337
-#: ../../mod/follow.php:20
+#: ../../mod/follow.php:20 ../../mod/dfrn_request.php:338
msgid "Disallowed profile URL."
msgstr "URL de profil interdite."
#: ../../mod/dfrn_request.php:402 ../../mod/contacts.php:85
#: ../../mod/contacts.php:90 ../../mod/dfrn_request.php:406
#: ../../mod/dfrn_request.php:404 ../../mod/contacts.php:116
+#: ../../mod/dfrn_request.php:405 ../../mod/contacts.php:109
msgid "Failed to update contact record."
msgstr "Échec de mise-à-jour du contact."
#: ../../mod/dfrn_request.php:423 ../../mod/dfrn_request.php:427
-#: ../../mod/dfrn_request.php:425
+#: ../../mod/dfrn_request.php:425 ../../mod/dfrn_request.php:426
msgid "Your introduction has been sent."
msgstr "Votre présentation a été envoyée."
#: ../../mod/dfrn_request.php:477 ../../mod/dfrn_request.php:481
-#: ../../mod/dfrn_request.php:478
+#: ../../mod/dfrn_request.php:478 ../../mod/dfrn_request.php:479
msgid "Please login to confirm introduction."
msgstr "Connectez-vous pour confirmer l'introduction."
#: ../../mod/dfrn_request.php:491 ../../mod/dfrn_request.php:495
-#: ../../mod/dfrn_request.php:492
+#: ../../mod/dfrn_request.php:492 ../../mod/dfrn_request.php:493
msgid ""
"Incorrect identity currently logged in. Please login to <strong>this</"
"strong> profile."
@@ -2635,17 +2727,20 @@ msgstr ""
#: ../../mod/dfrn_request.php:543 ../../mod/dfrn_request.php:545
#: ../../mod/dfrn_request.php:549 ../../mod/dfrn_request.php:546
+#: ../../mod/dfrn_request.php:547
#, fuzzy
msgid "Introduction received at "
msgstr "Introduction reçue sur "
#: ../../mod/dfrn_request.php:615 ../../mod/dfrn_request.php:617
#: ../../mod/dfrn_request.php:630 ../../mod/dfrn_request.php:628
+#: ../../mod/dfrn_request.php:637
msgid "Friend/Connection Request"
msgstr "Requête de relation/amitié"
#: ../../mod/dfrn_request.php:616 ../../mod/dfrn_request.php:618
#: ../../mod/dfrn_request.php:632 ../../mod/dfrn_request.php:630
+#: ../../mod/dfrn_request.php:639
msgid "Please answer the following:"
msgstr "Merci de répondre à ce qui suit:"
@@ -2656,6 +2751,7 @@ msgstr "Est-ce que $name vous connaît?"
#: ../../mod/dfrn_request.php:620 ../../mod/dfrn_request.php:622
#: ../../mod/dfrn_request.php:636 ../../mod/dfrn_request.php:634
+#: ../../mod/dfrn_request.php:643
msgid "Add a personal note:"
msgstr "Ajouter une note personnelle:"
@@ -2668,11 +2764,13 @@ msgstr ""
#: ../../mod/dfrn_request.php:622 ../../mod/dfrn_request.php:624
#: ../../mod/dfrn_request.php:638 ../../mod/dfrn_request.php:636
+#: ../../include/contact_selectors.php:78 ../../mod/dfrn_request.php:645
msgid "Friendika"
msgstr "Friendika"
#: ../../mod/dfrn_request.php:623 ../../mod/dfrn_request.php:625
#: ../../mod/dfrn_request.php:639 ../../mod/dfrn_request.php:637
+#: ../../mod/dfrn_request.php:646
msgid "StatusNet/Federated Social Web"
msgstr "StatusNet/Federated Social Web"
@@ -2692,13 +2790,15 @@ msgstr "Votre adresse de profil:"
#: ../../mod/dfrn_request.php:627 ../../mod/dfrn_request.php:629
#: ../../mod/dfrn_request.php:643 ../../mod/dfrn_request.php:641
+#: ../../mod/dfrn_request.php:650
msgid "Submit Request"
msgstr "Envoyer la requête"
#: ../../mod/follow.php:173 ../../mod/follow.php:186 ../../mod/follow.php:39
#: ../../mod/follow.php:48
msgid "The profile address specified does not provide adequate information."
-msgstr "L'adresse de profil indiquée ne fournit par les informations adéquates."
+msgstr ""
+"L'adresse de profil indiquée ne fournit par les informations adéquates."
#: ../../mod/follow.php:179 ../../mod/follow.php:192 ../../mod/follow.php:45
#: ../../mod/follow.php:66
@@ -2710,79 +2810,87 @@ msgstr ""
"notifications directes/personnelles de votre part."
#: ../../mod/follow.php:230 ../../mod/follow.php:243 ../../mod/follow.php:247
-#: ../../mod/follow.php:100 ../../mod/follow.php:130
+#: ../../mod/follow.php:100 ../../mod/follow.php:130 ../../mod/follow.php:131
msgid "Unable to retrieve contact information."
msgstr "Impossible de récupérer les informations du contact."
#: ../../mod/follow.php:276 ../../mod/follow.php:289 ../../mod/follow.php:293
-#: ../../mod/follow.php:146 ../../mod/follow.php:176
+#: ../../mod/follow.php:146 ../../mod/follow.php:176 ../../mod/follow.php:177
msgid "following"
msgstr "following"
#: ../../mod/photos.php:30 ../../mod/photos.php:34 ../../mod/photos.php:37
+#: ../../mod/photos.php:42
msgid "Photo Albums"
msgstr "Albums photo"
#: ../../mod/photos.php:95 ../../mod/photos.php:99 ../../mod/photos.php:132
+#: ../../mod/photos.php:133
msgid "Contact information unavailable"
msgstr "Informations de contact indisponibles"
#: ../../mod/photos.php:116 ../../mod/photos.php:120 ../../mod/photos.php:153
+#: ../../mod/photos.php:154
msgid "Album not found."
msgstr "Album introuvable."
#: ../../mod/photos.php:134 ../../mod/photos.php:859 ../../mod/photos.php:863
#: ../../mod/photos.php:138 ../../mod/photos.php:884 ../../mod/photos.php:171
-#: ../../mod/photos.php:935
+#: ../../mod/photos.php:935 ../../mod/photos.php:172 ../../mod/photos.php:941
msgid "Delete Album"
msgstr "Effacer l'album"
#: ../../mod/photos.php:197 ../../mod/photos.php:1067
#: ../../mod/photos.php:1070 ../../mod/photos.php:201
#: ../../mod/photos.php:1092 ../../mod/photos.php:234
-#: ../../mod/photos.php:1145
+#: ../../mod/photos.php:1145 ../../mod/photos.php:235
+#: ../../mod/photos.php:1160
msgid "Delete Photo"
msgstr "Effacer la photo"
#: ../../mod/photos.php:469 ../../mod/photos.php:473 ../../mod/photos.php:508
+#: ../../mod/photos.php:510
msgid "was tagged in a"
msgstr "a été identifié dans"
#: ../../mod/photos.php:469 ../../mod/photos.php:473 ../../mod/photos.php:508
+#: ../../mod/photos.php:510
msgid "by"
msgstr "par"
#: ../../mod/photos.php:661 ../../mod/photos.php:665 ../../mod/photos.php:686
-#: ../../mod/photos.php:743
+#: ../../mod/photos.php:743 ../../mod/photos.php:748
msgid "No photos selected"
msgstr "Aucune photo sélectionnée"
#: ../../mod/photos.php:808 ../../mod/photos.php:812 ../../mod/photos.php:833
-#: ../../mod/photos.php:884
+#: ../../mod/photos.php:884 ../../mod/photos.php:889
#, fuzzy
msgid "Upload Photos"
msgstr "Téléverser des photos"
#: ../../mod/photos.php:811 ../../mod/photos.php:854 ../../mod/photos.php:815
#: ../../mod/photos.php:858 ../../mod/photos.php:836 ../../mod/photos.php:879
-#: ../../mod/photos.php:887 ../../mod/photos.php:930
+#: ../../mod/photos.php:887 ../../mod/photos.php:930 ../../mod/photos.php:892
+#: ../../mod/photos.php:936
msgid "New album name: "
msgstr "Nom du nouvel album: "
#: ../../mod/photos.php:812 ../../mod/photos.php:816 ../../mod/photos.php:837
-#: ../../mod/photos.php:888
+#: ../../mod/photos.php:888 ../../mod/photos.php:893
msgid "or existing album name: "
msgstr "ou nom d'un album existant: "
#: ../../mod/photos.php:814 ../../mod/photos.php:1062 ../../mod/photos.php:818
#: ../../mod/photos.php:1065 ../../mod/photos.php:839
#: ../../mod/photos.php:1087 ../../mod/photos.php:890
-#: ../../mod/photos.php:1140
+#: ../../mod/photos.php:1140 ../../mod/photos.php:896
+#: ../../mod/photos.php:1155
msgid "Permissions"
msgstr "Permissions"
#: ../../mod/photos.php:869 ../../mod/photos.php:873 ../../mod/photos.php:894
-#: ../../mod/photos.php:945
+#: ../../mod/photos.php:945 ../../mod/photos.php:951
msgid "Edit Album"
msgstr "Éditer l'album"
@@ -2790,22 +2898,23 @@ msgstr "Éditer l'album"
#: ../../mod/photos.php:1265 ../../mod/photos.php:1264
#: ../../mod/photos.php:883 ../../mod/photos.php:1267 ../../mod/photos.php:904
#: ../../mod/photos.php:1307 ../../mod/photos.php:955
-#: ../../mod/photos.php:1362
+#: ../../mod/photos.php:1362 ../../mod/photos.php:961
+#: ../../mod/photos.php:1377
msgid "View Photo"
msgstr "Voir la photo"
#: ../../mod/photos.php:909 ../../mod/photos.php:912 ../../mod/photos.php:933
-#: ../../mod/photos.php:984
+#: ../../mod/photos.php:984 ../../mod/photos.php:998
msgid "Photo not available"
msgstr "Photo indisponible"
#: ../../mod/photos.php:956 ../../mod/photos.php:959 ../../mod/photos.php:982
-#: ../../mod/photos.php:1033
+#: ../../mod/photos.php:1033 ../../mod/photos.php:1048
msgid "Edit photo"
msgstr "Éditer la photo"
#: ../../mod/photos.php:958 ../../mod/photos.php:961 ../../mod/photos.php:983
-#: ../../mod/photos.php:1034
+#: ../../mod/photos.php:1034 ../../mod/photos.php:1049
#, fuzzy
msgid "Use as profile photo"
msgstr "Utiliser comme photo de profil"
@@ -2816,7 +2925,7 @@ msgid "<< Prev"
msgstr "<< Précédent"
#: ../../mod/photos.php:973 ../../mod/photos.php:976 ../../mod/photos.php:1000
-#: ../../mod/photos.php:1051
+#: ../../mod/photos.php:1051 ../../mod/photos.php:1066
msgid "View Full Size"
msgstr "Voir en taille réelle"
@@ -2827,50 +2936,57 @@ msgstr "Suivant >>"
#: ../../mod/photos.php:1036 ../../mod/photos.php:1039
#: ../../mod/photos.php:1067 ../../mod/photos.php:1119
+#: ../../mod/photos.php:1134
msgid "Tags: "
msgstr "Étiquettes: "
#: ../../mod/photos.php:1046 ../../mod/photos.php:1049
#: ../../mod/photos.php:1070 ../../mod/photos.php:1122
+#: ../../mod/photos.php:1137
msgid "[Remove any tag]"
msgstr "[Retirer toutes les étiquettes]"
#: ../../mod/photos.php:1055 ../../mod/photos.php:1058
#: ../../mod/photos.php:1080 ../../mod/photos.php:1133
+#: ../../mod/photos.php:1148
msgid "New album name"
msgstr "Nom du nouvel album"
#: ../../mod/photos.php:1058 ../../mod/photos.php:1061
#: ../../mod/photos.php:1083 ../../mod/photos.php:1136
+#: ../../mod/photos.php:1151
msgid "Caption"
msgstr "Titre"
#: ../../mod/photos.php:1060 ../../mod/photos.php:1063
#: ../../mod/photos.php:1085 ../../mod/photos.php:1138
+#: ../../mod/photos.php:1153
msgid "Add a Tag"
msgstr "Ajouter une étiquette"
#: ../../mod/photos.php:1064 ../../mod/photos.php:1067
#: ../../mod/photos.php:1089 ../../mod/photos.php:1142
+#: ../../mod/photos.php:1157
msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
-msgstr "Exemples: @bob, @Barbara_Jensen, @jim@example.com, #Californie, #vacances"
+msgstr ""
+"Exemples: @bob, @Barbara_Jensen, @jim@example.com, #Californie, #vacances"
#: ../../mod/photos.php:1249 ../../mod/photos.php:1251
#: ../../mod/photos.php:1254 ../../mod/photos.php:1294
-#: ../../mod/photos.php:1349
+#: ../../mod/photos.php:1349 ../../mod/photos.php:1364
msgid "Recent Photos"
msgstr "Photos récentes"
#: ../../mod/photos.php:1253 ../../mod/photos.php:1255
#: ../../mod/photos.php:1258 ../../mod/photos.php:1298
-#: ../../mod/photos.php:1353
+#: ../../mod/photos.php:1353 ../../mod/photos.php:1368
#, fuzzy
msgid "Upload New Photos"
msgstr "Téléverser de nouvelles photos"
#: ../../mod/photos.php:1269 ../../mod/photos.php:1271
#: ../../mod/photos.php:1268 ../../mod/photos.php:1311
-#: ../../mod/photos.php:1366
+#: ../../mod/photos.php:1366 ../../mod/photos.php:1381
msgid "View Album"
msgstr "Voir l'album"
@@ -2946,6 +3062,7 @@ msgstr "Nouvel abonné"
#: ../../mod/notifications.php:131 ../../mod/notifications.php:130
#: ../../mod/notifications.php:153 ../../mod/admin.php:469
#: ../../mod/notifications.php:114 ../../mod/notifications.php:161
+#: ../../mod/admin.php:473
msgid "Approve"
msgstr "Approuver"
@@ -2956,74 +3073,77 @@ msgstr "Pas de notification."
#: ../../mod/notifications.php:164 ../../mod/notifications.php:163
#: ../../mod/notifications.php:159 ../../mod/admin.php:468
+#: ../../mod/admin.php:472
msgid "No registrations."
msgstr "Pas d'inscriptions."
#: ../../mod/contacts.php:12 ../../mod/contacts.php:26
+#: ../../mod/contacts.php:42
msgid "Invite Friends"
msgstr "Inviter des amis"
#: ../../mod/contacts.php:16 ../../mod/contacts.php:19
-#: ../../mod/contacts.php:45
+#: ../../mod/contacts.php:45 ../../mod/contacts.php:46
#, fuzzy
msgid "Connect/Follow"
msgstr "Connecter/Suivre"
#: ../../mod/contacts.php:17 ../../mod/contacts.php:20
-#: ../../mod/contacts.php:46
+#: ../../mod/contacts.php:46 ../../mod/contacts.php:47
msgid "Example: bob@example.com, http://example.com/barbara"
msgstr "Exemple: bob@example.com, http://example.com/barbara"
#: ../../mod/contacts.php:18 ../../mod/contacts.php:21
-#: ../../mod/contacts.php:47
+#: ../../mod/contacts.php:47 ../../mod/contacts.php:48
msgid "Follow"
msgstr "Suivre"
#: ../../mod/contacts.php:38 ../../mod/contacts.php:119
#: ../../mod/contacts.php:43 ../../mod/contacts.php:124
#: ../../mod/contacts.php:69 ../../mod/contacts.php:150
+#: ../../mod/contacts.php:72 ../../mod/contacts.php:143
msgid "Could not access contact record."
msgstr "Impossible d'accéder à l'enregistrement du contact."
#: ../../mod/contacts.php:52 ../../mod/contacts.php:57
-#: ../../mod/contacts.php:83
+#: ../../mod/contacts.php:83 ../../mod/contacts.php:86
msgid "Could not locate selected profile."
msgstr "Impossible de localiser le profil séléctionné."
#: ../../mod/contacts.php:83 ../../mod/contacts.php:88
-#: ../../mod/contacts.php:114
+#: ../../mod/contacts.php:114 ../../mod/contacts.php:107
msgid "Contact updated."
msgstr "Contact mis-à-jour."
#: ../../mod/contacts.php:141 ../../mod/contacts.php:146
-#: ../../mod/contacts.php:172
+#: ../../mod/contacts.php:172 ../../mod/contacts.php:165
msgid "Contact has been blocked"
msgstr "Le contact a été bloqué"
#: ../../mod/contacts.php:141 ../../mod/contacts.php:146
-#: ../../mod/contacts.php:172
+#: ../../mod/contacts.php:172 ../../mod/contacts.php:165
msgid "Contact has been unblocked"
msgstr "Le contact n'est plus bloqué"
#: ../../mod/contacts.php:155 ../../mod/contacts.php:160
-#: ../../mod/contacts.php:186
+#: ../../mod/contacts.php:186 ../../mod/contacts.php:179
#, fuzzy
msgid "Contact has been ignored"
msgstr "Le contact a été ignoré"
#: ../../mod/contacts.php:155 ../../mod/contacts.php:160
-#: ../../mod/contacts.php:186
+#: ../../mod/contacts.php:186 ../../mod/contacts.php:179
#, fuzzy
msgid "Contact has been unignored"
msgstr "Le contact n'est plus ignoré"
#: ../../mod/contacts.php:176 ../../mod/contacts.php:181
-#: ../../mod/contacts.php:207
+#: ../../mod/contacts.php:207 ../../mod/contacts.php:200
msgid "stopped following"
msgstr "retiré de la liste de suivi"
#: ../../mod/contacts.php:195 ../../mod/contacts.php:200
-#: ../../mod/contacts.php:228
+#: ../../mod/contacts.php:228 ../../mod/contacts.php:221
msgid "Contact has been removed."
msgstr "Ce contact a été retiré."
@@ -3031,7 +3151,8 @@ msgstr "Ce contact a été retiré."
#: ../../mod/contacts.php:228 ../../mod/contacts.php:352
#: ../../mod/contacts.php:360 ../../mod/contacts.php:362
#: ../../mod/contacts.php:363 ../../mod/contacts.php:256
-#: ../../mod/contacts.php:399
+#: ../../mod/contacts.php:399 ../../mod/contacts.php:249
+#: ../../mod/contacts.php:391
msgid "Mutual Friendship"
msgstr "Relation réciproque"
@@ -3039,7 +3160,8 @@ msgstr "Relation réciproque"
#: ../../mod/contacts.php:232 ../../mod/contacts.php:356
#: ../../mod/contacts.php:364 ../../mod/contacts.php:366
#: ../../mod/contacts.php:367 ../../mod/contacts.php:260
-#: ../../mod/contacts.php:403
+#: ../../mod/contacts.php:403 ../../mod/contacts.php:253
+#: ../../mod/contacts.php:395
msgid "is a fan of yours"
msgstr "est un fan de vous"
@@ -3047,41 +3169,42 @@ msgstr "est un fan de vous"
#: ../../mod/contacts.php:237 ../../mod/contacts.php:360
#: ../../mod/contacts.php:368 ../../mod/contacts.php:370
#: ../../mod/contacts.php:371 ../../mod/contacts.php:265
-#: ../../mod/contacts.php:407
+#: ../../mod/contacts.php:407 ../../mod/contacts.php:258
+#: ../../mod/contacts.php:399
msgid "you are a fan of"
msgstr "vous êtes un fan de"
#: ../../mod/contacts.php:247 ../../mod/contacts.php:252
-#: ../../mod/contacts.php:282
+#: ../../mod/contacts.php:282 ../../mod/contacts.php:273
#, fuzzy
msgid "Privacy Unavailable"
msgstr "Protection de la vie privée indisponible"
#: ../../mod/contacts.php:248 ../../mod/contacts.php:253
-#: ../../mod/contacts.php:283
+#: ../../mod/contacts.php:283 ../../mod/contacts.php:274
#, fuzzy
msgid "Private communications are not available for this contact."
msgstr "Les communications privées ne sont pas disponibles pour ce contact."
#: ../../mod/contacts.php:251 ../../mod/contacts.php:256
-#: ../../mod/contacts.php:286
+#: ../../mod/contacts.php:286 ../../mod/contacts.php:277
msgid "Never"
msgstr "Jamais"
#: ../../mod/contacts.php:255 ../../mod/contacts.php:260
-#: ../../mod/contacts.php:290
+#: ../../mod/contacts.php:290 ../../mod/contacts.php:281
#, fuzzy
msgid "(Update was successful)"
msgstr "(Mise à jour effectuée avec succès)"
#: ../../mod/contacts.php:255 ../../mod/contacts.php:260
-#: ../../mod/contacts.php:290
+#: ../../mod/contacts.php:290 ../../mod/contacts.php:281
#, fuzzy
msgid "(Update was not successful)"
msgstr "(Mise à jour échouée)"
#: ../../mod/contacts.php:258 ../../mod/contacts.php:263
-#: ../../mod/contacts.php:297
+#: ../../mod/contacts.php:297 ../../mod/contacts.php:291
msgid "Contact Editor"
msgstr "Éditeur de contact"
@@ -3092,36 +3215,42 @@ msgstr "Visiter le profil de $name"
#: ../../mod/contacts.php:260 ../../mod/contacts.php:265
#: ../../mod/contacts.php:273 ../../mod/contacts.php:307
+#: ../../mod/contacts.php:301
msgid "Block/Unblock contact"
msgstr "Bloquer/débloquer ce contact"
#: ../../mod/contacts.php:261 ../../mod/contacts.php:266
#: ../../mod/contacts.php:274 ../../mod/contacts.php:308
+#: ../../mod/contacts.php:302
msgid "Ignore contact"
msgstr "Ignorer ce contact"
#: ../../mod/contacts.php:262 ../../mod/contacts.php:267
#: ../../mod/contacts.php:275 ../../mod/contacts.php:277
#: ../../mod/contacts.php:278 ../../mod/contacts.php:314
+#: ../../mod/contacts.php:307
msgid "Delete contact"
msgstr "Effacer ce contact"
#: ../../mod/contacts.php:264 ../../mod/contacts.php:269
#: ../../mod/contacts.php:277 ../../mod/contacts.php:279
#: ../../mod/contacts.php:280 ../../mod/contacts.php:316
+#: ../../mod/contacts.php:311
msgid "Last updated: "
msgstr "Dernière mise-à-jour: "
#: ../../mod/contacts.php:265 ../../mod/contacts.php:270
#: ../../mod/contacts.php:278 ../../mod/contacts.php:280
#: ../../mod/contacts.php:281 ../../mod/contacts.php:317
+#: ../../mod/contacts.php:312
msgid "Update public posts: "
msgstr "Met ses entrées publiques à jour: "
#: ../../mod/contacts.php:267 ../../mod/contacts.php:272
#: ../../mod/contacts.php:280 ../../mod/contacts.php:282
#: ../../mod/contacts.php:283 ../../mod/admin.php:704
-#: ../../mod/contacts.php:319
+#: ../../mod/contacts.php:319 ../../mod/admin.php:708
+#: ../../mod/contacts.php:314
#, fuzzy
msgid "Update now"
msgstr "Mettre-à-jour immédiatement"
@@ -3129,48 +3258,56 @@ msgstr "Mettre-à-jour immédiatement"
#: ../../mod/contacts.php:270 ../../mod/contacts.php:275
#: ../../mod/contacts.php:283 ../../mod/contacts.php:285
#: ../../mod/contacts.php:286 ../../mod/contacts.php:322
+#: ../../mod/contacts.php:317
msgid "Unblock this contact"
msgstr "Débloquer ce contact"
#: ../../mod/contacts.php:270 ../../mod/contacts.php:275
#: ../../mod/contacts.php:283 ../../mod/contacts.php:285
#: ../../mod/contacts.php:286 ../../mod/contacts.php:322
+#: ../../mod/contacts.php:317
msgid "Block this contact"
msgstr "Bloquer ce contact"
#: ../../mod/contacts.php:271 ../../mod/contacts.php:276
#: ../../mod/contacts.php:284 ../../mod/contacts.php:286
#: ../../mod/contacts.php:287 ../../mod/contacts.php:323
+#: ../../mod/contacts.php:318
msgid "Unignore this contact"
msgstr "Cesser d'ignorer ce contact"
#: ../../mod/contacts.php:271 ../../mod/contacts.php:276
#: ../../mod/contacts.php:284 ../../mod/contacts.php:286
#: ../../mod/contacts.php:287 ../../mod/contacts.php:323
+#: ../../mod/contacts.php:318
msgid "Ignore this contact"
msgstr "Ignorer ce contact"
#: ../../mod/contacts.php:274 ../../mod/contacts.php:279
#: ../../mod/contacts.php:287 ../../mod/contacts.php:289
#: ../../mod/contacts.php:290 ../../mod/contacts.php:326
+#: ../../mod/contacts.php:321
msgid "Currently blocked"
msgstr "Actuellement bloqué"
#: ../../mod/contacts.php:275 ../../mod/contacts.php:280
#: ../../mod/contacts.php:288 ../../mod/contacts.php:290
#: ../../mod/contacts.php:291 ../../mod/contacts.php:327
+#: ../../mod/contacts.php:322
msgid "Currently ignored"
msgstr "Actuellement ignoré"
#: ../../mod/contacts.php:308 ../../mod/contacts.php:313
#: ../../mod/contacts.php:321 ../../mod/contacts.php:323
#: ../../mod/contacts.php:324 ../../mod/contacts.php:360
+#: ../../mod/contacts.php:352
msgid "Show Blocked Connections"
msgstr "Montrer les connexions bloquées"
#: ../../mod/contacts.php:308 ../../mod/contacts.php:313
#: ../../mod/contacts.php:321 ../../mod/contacts.php:323
#: ../../mod/contacts.php:324 ../../mod/contacts.php:360
+#: ../../mod/contacts.php:352
msgid "Hide Blocked Connections"
msgstr "Cacher les connexion bloquées"
@@ -3178,7 +3315,7 @@ msgstr "Cacher les connexion bloquées"
#: ../../mod/directory.php:40 ../../mod/contacts.php:324
#: ../../mod/contacts.php:326 ../../mod/directory.php:46
#: ../../mod/contacts.php:327 ../../mod/directory.php:57
-#: ../../mod/contacts.php:363
+#: ../../mod/contacts.php:363 ../../mod/contacts.php:355
msgid "Find"
msgstr "Trouver"
@@ -3187,12 +3324,14 @@ msgstr "Trouver"
#: ../../boot.php:2764 ../../include/conversation.php:520
#: ../../mod/contacts.php:387 ../../include/conversation.php:587
#: ../../mod/contacts.php:388 ../../include/conversation.php:612
-#: ../../mod/contacts.php:424
+#: ../../mod/contacts.php:424 ../../include/Contact.php:125
+#: ../../include/conversation.php:660 ../../mod/contacts.php:416
msgid "Edit contact"
msgstr "Éditer le contact"
#: ../../mod/search.php:54 ../../mod/search.php:62 ../../mod/search.php:64
#: ../../mod/search.php:69 ../../mod/community.php:56 ../../mod/search.php:65
+#: ../../mod/search.php:122
#, fuzzy
msgid "No results."
msgstr "Aucun résultat."
@@ -3226,42 +3365,42 @@ msgid "Please enter your password for verification:"
msgstr "Merci de saisir votre mot de passe pour vérification:"
#: ../../boot.php:808 ../../boot.php:810 ../../boot.php:813 ../../boot.php:825
-#: ../../boot.php:826 ../../boot.php:834 ../../boot.php:636
+#: ../../boot.php:826 ../../boot.php:834 ../../boot.php:636 ../../boot.php:642
#, fuzzy
msgid "Create a New Account"
msgstr "Créer un nouveau compte"
#: ../../boot.php:815 ../../boot.php:817 ../../boot.php:820 ../../boot.php:832
-#: ../../boot.php:833 ../../boot.php:841 ../../boot.php:643
+#: ../../boot.php:833 ../../boot.php:841 ../../boot.php:643 ../../boot.php:649
#, fuzzy
msgid "Nickname or Email address: "
msgstr "Pseudo ou courriel: "
#: ../../boot.php:816 ../../boot.php:818 ../../boot.php:821 ../../boot.php:833
-#: ../../boot.php:834 ../../boot.php:842 ../../boot.php:644
+#: ../../boot.php:834 ../../boot.php:842 ../../boot.php:644 ../../boot.php:650
msgid "Password: "
msgstr "Mot de passe: "
#: ../../boot.php:821 ../../boot.php:823 ../../boot.php:826 ../../boot.php:838
-#: ../../boot.php:839 ../../boot.php:847 ../../boot.php:649
+#: ../../boot.php:839 ../../boot.php:847 ../../boot.php:649 ../../boot.php:655
#, fuzzy
msgid "Nickname/Email/OpenID: "
msgstr "Pseudo/Courriel/OpenID: "
#: ../../boot.php:822 ../../boot.php:824 ../../boot.php:827 ../../boot.php:839
-#: ../../boot.php:840 ../../boot.php:848 ../../boot.php:650
+#: ../../boot.php:840 ../../boot.php:848 ../../boot.php:650 ../../boot.php:656
msgid "Password (if not OpenID): "
msgstr "Mot de passe (sauf pour OpenID): "
#: ../../boot.php:825 ../../boot.php:827 ../../boot.php:830 ../../boot.php:842
-#: ../../boot.php:843 ../../boot.php:851 ../../boot.php:653
+#: ../../boot.php:843 ../../boot.php:851 ../../boot.php:653 ../../boot.php:659
msgid "Forgot your password?"
msgstr "Mot de passe oublié?"
#: ../../boot.php:826 ../../boot.php:828 ../../mod/lostpass.php:74
#: ../../boot.php:831 ../../boot.php:843 ../../boot.php:844
#: ../../mod/lostpass.php:78 ../../boot.php:852 ../../mod/lostpass.php:82
-#: ../../boot.php:654
+#: ../../boot.php:654 ../../boot.php:660
msgid "Password Reset"
msgstr "Réinitialiser le mot de passe"
@@ -3296,7 +3435,7 @@ msgstr "suivant"
#: ../../boot.php:1837 ../../boot.php:1838 ../../boot.php:1840
#: ../../boot.php:1848 ../../boot.php:1860 ../../boot.php:1861
#: ../../include/conversation.php:571 ../../include/conversation.php:638
-#: ../../include/conversation.php:663
+#: ../../include/conversation.php:663 ../../include/conversation.php:711
#, fuzzy, php-format
msgid "%s likes this."
msgstr "%s aime ça."
@@ -3304,7 +3443,7 @@ msgstr "%s aime ça."
#: ../../boot.php:1837 ../../boot.php:1838 ../../boot.php:1840
#: ../../boot.php:1848 ../../boot.php:1860 ../../boot.php:1861
#: ../../include/conversation.php:571 ../../include/conversation.php:638
-#: ../../include/conversation.php:663
+#: ../../include/conversation.php:663 ../../include/conversation.php:711
#, fuzzy, php-format
msgid "%s doesn't like this."
msgstr "%s n'aime pas ça."
@@ -3312,7 +3451,7 @@ msgstr "%s n'aime pas ça."
#: ../../boot.php:1841 ../../boot.php:1842 ../../boot.php:1844
#: ../../boot.php:1852 ../../boot.php:1864 ../../boot.php:1865
#: ../../include/conversation.php:575 ../../include/conversation.php:642
-#: ../../include/conversation.php:667
+#: ../../include/conversation.php:667 ../../include/conversation.php:715
#, fuzzy, php-format
msgid "<span %1$s>%2$d people</span> like this."
msgstr "<span %1$s>%2$d personnes</span> aiment ça."
@@ -3320,7 +3459,7 @@ msgstr "<span %1$s>%2$d personnes</span> aiment ça."
#: ../../boot.php:1843 ../../boot.php:1844 ../../boot.php:1846
#: ../../boot.php:1854 ../../boot.php:1866 ../../boot.php:1867
#: ../../include/conversation.php:577 ../../include/conversation.php:644
-#: ../../include/conversation.php:669
+#: ../../include/conversation.php:669 ../../include/conversation.php:717
#, fuzzy, php-format
msgid "<span %1$s>%2$d people</span> don't like this."
msgstr "<span %1$s>%2$d personnes</span> ,n'aiment pas ça."
@@ -3328,14 +3467,14 @@ msgstr "<span %1$s>%2$d personnes</span> ,n'aiment pas ça."
#: ../../boot.php:1849 ../../boot.php:1850 ../../boot.php:1852
#: ../../boot.php:1860 ../../boot.php:1872 ../../boot.php:1873
#: ../../include/conversation.php:583 ../../include/conversation.php:650
-#: ../../include/conversation.php:675
+#: ../../include/conversation.php:675 ../../include/conversation.php:723
msgid "and"
msgstr "et"
#: ../../boot.php:1852 ../../boot.php:1853 ../../boot.php:1855
#: ../../boot.php:1863 ../../boot.php:1875 ../../boot.php:1876
#: ../../include/conversation.php:586 ../../include/conversation.php:653
-#: ../../include/conversation.php:678
+#: ../../include/conversation.php:678 ../../include/conversation.php:726
#, fuzzy, php-format
msgid ", and %d other people"
msgstr ", et %d autres personnes"
@@ -3343,7 +3482,7 @@ msgstr ", et %d autres personnes"
#: ../../boot.php:1853 ../../boot.php:1854 ../../boot.php:1856
#: ../../boot.php:1864 ../../boot.php:1876 ../../boot.php:1877
#: ../../include/conversation.php:587 ../../include/conversation.php:654
-#: ../../include/conversation.php:679
+#: ../../include/conversation.php:679 ../../include/conversation.php:727
#, fuzzy, php-format
msgid "%s like this."
msgstr "%s aiment ça."
@@ -3351,7 +3490,7 @@ msgstr "%s aiment ça."
#: ../../boot.php:1853 ../../boot.php:1854 ../../boot.php:1856
#: ../../boot.php:1864 ../../boot.php:1876 ../../boot.php:1877
#: ../../include/conversation.php:587 ../../include/conversation.php:654
-#: ../../include/conversation.php:679
+#: ../../include/conversation.php:679 ../../include/conversation.php:727
#, fuzzy, php-format
msgid "%s don't like this."
msgstr "%s n'aiment pas ça."
@@ -3359,12 +3498,14 @@ msgstr "%s n'aiment pas ça."
#: ../../boot.php:2014 ../../boot.php:2015 ../../boot.php:2017
#: ../../boot.php:2025 ../../boot.php:2037 ../../boot.php:2038
#: ../../boot.php:1983 ../../boot.php:2001 ../../include/text.php:542
+#: ../../include/text.php:543
msgid "No contacts"
msgstr "Aucun contact"
#: ../../boot.php:2267 ../../boot.php:2268 ../../boot.php:2270
#: ../../boot.php:2278 ../../boot.php:2290 ../../boot.php:2305
#: ../../boot.php:2254 ../../boot.php:2275 ../../boot.php:856
+#: ../../boot.php:860
msgid "Connect"
msgstr "Relier"
@@ -3372,6 +3513,8 @@ msgstr "Relier"
#: ../../boot.php:2288 ../../boot.php:2300 ../../boot.php:2315
#: ../../boot.php:2264 ../../boot.php:2290 ../../include/event.php:37
#: ../../mod/events.php:328 ../../boot.php:871
+#: ../../include/bb2diaspora.php:213 ../../mod/events.php:335
+#: ../../boot.php:910
msgid "Location:"
msgstr "Localisation:"
@@ -3384,140 +3527,161 @@ msgstr ", "
#: ../../boot.php:2289 ../../boot.php:2290 ../../boot.php:2292
#: ../../include/profile_advanced.php:23 ../../boot.php:2300
#: ../../boot.php:2312 ../../boot.php:2327 ../../boot.php:2276
-#: ../../boot.php:2302 ../../boot.php:884
+#: ../../boot.php:2302 ../../boot.php:884 ../../boot.php:912
msgid "Gender:"
msgstr "Genre:"
#: ../../boot.php:2293 ../../boot.php:2294 ../../boot.php:2296
#: ../../boot.php:2304 ../../boot.php:2316 ../../boot.php:2331
#: ../../boot.php:2280 ../../boot.php:2306 ../../boot.php:888
+#: ../../boot.php:915
msgid "Status:"
msgstr "Statut:"
#: ../../boot.php:2295 ../../boot.php:2296 ../../boot.php:2298
#: ../../include/profile_advanced.php:103 ../../boot.php:2306
#: ../../boot.php:2318 ../../boot.php:2333 ../../boot.php:2282
-#: ../../boot.php:2308 ../../boot.php:890
+#: ../../boot.php:2308 ../../boot.php:890 ../../boot.php:917
msgid "Homepage:"
msgstr "Page personnelle:"
#: ../../boot.php:2386 ../../boot.php:2387 ../../boot.php:2389
#: ../../boot.php:2397 ../../boot.php:2409 ../../boot.php:2424
#: ../../boot.php:2373 ../../boot.php:2399 ../../include/text.php:685
+#: ../../include/text.php:705
msgid "Monday"
msgstr "Lundi"
#: ../../boot.php:2386 ../../boot.php:2387 ../../boot.php:2389
#: ../../boot.php:2397 ../../boot.php:2409 ../../boot.php:2424
#: ../../boot.php:2373 ../../boot.php:2399 ../../include/text.php:685
+#: ../../include/text.php:705
msgid "Tuesday"
msgstr "Mardi"
#: ../../boot.php:2386 ../../boot.php:2387 ../../boot.php:2389
#: ../../boot.php:2397 ../../boot.php:2409 ../../boot.php:2424
#: ../../boot.php:2373 ../../boot.php:2399 ../../include/text.php:685
+#: ../../include/text.php:705
msgid "Wednesday"
msgstr "Mercredi"
#: ../../boot.php:2386 ../../boot.php:2387 ../../boot.php:2389
#: ../../boot.php:2397 ../../boot.php:2409 ../../boot.php:2424
#: ../../boot.php:2373 ../../boot.php:2399 ../../include/text.php:685
+#: ../../include/text.php:705
msgid "Thursday"
msgstr "Jeudi"
#: ../../boot.php:2386 ../../boot.php:2387 ../../boot.php:2389
#: ../../boot.php:2397 ../../boot.php:2409 ../../boot.php:2424
#: ../../boot.php:2373 ../../boot.php:2399 ../../include/text.php:685
+#: ../../include/text.php:705
msgid "Friday"
msgstr "Vendredi"
#: ../../boot.php:2386 ../../boot.php:2387 ../../boot.php:2389
#: ../../boot.php:2397 ../../boot.php:2409 ../../boot.php:2424
#: ../../boot.php:2373 ../../boot.php:2399 ../../include/text.php:685
+#: ../../include/text.php:705
msgid "Saturday"
msgstr "Samedi"
#: ../../boot.php:2386 ../../boot.php:2387 ../../boot.php:2389
#: ../../boot.php:2397 ../../boot.php:2409 ../../boot.php:2424
#: ../../boot.php:2373 ../../boot.php:2399 ../../include/text.php:685
+#: ../../include/text.php:705
msgid "Sunday"
msgstr "Dimanche"
#: ../../boot.php:2390 ../../boot.php:2391 ../../boot.php:2393
#: ../../boot.php:2401 ../../boot.php:2413 ../../boot.php:2428
#: ../../boot.php:2377 ../../boot.php:2403 ../../include/text.php:689
+#: ../../include/text.php:709
msgid "January"
msgstr "Janvier"
#: ../../boot.php:2390 ../../boot.php:2391 ../../boot.php:2393
#: ../../boot.php:2401 ../../boot.php:2413 ../../boot.php:2428
#: ../../boot.php:2377 ../../boot.php:2403 ../../include/text.php:689
+#: ../../include/text.php:709
msgid "February"
msgstr "Février"
#: ../../boot.php:2390 ../../boot.php:2391 ../../boot.php:2393
#: ../../boot.php:2401 ../../boot.php:2413 ../../boot.php:2428
#: ../../boot.php:2377 ../../boot.php:2403 ../../include/text.php:689
+#: ../../include/text.php:709
msgid "March"
msgstr "Mars"
#: ../../boot.php:2390 ../../boot.php:2391 ../../boot.php:2393
#: ../../boot.php:2401 ../../boot.php:2413 ../../boot.php:2428
#: ../../boot.php:2377 ../../boot.php:2403 ../../include/text.php:689
+#: ../../include/text.php:709
msgid "April"
msgstr "Avril"
#: ../../boot.php:2390 ../../boot.php:2391 ../../boot.php:2393
#: ../../boot.php:2401 ../../boot.php:2413 ../../boot.php:2428
#: ../../boot.php:2377 ../../boot.php:2403 ../../include/text.php:689
+#: ../../include/text.php:709
msgid "May"
msgstr "Mai"
#: ../../boot.php:2390 ../../boot.php:2391 ../../boot.php:2393
#: ../../boot.php:2401 ../../boot.php:2413 ../../boot.php:2428
#: ../../boot.php:2377 ../../boot.php:2403 ../../include/text.php:689
+#: ../../include/text.php:709
msgid "June"
msgstr "Juin"
#: ../../boot.php:2390 ../../boot.php:2391 ../../boot.php:2393
#: ../../boot.php:2401 ../../boot.php:2413 ../../boot.php:2428
#: ../../boot.php:2377 ../../boot.php:2403 ../../include/text.php:689
+#: ../../include/text.php:709
msgid "July"
msgstr "Juillet"
#: ../../boot.php:2390 ../../boot.php:2391 ../../boot.php:2393
#: ../../boot.php:2401 ../../boot.php:2413 ../../boot.php:2428
#: ../../boot.php:2377 ../../boot.php:2403 ../../include/text.php:689
+#: ../../include/text.php:709
msgid "August"
msgstr "Août"
#: ../../boot.php:2390 ../../boot.php:2391 ../../boot.php:2393
#: ../../boot.php:2401 ../../boot.php:2413 ../../boot.php:2428
#: ../../boot.php:2377 ../../boot.php:2403 ../../include/text.php:689
+#: ../../include/text.php:709
msgid "September"
msgstr "Septembre"
#: ../../boot.php:2390 ../../boot.php:2391 ../../boot.php:2393
#: ../../boot.php:2401 ../../boot.php:2413 ../../boot.php:2428
#: ../../boot.php:2377 ../../boot.php:2403 ../../include/text.php:689
+#: ../../include/text.php:709
msgid "October"
msgstr "Octobre"
#: ../../boot.php:2390 ../../boot.php:2391 ../../boot.php:2393
#: ../../boot.php:2401 ../../boot.php:2413 ../../boot.php:2428
#: ../../boot.php:2377 ../../boot.php:2403 ../../include/text.php:689
+#: ../../include/text.php:709
msgid "November"
msgstr "Novembre"
#: ../../boot.php:2390 ../../boot.php:2391 ../../boot.php:2393
#: ../../boot.php:2401 ../../boot.php:2413 ../../boot.php:2428
#: ../../boot.php:2377 ../../boot.php:2403 ../../include/text.php:689
+#: ../../include/text.php:709
msgid "December"
msgstr "Décembre"
#: ../../boot.php:2424 ../../boot.php:2425 ../../boot.php:2427
#: ../../boot.php:2433 ../../boot.php:2445 ../../boot.php:2460
#: ../../boot.php:2409 ../../boot.php:2436 ../../boot.php:1003
+#: ../../boot.php:988
#, fuzzy
msgid "Birthday Reminders"
msgstr "Rappels d'anniversaires"
@@ -3525,44 +3689,52 @@ msgstr "Rappels d'anniversaires"
#: ../../boot.php:2425 ../../boot.php:2426 ../../boot.php:2428
#: ../../boot.php:2434 ../../boot.php:2446 ../../boot.php:2461
#: ../../boot.php:2410 ../../boot.php:2437 ../../boot.php:1004
+#: ../../boot.php:989
msgid "Birthdays this week:"
msgstr "Anniversaires cette semaine:"
#: ../../boot.php:2426 ../../boot.php:2427 ../../boot.php:2429
#: ../../boot.php:2435 ../../boot.php:2447 ../../boot.php:2462
#: ../../boot.php:2411 ../../boot.php:2438 ../../boot.php:1005
+#: ../../boot.php:990
msgid "(Adjusted for local time)"
msgstr "(Ajustés pour le fuseau horaire local)"
#: ../../boot.php:2437 ../../boot.php:2438 ../../boot.php:2440
#: ../../boot.php:2446 ../../boot.php:2458 ../../boot.php:2473
#: ../../boot.php:2422 ../../boot.php:2449 ../../boot.php:1016
+#: ../../boot.php:1001
msgid "[today]"
msgstr "[aujourd'hui]"
#: ../../boot.php:2634 ../../boot.php:2635 ../../boot.php:2637
#: ../../boot.php:2643 ../../boot.php:2655 ../../boot.php:2670
#: ../../boot.php:2619 ../../boot.php:2653 ../../include/text.php:820
-#: ../../mod/events.php:237
+#: ../../mod/events.php:237 ../../include/text.php:842
+#: ../../mod/events.php:244
#, fuzzy
msgid "link to source"
msgstr "lien original"
#: ../../index.php:194 ../../index.php:208 ../../index.php:210
-#: ../../mod/help.php:37 ../../index.php:209
+#: ../../mod/help.php:37 ../../index.php:209 ../../mod/help.php:38
+#: ../../index.php:212
msgid "Not Found"
msgstr "Non trouvé"
#: ../../index.php:195 ../../index.php:209 ../../index.php:211
-#: ../../mod/help.php:38 ../../index.php:210
+#: ../../mod/help.php:38 ../../index.php:210 ../../mod/help.php:41
+#: ../../index.php:215
msgid "Page not found."
msgstr "Page introuvable."
#: ../../mod/friendika.php:12 ../../mod/friendika.php:42
+#: ../../mod/friendika.php:43
msgid "This is Friendika version"
msgstr "Motorisé par Friendika version"
#: ../../mod/friendika.php:13 ../../mod/friendika.php:43
+#: ../../mod/friendika.php:44
msgid "running at web location"
msgstr "hébergé sur"
@@ -3577,6 +3749,7 @@ msgstr ""
"Attribution 3.0</a>"
#: ../../mod/friendika.php:17 ../../mod/friendika.php:47
+#: ../../mod/friendika.php:46
msgid ""
"Please visit <a href=\"http://project.friendika.com\">Project.Friendika.com</"
"a> to learn more about the Friendika project."
@@ -3585,10 +3758,12 @@ msgstr ""
"project.friendika.com\">Project.Friendika.com</a>"
#: ../../mod/friendika.php:19 ../../mod/friendika.php:49
+#: ../../mod/friendika.php:48
msgid "Bug reports and issues: please visit"
msgstr "Pour les rapports de bugs: rendez vous sur"
#: ../../mod/friendika.php:20 ../../mod/friendika.php:50
+#: ../../mod/friendika.php:49
msgid ""
"Suggestions, praise, donations, etc. - please email \"Info\" at Friendika - "
"dot com"
@@ -3597,10 +3772,12 @@ msgstr ""
"Friendika - point com"
#: ../../mod/friendika.php:25 ../../mod/friendika.php:55
+#: ../../mod/friendika.php:54
msgid "Installed plugins/addons/apps"
msgstr "Extensions/greffons/applications installées"
#: ../../mod/friendika.php:33 ../../mod/friendika.php:63
+#: ../../mod/friendika.php:62
msgid "No installed plugins/addons/apps"
msgstr "Aucune extension/greffon/application installée"
@@ -3608,7 +3785,8 @@ msgstr "Aucune extension/greffon/application installée"
msgid "Profile Match"
msgstr "Correpondance de profils"
-#: ../../mod/match.php:50 ../../mod/match.php:54
+#: ../../mod/match.php:50 ../../mod/match.php:54 ../../mod/tagmatch.php:44
+#: ../../mod/match.php:57
msgid "No matches"
msgstr "Aucune correspondance"
@@ -3624,7 +3802,7 @@ msgstr "Davantage de publications similaires"
#: ../../mod/network.php:428 ../../mod/profile.php:352
#: ../../include/conversation.php:217 ../../include/conversation.php:227
#: ../../include/conversation.php:237 ../../include/conversation.php:296
-#: ../../include/conversation.php:329
+#: ../../include/conversation.php:329 ../../include/conversation.php:356
#, php-format
msgid "See all %d comments"
msgstr "Voir les %d commentaires"
@@ -3659,6 +3837,8 @@ msgstr "Aucune entrée (certaines peuvent être cachées)."
#: ../../mod/profile.php:102 ../../mod/mprofile.php:101
#: ../../mod/profile.php:103 ../../mod/profile.php:112 ../../mod/notes.php:46
#: ../../mod/events.php:112 ../../mod/profile.php:117 ../../mod/photos.php:834
+#: ../../include/nav.php:47 ../../mod/events.php:119 ../../mod/profile.php:118
+#: ../../mod/photos.php:839
msgid "Status"
msgstr "Statut"
@@ -3667,12 +3847,16 @@ msgstr "Statut"
#: ../../mod/profperm.php:94 ../../mod/profile.php:113 ../../mod/notes.php:47
#: ../../mod/events.php:113 ../../mod/profile.php:118
#: ../../mod/profperm.php:103 ../../mod/photos.php:835
+#: ../../include/nav.php:48 ../../mod/events.php:120 ../../mod/profile.php:119
+#: ../../mod/photos.php:840
msgid "Profile"
msgstr "Profil"
#: ../../mod/profile.php:104 ../../mod/mprofile.php:103
#: ../../mod/profile.php:105 ../../mod/profile.php:114 ../../mod/notes.php:48
#: ../../mod/events.php:114 ../../mod/profile.php:119 ../../mod/photos.php:836
+#: ../../include/nav.php:49 ../../mod/events.php:121 ../../mod/profile.php:120
+#: ../../mod/photos.php:841
msgid "Photos"
msgstr "Photos"
@@ -3682,7 +3866,7 @@ msgstr "Trouver des gens d'intérêts communs"
#: ../../boot.php:2023 ../../boot.php:2025 ../../boot.php:2033
#: ../../boot.php:2045 ../../boot.php:2046 ../../boot.php:1991
-#: ../../boot.php:2009 ../../include/text.php:550
+#: ../../boot.php:2009 ../../include/text.php:550 ../../include/text.php:552
#, php-format
msgid "%d Contact"
msgid_plural "%d Contacts"
@@ -3696,7 +3880,7 @@ msgstr "Publication réussie."
#: ../../mod/network.php:74 ../../mod/profile.php:142 ../../mod/network.php:82
#: ../../mod/profile.php:135 ../../mod/network.php:80
#: ../../mod/profile.php:136 ../../include/conversation.php:679
-#: ../../include/conversation.php:704
+#: ../../include/conversation.php:704 ../../include/conversation.php:752
msgid "Enter a title for this item"
msgstr "Saisissez un titre pour cet élément"
@@ -3704,21 +3888,22 @@ msgstr "Saisissez un titre pour cet élément"
#: ../../mod/network.php:113 ../../mod/profile.php:166
#: ../../mod/network.php:111 ../../mod/profile.php:167
#: ../../include/conversation.php:726 ../../include/conversation.php:755
+#: ../../include/conversation.php:803
msgid "Set title"
msgstr "Définir un titre"
#: ../../mod/profile_photo.php:200 ../../mod/profile_photo.php:204
-#: ../../mod/profile_photo.php:209
+#: ../../mod/profile_photo.php:209 ../../mod/profile_photo.php:215
msgid "Crop Image"
msgstr "(Re)cadrer l'image"
#: ../../mod/profile_photo.php:201 ../../mod/profile_photo.php:205
-#: ../../mod/profile_photo.php:210
+#: ../../mod/profile_photo.php:210 ../../mod/profile_photo.php:216
msgid "Please adjust the image cropping for optimum viewing."
msgstr "Ajustez le cadre de l'image pour une visualisation optimale."
#: ../../mod/profile_photo.php:202 ../../mod/profile_photo.php:206
-#: ../../mod/profile_photo.php:211
+#: ../../mod/profile_photo.php:211 ../../mod/profile_photo.php:217
msgid "Done Editing"
msgstr "Édition terminée"
@@ -3727,11 +3912,12 @@ msgid "Pending Friend/Connect Notifications"
msgstr "Notifications de relation/amitié enattente"
#: ../../mod/notifications.php:143 ../../mod/admin.php:466
+#: ../../mod/admin.php:470
msgid "User registrations waiting for confirm"
msgstr "Inscriptions d'utilisateurs en attente de confirmation"
#: ../../boot.php:359 ../../boot.php:371 ../../boot.php:372 ../../boot.php:385
-#: ../../boot.php:410
+#: ../../boot.php:410 ../../boot.php:416
msgid "Delete this item?"
msgstr "Effacer cet élément?"
@@ -3744,6 +3930,8 @@ msgstr "Effacer cet élément?"
#: ../../mod/photos.php:1169 ../../mod/photos.php:1200 ../../boot.php:386
#: ../../include/conversation.php:408 ../../mod/photos.php:1183
#: ../../mod/photos.php:1222 ../../mod/photos.php:1253 ../../boot.php:411
+#: ../../include/conversation.php:433 ../../mod/photos.php:1198
+#: ../../mod/photos.php:1237 ../../mod/photos.php:1268 ../../boot.php:417
msgid "Comment"
msgstr "Commenter"
@@ -3927,12 +4115,16 @@ msgstr "Exemple: football dessin programmation"
#: ../../mod/profiles.php:395 ../../mod/profiles.php:397
#, fuzzy
msgid "(Used for suggesting potential friends, can be seen by others)"
-msgstr "(Utilisés pour vous suggérer des amis potentiels, peuvent être vus par autrui)"
+msgstr ""
+"(Utilisés pour vous suggérer des amis potentiels, peuvent être vus par "
+"autrui)"
#: ../../mod/profiles.php:396 ../../mod/profiles.php:398
#, fuzzy
msgid "(Used for searching profiles, never shown to others)"
-msgstr "(Utilisés pour rechercher dans les profils, ne seront jamais montrés à autrui)"
+msgstr ""
+"(Utilisés pour rechercher dans les profils, ne seront jamais montrés à "
+"autrui)"
#: ../../mod/profiles.php:397 ../../mod/profiles.php:399
#, fuzzy
@@ -3984,12 +4176,12 @@ msgstr "Activité professionnelle/Occupation"
msgid "School/education"
msgstr "Études/Formation"
-#: ../../mod/profiles.php:457 ../../mod/profiles.php:459
+#: ../../mod/profiles.php:457 ../../mod/profiles.php:459 ../../boot.php:876
#, fuzzy
msgid "Change profile photo"
msgstr "Changer de photo de profil"
-#: ../../mod/profiles.php:458 ../../mod/profiles.php:460
+#: ../../mod/profiles.php:458 ../../mod/profiles.php:460 ../../boot.php:877
#, fuzzy
msgid "Create New Profile"
msgstr "Créer un nouveau profil"
@@ -4004,15 +4196,20 @@ msgstr[1] "%d membres"
#: ../../mod/network.php:60 ../../mod/network.php:58 ../../mod/network.php:65
#, fuzzy, php-format
msgid "Warning: This group contains %s from an insecure network."
-msgstr "Attention : ce groupe contient %s, qui se connecte depuis un réseau non-sécurisé."
+msgstr ""
+"Attention : ce groupe contient %s, qui se connecte depuis un réseau non-"
+"sécurisé."
#: ../../mod/network.php:61 ../../mod/network.php:59 ../../mod/network.php:66
-#: ../../mod/network.php:97
+#: ../../mod/network.php:97 ../../mod/network.php:197
#, fuzzy
msgid "Private messages to this group are at risk of public disclosure."
-msgstr Les messages privés envoyés à ce groupe s'exposent à une diffusion incontrôlée."
+msgstr ""
+"Les messages privés envoyés à ce groupe s'exposent à une diffusion "
+"incontrôlée."
#: ../../mod/message.php:240 ../../mod/message.php:166
+#: ../../mod/message.php:175
#, fuzzy
msgid "D, d M Y - g:i A"
msgstr "D, d M Y - g:i A"
@@ -4080,6 +4277,7 @@ msgstr "Sélectionner un fuseau horaire par défaut pour votre site"
#: ../../mod/settings.php:262 ../../mod/settings.php:323
#: ../../mod/admin.php:133 ../../mod/admin.php:446 ../../mod/settings.php:382
+#: ../../mod/admin.php:450
#, fuzzy
msgid "Normal Account"
msgstr "Compte normal"
@@ -4088,10 +4286,13 @@ msgstr "Compte normal"
#: ../../mod/settings.php:383
#, fuzzy
msgid "This account is a normal personal profile"
-msgstr Ce compte correspond à un profil normal, pour une seule personne (physique, généralement)"
+msgstr ""
+"Ce compte correspond à un profil normal, pour une seule personne (physique, "
+"généralement)"
#: ../../mod/settings.php:264 ../../mod/settings.php:325
#: ../../mod/admin.php:134 ../../mod/admin.php:447 ../../mod/settings.php:386
+#: ../../mod/admin.php:451
#, fuzzy
msgid "Soapbox Account"
msgstr "Compte \"boîte à savon\""
@@ -4100,10 +4301,13 @@ msgstr "Compte \"boîte à savon\""
#: ../../mod/settings.php:387
#, fuzzy
msgid "Automatically approve all connection/friend requests as read-only fans"
-msgstr Accepter automatiquement toutes les demandes d'amitié/connexion comme étant des fans 'en lecture seule'"
+msgstr ""
+"Accepter automatiquement toutes les demandes d'amitié/connexion comme étant "
+"des fans 'en lecture seule'"
#: ../../mod/settings.php:266 ../../mod/settings.php:327
#: ../../mod/admin.php:135 ../../mod/admin.php:448 ../../mod/settings.php:390
+#: ../../mod/admin.php:452
#, fuzzy
msgid "Community/Celebrity Account"
msgstr "Compte de communauté/célébrité"
@@ -4112,10 +4316,13 @@ msgstr "Compte de communauté/célébrité"
#: ../../mod/settings.php:391
#, fuzzy
msgid "Automatically approve all connection/friend requests as read-write fans"
-msgstr "Accepter automatiquement toutes les demandes d'amitié/connexion comme étant des fans en 'lecture/écriture'"
+msgstr ""
+"Accepter automatiquement toutes les demandes d'amitié/connexion comme étant "
+"des fans en 'lecture/écriture'"
#: ../../mod/settings.php:268 ../../mod/settings.php:329
#: ../../mod/admin.php:136 ../../mod/admin.php:449 ../../mod/settings.php:394
+#: ../../mod/admin.php:453
#, fuzzy
msgid "Automatic Friend Account"
msgstr "Compte auto-amical"
@@ -4124,7 +4331,9 @@ msgstr "Compte auto-amical"
#: ../../mod/settings.php:395
#, fuzzy
msgid "Automatically approve all connection/friend requests as friends"
-msgstr "Accepter automatiquement toutes les demandes d'amitié/connexion comme étant des amis"
+msgstr ""
+"Accepter automatiquement toutes les demandes d'amitié/connexion comme étant "
+"des amis"
#: ../../mod/settings.php:288 ../../mod/settings.php:349
#, fuzzy
@@ -4138,7 +4347,7 @@ msgstr "Publier votre profil par défaut sur l'annuaire global?"
#: ../../mod/settings.php:336 ../../mod/profile_photo.php:191
#: ../../mod/settings.php:398 ../../mod/profile_photo.php:196
-#: ../../mod/settings.php:461
+#: ../../mod/settings.php:461 ../../mod/profile_photo.php:202
#, fuzzy
msgid "or"
msgstr "ou"
@@ -4265,7 +4474,8 @@ msgstr "Réglages de mot de passe"
#: ../../mod/settings.php:492
#, fuzzy
msgid "Leave password fields blank unless changing"
-msgstr "Laissez les champs de mot de passe vierge, sauf si vous désirez les changer"
+msgstr ""
+"Laissez les champs de mot de passe vierge, sauf si vous désirez les changer"
#: ../../mod/settings.php:380 ../../mod/settings.php:442
#: ../../mod/settings.php:491
@@ -4384,21 +4594,25 @@ msgid "Members:"
msgstr "Membres:"
#: ../../mod/profile_photo.php:188 ../../mod/profile_photo.php:193
+#: ../../mod/profile_photo.php:199
#, fuzzy
msgid "Upload File:"
msgstr "Fichier à téléverser:"
#: ../../mod/profile_photo.php:189 ../../mod/profile_photo.php:194
+#: ../../mod/profile_photo.php:200
#, fuzzy
msgid "Upload Profile Photo"
msgstr "Téléverser une photo de profil"
#: ../../mod/profile_photo.php:190 ../../mod/profile_photo.php:195
+#: ../../mod/profile_photo.php:201
#, fuzzy
msgid "Upload"
msgstr "Téléverser"
#: ../../mod/profile_photo.php:191 ../../mod/profile_photo.php:196
+#: ../../mod/profile_photo.php:202
#, fuzzy
msgid "select a photo from your photo albums"
msgstr "choisissez une photo depuis vos albums"
@@ -4410,34 +4624,37 @@ msgid "Site Directory"
msgstr "Annuaire local"
#: ../../mod/dfrn_request.php:503 ../../mod/dfrn_request.php:507
-#: ../../mod/dfrn_request.php:504
+#: ../../mod/dfrn_request.php:504 ../../mod/dfrn_request.php:505
#, fuzzy, php-format
msgid "Welcome home %s."
msgstr "Bienvenue chez vous, %s."
#: ../../mod/dfrn_request.php:504 ../../mod/dfrn_request.php:508
-#: ../../mod/dfrn_request.php:505
+#: ../../mod/dfrn_request.php:505 ../../mod/dfrn_request.php:506
#, fuzzy, php-format
msgid "Please confirm your introduction/connection request to %s."
msgstr "Merci de confirmer votre demande d'introduction auprès de %s."
#: ../../mod/dfrn_request.php:505 ../../mod/dfrn_request.php:509
-#: ../../mod/dfrn_request.php:506
+#: ../../mod/dfrn_request.php:506 ../../mod/dfrn_request.php:507
#, fuzzy
msgid "Confirm"
msgstr "Confirmer"
#: ../../mod/notifications.php:154 ../../mod/admin.php:470
+#: ../../mod/admin.php:474
#, fuzzy
msgid "Deny"
msgstr "Rejetter"
#: ../../mod/contacts.php:265 ../../mod/contacts.php:299
+#: ../../mod/contacts.php:293
#, fuzzy
msgid "Profile Visibility"
msgstr "Visibilité du profil"
#: ../../mod/contacts.php:266 ../../mod/contacts.php:300
+#: ../../mod/contacts.php:294
#, fuzzy, php-format
msgid ""
"Please choose the profile you would like to display to %s when viewing your "
@@ -4447,16 +4664,19 @@ msgstr ""
"rend visite de manière nominative."
#: ../../mod/contacts.php:267 ../../mod/contacts.php:301
+#: ../../mod/contacts.php:295
#, fuzzy
msgid "Contact Information / Notes"
msgstr "Informations de contact / Notes"
#: ../../mod/contacts.php:268 ../../mod/contacts.php:302
+#: ../../mod/contacts.php:296
#, fuzzy
msgid "Online Reputation"
msgstr "Réputation en ligne"
#: ../../mod/contacts.php:269 ../../mod/contacts.php:303
+#: ../../mod/contacts.php:297
#, fuzzy
msgid ""
"Occasionally your friends may wish to inquire about this person's online "
@@ -4466,6 +4686,7 @@ msgstr ""
"de cette personne."
#: ../../mod/contacts.php:270 ../../mod/contacts.php:304
+#: ../../mod/contacts.php:298
#, fuzzy
msgid ""
"You may help them choose whether or not to interact with this person by "
@@ -4475,6 +4696,7 @@ msgstr ""
"cette personne en leur fournissant une mesure de <em>réputation</em>."
#: ../../mod/contacts.php:271 ../../mod/contacts.php:305
+#: ../../mod/contacts.php:299
#, fuzzy
msgid ""
"Please take a moment to elaborate on this selection if you feel it could be "
@@ -4485,34 +4707,39 @@ msgstr ""
#: ../../boot.php:2416 ../../boot.php:2428 ../../boot.php:2443
#: ../../boot.php:2392 ../../boot.php:2418 ../../boot.php:985
+#: ../../boot.php:970
#, fuzzy
msgid "g A l F d"
msgstr "g A | F d"
#: ../../boot.php:2734 ../../boot.php:2746 ../../boot.php:2761
#: ../../include/conversation.php:517 ../../include/conversation.php:583
-#: ../../include/conversation.php:608
+#: ../../include/conversation.php:608 ../../include/Contact.php:121
+#: ../../include/conversation.php:656
#, fuzzy
msgid "View status"
msgstr "Voir le statut"
#: ../../boot.php:2735 ../../boot.php:2747 ../../boot.php:2762
#: ../../include/conversation.php:518 ../../include/conversation.php:584
-#: ../../include/conversation.php:609
+#: ../../include/conversation.php:609 ../../include/Contact.php:122
+#: ../../include/conversation.php:657
#, fuzzy
msgid "View profile"
msgstr "Voir le profil"
#: ../../boot.php:2736 ../../boot.php:2748 ../../boot.php:2763
#: ../../include/conversation.php:519 ../../include/conversation.php:585
-#: ../../include/conversation.php:610
+#: ../../include/conversation.php:610 ../../include/Contact.php:123
+#: ../../include/conversation.php:658
#, fuzzy
msgid "View photos"
msgstr "Voir les photos"
#: ../../boot.php:2738 ../../boot.php:2750 ../../boot.php:2765
#: ../../include/conversation.php:521 ../../include/conversation.php:588
-#: ../../include/conversation.php:613
+#: ../../include/conversation.php:613 ../../include/Contact.php:126
+#: ../../include/Contact.php:137 ../../include/conversation.php:661
#, fuzzy
msgid "Send PM"
msgstr "Envoyer message"
@@ -4530,7 +4757,8 @@ msgid "View %s's profile"
msgstr "Voir le profil de %s"
#: ../../include/nav.php:68 ../../include/nav.php:67 ../../include/nav.php:64
-#: ../../mod/help.php:31 ../../mod/help.php:33
+#: ../../mod/help.php:31 ../../mod/help.php:33 ../../include/nav.php:82
+#: ../../mod/help.php:34
#, fuzzy
msgid "Help"
msgstr "Aide"
@@ -4539,7 +4767,7 @@ msgstr "Aide"
msgid "Visible to everybody"
msgstr "Visible par tout le monde"
-#: ../../mod/profiles.php:471 ../../mod/profiles.php:473
+#: ../../mod/profiles.php:471 ../../mod/profiles.php:473 ../../boot.php:891
msgid "Edit visibility"
msgstr "Changer la visibilité"
@@ -4548,11 +4776,11 @@ msgstr "Changer la visibilité"
msgid "Click on a contact to add or remove."
msgstr "Cliquez sur un contact pour l'ajouter ou le supprimer."
-#: ../../mod/group.php:169 ../../mod/group.php:180
+#: ../../mod/group.php:169 ../../mod/group.php:180 ../../mod/group.php:179
msgid "Members"
msgstr "Membres"
-#: ../../mod/group.php:183 ../../mod/group.php:195
+#: ../../mod/group.php:183 ../../mod/group.php:195 ../../mod/group.php:194
msgid "All Contacts"
msgstr "Tout les contacts"
@@ -4578,27 +4806,27 @@ msgstr "Tous les contacts (ayant un accès sécurisé)"
msgid "(click to open/close)"
msgstr "(cliquer pour ouvrir/fermer)"
-#: ../../mod/crepair.php:42
+#: ../../mod/crepair.php:42 ../../mod/crepair.php:44
msgid "Contact settings applied."
msgstr "Réglages du contact appliqués."
-#: ../../mod/crepair.php:44
+#: ../../mod/crepair.php:44 ../../mod/crepair.php:46
msgid "Contact update failed."
msgstr "Echec lors de la mise à jour du contact."
-#: ../../mod/crepair.php:74
+#: ../../mod/crepair.php:74 ../../mod/crepair.php:76
msgid "Repair Contact Settings"
msgstr "Réparer les réglages du contact"
-#: ../../mod/crepair.php:76
+#: ../../mod/crepair.php:76 ../../mod/crepair.php:78
msgid ""
"<strong>WARNING: This is highly advanced</strong> and if you enter incorrect "
"information your communications with this contact will stop working."
msgstr ""
-"<strong>ATTENTION: Ceci est à réserver aux utilisateurs avancés</strong> et pourrait "
-"bloquer vos communications avec ce contact en cas d'erreur."
+"<strong>ATTENTION: Ceci est à réserver aux utilisateurs avancés</strong> et "
+"pourrait bloquer vos communications avec ce contact en cas d'erreur."
-#: ../../mod/crepair.php:77
+#: ../../mod/crepair.php:77 ../../mod/crepair.php:79
msgid ""
"Please use your browser 'Back' button <strong>now</strong> if you are "
"uncertain what to do on this page."
@@ -4607,52 +4835,58 @@ msgstr ""
"vous avez le moindre doute."
#: ../../mod/crepair.php:85 ../../mod/admin.php:467 ../../mod/admin.php:476
+#: ../../mod/admin.php:471 ../../mod/admin.php:480 ../../mod/crepair.php:87
msgid "Name"
msgstr "Nom"
-#: ../../mod/crepair.php:86
+#: ../../mod/crepair.php:86 ../../mod/crepair.php:88
msgid "Account Nickname"
msgstr "Pseudo du compte"
-#: ../../mod/crepair.php:87
+#: ../../mod/crepair.php:87 ../../mod/crepair.php:90
msgid "Account URL"
msgstr "URL du compte"
-#: ../../mod/crepair.php:88
+#: ../../mod/crepair.php:88 ../../mod/crepair.php:91
msgid "Friend Request URL"
msgstr "URL de requête"
-#: ../../mod/crepair.php:89
+#: ../../mod/crepair.php:89 ../../mod/crepair.php:92
msgid "Friend Confirm URL"
msgstr "URL de confirmation"
-#: ../../mod/crepair.php:90
+#: ../../mod/crepair.php:90 ../../mod/crepair.php:93
msgid "Notification Endpoint URL"
msgstr "URL de notification"
-#: ../../mod/crepair.php:91
+#: ../../mod/crepair.php:91 ../../mod/crepair.php:94
msgid "Poll/Feed URL"
msgstr "URL de poll/feed"
#: ../../mod/contacts.php:275 ../../mod/contacts.php:309
+#: ../../mod/contacts.php:303
msgid "Repair contact URL settings"
msgstr "Réparer les URLs du contact"
#: ../../mod/contacts.php:276 ../../mod/contacts.php:310
+#: ../../mod/contacts.php:304
msgid "Repair contact URL settings (WARNING: Advanced)"
msgstr "Réparer les URLs du contact (ATTENTION: procédure avancée)"
#: ../../include/notifier.php:414 ../../include/notifier.php:499
+#: ../../include/notifier.php:554 ../../include/delivery.php:387
msgid "(no subject)"
msgstr "(aucun sujet)"
#: ../../include/auth.php:208 ../../mod/openid.php:78
-#: ../../include/auth.php:214
+#: ../../include/auth.php:214 ../../include/auth.php:216
+#: ../../mod/openid.php:79
msgid "Welcome "
msgstr "Bienvenue "
#: ../../include/auth.php:209 ../../mod/openid.php:79
-#: ../../include/auth.php:215
+#: ../../include/auth.php:215 ../../include/auth.php:217
+#: ../../mod/openid.php:80
msgid "Please upload a profile photo."
msgstr "Merci de téléverser une photo pour votre profil."
@@ -4663,20 +4897,23 @@ msgid "%1$s is now friends with %2$s"
msgstr "%1$s est désormais relié à %2$s"
#: ../../include/conversation.php:586 ../../include/conversation.php:611
+#: ../../include/Contact.php:124 ../../include/Contact.php:137
+#: ../../include/conversation.php:659
msgid "View recent"
msgstr "Voir les nouveautés"
#: ../../include/conversation.php:673 ../../mod/editpost.php:38
-#: ../../include/conversation.php:698
+#: ../../include/conversation.php:698 ../../include/conversation.php:746
msgid "Visible to <strong>everybody</strong>"
msgstr "Visible par <strong>tout le monde</strong>"
#: ../../include/conversation.php:707 ../../mod/editpost.php:75
-#: ../../include/conversation.php:732
+#: ../../include/conversation.php:732 ../../include/conversation.php:780
msgid "Post to Email"
msgstr "Transmettre par courriel"
#: ../../include/bbcode.php:83 ../../include/bbcode.php:116
+#: ../../include/bbcode.php:121
msgid "Image/photo"
msgstr "Image/photo"
@@ -4697,22 +4934,25 @@ msgid ""
"Post to Facebook cancelled because of multi-network access permission "
"conflict."
msgstr ""
-"Envoi vers Facebook annulé à cause d'un conflit dans les permissions "
-"d'accès aux réseaux tiers."
+"Envoi vers Facebook annulé à cause d'un conflit dans les permissions d'accès "
+"aux réseaux tiers."
#: ../../addon/facebook/facebook.php:551 ../../addon/facebook/facebook.php:660
msgid "View on Friendika"
msgstr "Voir sur Friendika"
#: ../../mod/network.php:151 ../../mod/network.php:190
+#: ../../mod/network.php:296
msgid "Contact: "
msgstr "Contact: "
#: ../../mod/network.php:153 ../../mod/network.php:192
+#: ../../mod/network.php:298
msgid "Private messages to this person are at risk of public disclosure."
msgstr "Les messages privés destinés à cette personne risquent des fuites."
#: ../../mod/network.php:158 ../../mod/network.php:197
+#: ../../mod/network.php:303
msgid "Invalid contact."
msgstr "Contact invalide."
@@ -4720,7 +4960,8 @@ msgstr "Contact invalide."
#: ../../mod/viewcontacts.php:16 ../../mod/dfrn_request.php:591
#: ../../mod/photos.php:676 ../../mod/search.php:13 ../../mod/directory.php:20
#: ../../mod/community.php:9 ../../mod/dfrn_request.php:589
-#: ../../mod/photos.php:733
+#: ../../mod/photos.php:733 ../../mod/dfrn_request.php:590
+#: ../../mod/photos.php:738 ../../mod/search.php:68
msgid "Public access denied."
msgstr "Accès public refusé."
@@ -4737,8 +4978,8 @@ msgid ""
"If you wish to communicate with email contacts using this service "
"(optional), please specify how to connect to your mailbox."
msgstr ""
-"Si vous souhaitez communiquer avec vos contacts 'courriel' via ce "
-"service (facultatif), indiquez comment vous connecter à votre boîte."
+"Si vous souhaitez communiquer avec vos contacts 'courriel' via ce service "
+"(facultatif), indiquez comment vous connecter à votre boîte."
#: ../../mod/settings.php:475 ../../mod/settings.php:538
msgid "IMAP server name:"
@@ -4772,20 +5013,21 @@ msgstr "Envoyer les entrées publiques à tous les contacts courriel:"
msgid "Email access is disabled on this site."
msgstr "L'accès par courriel est désactivé sur ce site."
-#: ../../mod/item.php:555 ../../mod/item.php:786
+#: ../../mod/item.php:555 ../../mod/item.php:786 ../../mod/item.php:835
#, php-format
msgid "You may visit them online at %s"
msgstr "Vous pouvez leur rendre visite à %s"
-#: ../../mod/profile_photo.php:196
+#: ../../mod/profile_photo.php:196 ../../mod/profile_photo.php:202
msgid "skip this step"
msgstr "ignorer cette étape"
-#: ../../mod/help.php:27 ../../mod/help.php:29
+#: ../../mod/help.php:27 ../../mod/help.php:29 ../../mod/help.php:30
msgid "Help:"
msgstr "Aide:"
#: ../../mod/dfrn_request.php:631 ../../mod/dfrn_request.php:629
+#: ../../mod/dfrn_request.php:638
msgid ""
"Examples: jojo@demo.friendika.com, http://demo.friendika.com/profile/jojo, "
"testuser@identi.ca"
@@ -4794,6 +5036,7 @@ msgstr ""
"utilisateur@identi.ca"
#: ../../mod/dfrn_request.php:637 ../../mod/dfrn_request.php:635
+#: ../../mod/dfrn_request.php:634
msgid ""
"Please enter your 'Identity Address' from one of the following supported "
"social networks:"
@@ -4802,10 +5045,12 @@ msgstr ""
"sociaux supportés:"
#: ../../mod/dfrn_request.php:642 ../../mod/dfrn_request.php:640
+#: ../../mod/dfrn_request.php:649
msgid "Your Identity Address:"
msgstr "Adresse de votre identité:"
#: ../../mod/contacts.php:277 ../../mod/contacts.php:311
+#: ../../mod/contacts.php:305
msgid "View conversations"
msgstr "Voir conversations"
@@ -4814,37 +5059,41 @@ msgid "event"
msgstr "[[event]]"
#: ../../include/conversation.php:222 ../../include/conversation.php:501
+#: ../../include/conversation.php:234 ../../include/conversation.php:543
#, php-format
msgid "%s from %s"
msgstr "[[%s from %s]]"
-#: ../../include/conversation.php:427
+#: ../../include/conversation.php:427 ../../include/conversation.php:210
+#: ../../include/conversation.php:453
msgid "Select"
msgstr "Sélectionner"
-#: ../../include/conversation.php:429
+#: ../../include/conversation.php:429 ../../include/conversation.php:465
msgid "toggle star status"
msgstr "(dé)marquer d'une étoile"
-#: ../../include/conversation.php:534
+#: ../../include/conversation.php:534 ../../include/conversation.php:581
msgid "Delete Selected Items"
msgstr "Supprimer les éléments selectionnés"
#: ../../include/conversation.php:748 ../../mod/editpost.php:92
+#: ../../include/conversation.php:796
msgid "Attach file"
msgstr "Joindre un fichier"
#: ../../include/conversation.php:766 ../../mod/editpost.php:109
+#: ../../include/conversation.php:814
msgid "Public post"
msgstr "Entrée publique"
-#: ../../include/text.php:752
+#: ../../include/text.php:752 ../../include/text.php:772
msgid "bytes"
msgstr "octets"
-#: ../../include/text.php:835
+#: ../../include/text.php:835 ../../include/text.php:860
msgid "Select an alternate language"
-msgstr "Choisir une autre langue"
+msgstr "Choisir une langue complémentaire"
#: ../../include/acl_selectors.php:280
msgid "show"
@@ -4854,27 +5103,28 @@ msgstr "montrer"
msgid "don't show"
msgstr "ne pas montrer"
-#: ../../include/event.php:11
+#: ../../include/event.php:11 ../../include/bb2diaspora.php:191
+#: ../../mod/localtime.php:12
msgid "l F d, Y \\@ g:i A"
msgstr "l F d, Y \\@ g:i A"
-#: ../../include/event.php:17
+#: ../../include/event.php:17 ../../include/bb2diaspora.php:197
msgid "Starts:"
msgstr "Commence:"
-#: ../../include/event.php:27
+#: ../../include/event.php:27 ../../include/bb2diaspora.php:205
msgid "Finishes:"
msgstr "Termine:"
-#: ../../include/diaspora.php:390
+#: ../../include/diaspora.php:390 ../../include/diaspora.php:465
msgid "Sharing notification from Diaspora network"
msgstr "Partager les notifications du réseau Diaspora"
-#: ../../include/diaspora.php:946
+#: ../../include/diaspora.php:946 ../../include/diaspora.php:1011
msgid "link"
msgstr "lien"
-#: ../../include/poller.php:423
+#: ../../include/poller.php:423 ../../include/poller.php:443
msgid "From: "
msgstr "De:"
@@ -4882,83 +5132,85 @@ msgstr "De:"
msgid "never"
msgstr "jamais"
-#: ../../include/nav.php:41
+#: ../../include/nav.php:41 ../../include/nav.php:44
msgid "End this session"
msgstr "Terminer cette session"
-#: ../../include/nav.php:44
+#: ../../include/nav.php:44 ../../include/nav.php:62
msgid "Sign in"
msgstr "Se connecter"
-#: ../../include/nav.php:55
+#: ../../include/nav.php:55 ../../include/nav.php:73
msgid "Home Page"
msgstr "Page d'accueil"
-#: ../../include/nav.php:59
+#: ../../include/nav.php:59 ../../include/nav.php:77
msgid "Create an account"
msgstr "Créer un compte"
-#: ../../include/nav.php:64
+#: ../../include/nav.php:64 ../../include/nav.php:82
msgid "Help and documentation"
msgstr "Aide et documentation"
-#: ../../include/nav.php:67
+#: ../../include/nav.php:67 ../../include/nav.php:85
msgid "Addon applications, utilities, games"
msgstr "Applications supplémentaires, utilitaires, jeux"
-#: ../../include/nav.php:69
+#: ../../include/nav.php:69 ../../include/nav.php:87
msgid "Search site content"
msgstr "Rechercher dans le contenu du site"
#: ../../include/nav.php:79 ../../mod/community.php:26
+#: ../../include/nav.php:97
msgid "Community"
msgstr "Place publique"
-#: ../../include/nav.php:79
+#: ../../include/nav.php:79 ../../include/nav.php:97
msgid "Conversations on this site"
msgstr "Conversations sur ce site"
-#: ../../include/nav.php:81
+#: ../../include/nav.php:81 ../../include/nav.php:99
msgid "People directory"
msgstr "Annuaire"
-#: ../../include/nav.php:91
+#: ../../include/nav.php:91 ../../include/nav.php:109
msgid "Conversations from your friends"
msgstr "Conversations de vos amis"
-#: ../../include/nav.php:93
+#: ../../include/nav.php:93 ../../include/nav.php:47 ../../include/nav.php:111
msgid "Your posts and conversations"
msgstr "Vos conversations et entrées"
-#: ../../include/nav.php:99
+#: ../../include/nav.php:99 ../../include/nav.php:117
msgid "Friend requests"
msgstr "Demandes de connexion/amitié"
-#: ../../include/nav.php:102
+#: ../../include/nav.php:102 ../../include/nav.php:120
msgid "Private mail"
msgstr "Courriel privé"
-#: ../../include/nav.php:105
+#: ../../include/nav.php:105 ../../include/nav.php:123
msgid "Manage other pages"
msgstr "Gérer les autres pages"
#: ../../include/nav.php:108 ../../mod/settings.php:311
+#: ../../include/nav.php:126
msgid "Account settings"
msgstr "Réglages du compte"
-#: ../../include/nav.php:109
+#: ../../include/nav.php:109 ../../include/nav.php:127 ../../boot.php:870
msgid "Manage/edit profiles"
msgstr "Gérer/éditer les profils"
-#: ../../include/nav.php:110
+#: ../../include/nav.php:110 ../../include/nav.php:128
msgid "Manage/edit friends and contacts"
msgstr "Gérer/éditer les amis et contacts"
-#: ../../include/nav.php:117
+#: ../../include/nav.php:117 ../../include/nav.php:135
msgid "Admin"
msgstr "Admin"
-#: ../../include/nav.php:117
+#: ../../include/nav.php:117 ../../include/nav.php:135
msgid "Site setup and configuration"
msgstr "Configuration du site"
@@ -4967,7 +5219,8 @@ msgid ""
"This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> "
"analytics tool."
msgstr ""
-"Ce site construit ses statistiques grâce à <a href='http://www.piwik.org'>Piwik</a>."
+"Ce site construit ses statistiques grâce à <a href='http://www.piwik."
+"org'>Piwik</a>."
#: ../../addon/piwik/piwik.php:73
#, php-format
@@ -4998,7 +5251,8 @@ msgstr "Relier tous vos amis et conversations Facebook"
#: ../../addon/facebook/facebook.php:365
msgid "Warning: Your Facebook privacy settings can not be imported."
-msgstr "Attention: vos réglages de vie privée ne pourront être importés de Facebook."
+msgstr ""
+"Attention: vos réglages de vie privée ne pourront être importés de Facebook."
#: ../../addon/facebook/facebook.php:366
msgid ""
@@ -5050,9 +5304,10 @@ msgid ""
"associated Twitter account. You can choose to do so by default (here) or for "
"every posting separately in the posting options when writing the entry."
msgstr ""
-"Si activé, toutes vos entrées <strong>publiques</strong> pourront être postées "
-"sur le compte Twitter associé. Vous pouvez choisir de le faire par défaut (ici) ou "
-"pour chaque entrée séparément dans les options de la-dite entrée."
+"Si activé, toutes vos entrées <strong>publiques</strong> pourront être "
+"postées sur le compte Twitter associé. Vous pouvez choisir de le faire par "
+"défaut (ici) ou pour chaque entrée séparément dans les options de la-dite "
+"entrée."
#: ../../addon/twitter/twitter.php:183
msgid "Allow posting to Twitter"
@@ -5096,8 +5351,8 @@ msgid ""
"<tt>owner</tt> variable to your config file. For other variables please "
"refer to the README file of the addon."
msgstr ""
-"Les mentions légales ont besoin d'être paramêtrées!<br />Merci d'ajouter "
-"au moins le <tt>propriétaire</tt> à votre configuration. Pour les autres "
+"Les mentions légales ont besoin d'être paramêtrées!<br />Merci d'ajouter au "
+"moins le <tt>propriétaire</tt> à votre configuration. Pour les autres "
"variables, merci de vous référer au README de l'extension."
#: ../../addon/impressum/impressum.php:71
@@ -5136,8 +5391,8 @@ msgid ""
msgstr ""
"Voici quelques paires de clés OAuth correspondant à quelques serveurs "
"courants. Si vous utilisez l'un d'entre eux, merci d'utiliser la paire "
-"fournie. Sinon, vous pouvez toujours vous connecter à l'instance "
-"StatusNet de votre choix (voir plus bas)."
+"fournie. Sinon, vous pouvez toujours vous connecter à l'instance StatusNet "
+"de votre choix (voir plus bas)."
#: ../../addon/statusnet/statusnet.php:276
msgid "Provide your own OAuth Credentials"
@@ -5161,9 +5416,10 @@ msgid ""
"associated StatusNet account. You can choose to do so by default (here) or "
"for every posting separately in the posting options when writing the entry."
msgstr ""
-"Si activé, toutes vos entrées <strong>publiques</strong> pourront être postées "
-"sur le compte StatusNet associé. Vous pouvez choisir de le faire par défaut (ici) ou "
-"pour chaque entrée séparément dans les options de la-dite entrée."
+"Si activé, toutes vos entrées <strong>publiques</strong> pourront être "
+"postées sur le compte StatusNet associé. Vous pouvez choisir de le faire par "
+"défaut (ici) ou pour chaque entrée séparément dans les options de la-dite "
+"entrée."
#: ../../addon/statusnet/statusnet.php:332
msgid "Allow posting to StatusNet"
@@ -5174,6 +5430,7 @@ msgid "Send public postings to StatusNet by default"
msgstr "Envoyer les entrées publiques vers StatusNet par défaut"
#: ../../addon/statusnet/statusnet.php:459 ../../mod/admin.php:308
+#: ../../mod/admin.php:311
msgid "Site name"
msgstr "Nom du site"
@@ -5198,21 +5455,24 @@ msgstr "Cacher vos amis/contacts des visiteurs de ce profil?"
msgid "Birthday (%s):"
msgstr "Date de naissance (%s):"
-#: ../../mod/profiles.php:472
+#: ../../mod/profiles.php:472 ../../boot.php:890
msgid "visible to everybody"
msgstr "visible par tout le monde"
#: ../../mod/notes.php:49 ../../mod/events.php:115 ../../mod/events.php:120
-#: ../../mod/profile.php:120 ../../mod/photos.php:837
+#: ../../mod/profile.php:120 ../../mod/photos.php:837 ../../include/nav.php:50
+#: ../../mod/events.php:122 ../../mod/events.php:127 ../../mod/profile.php:121
+#: ../../mod/photos.php:842
msgid "Events"
msgstr "Evènements"
#: ../../mod/notes.php:50 ../../mod/notes.php:55 ../../mod/events.php:116
-#: ../../mod/profile.php:121 ../../mod/photos.php:838
+#: ../../mod/profile.php:121 ../../mod/photos.php:838 ../../mod/notes.php:56
+#: ../../mod/events.php:123 ../../mod/profile.php:122 ../../mod/photos.php:843
msgid "Personal Notes"
-msgstr "Notes personnelles"
+msgstr "Notes"
-#: ../../mod/notes.php:74
+#: ../../mod/notes.php:74 ../../include/text.php:625 ../../mod/notes.php:75
msgid "Save"
msgstr "Enregistrer"
@@ -5224,11 +5484,11 @@ msgstr "Une invitation est requise."
msgid "Invitation could not be verified."
msgstr "L'invitation n'a pu être vérifiée."
-#: ../../mod/register.php:511
+#: ../../mod/register.php:511 ../../mod/register.php:510
msgid "Membership on this site is by invitation only."
msgstr "L'inscription à ce site se fait sur invitation uniquement."
-#: ../../mod/register.php:512
+#: ../../mod/register.php:512 ../../mod/register.php:511
msgid "Your invitation ID: "
msgstr "Votre invitation: "
@@ -5245,8 +5505,8 @@ msgid ""
"We would like to offer some tips and links to help make your experience "
"enjoyable. Click any item to visit the relevant page."
msgstr ""
-"Nous souhaitons vous offrir quelques astuces et pointeurs pour vous aider "
-"à faire de votre passage ici un moment agréable. Cliquez sur les éléments
+"Nous souhaitons vous offrir quelques astuces et pointeurs pour vous aider à "
+"faire de votre passage ici un moment agréable. Cliquez sur les éléments "
"suivants pour visiter les pages adéquates."
#: ../../mod/newmember.php:16
@@ -5272,27 +5532,28 @@ msgid ""
"that people with real photos of themselves are ten times more likely to make "
"friends than people who do not."
msgstr ""
-"Téléversez (c'est-à-dire envoyez-nous) une photo de profil si vous ne "
-"l'avez déjà fait. Les études montrent que les gens qui utilisent une vraie "
-"photo d'eux sont dix fois plus susceptibles de se faire de nouveaux amis "
-"que les autres."
+"Téléversez (c'est-à-dire envoyez-nous) une photo de profil si vous ne l'avez "
+"déjà fait. Les études montrent que les gens qui utilisent une vraie photo "
+"d'eux sont dix fois plus susceptibles de se faire de nouveaux amis que les "
+"autres."
#: ../../mod/newmember.php:23
msgid ""
"Authorise the Facebook Connector if you currently have a Facebook account "
"and we will (optionally) import all your Facebook friends and conversations."
msgstr ""
-"Activez le connecteur Facebook si vous avez un compte sur ce service, et nous "
-"pourrons (de manière facultative) importer tous vos amis et conversations."
+"Activez le connecteur Facebook si vous avez un compte sur ce service, et "
+"nous pourrons (de manière facultative) importer tous vos amis et "
+"conversations."
#: ../../mod/newmember.php:28
msgid ""
"Enter your email access information on your Settings page if you wish to "
"import and interact with friends or mailing lists from your email INBOX"
msgstr ""
-"Renseignez la page Réglages à propos de votre accès à vos courriels si "
-"vous souhaitez interagir avec des amis ou des listes de diffusion "
-"issues de votre boîte de réception"
+"Renseignez la page Réglages à propos de votre accès à vos courriels si vous "
+"souhaitez interagir avec des amis ou des listes de diffusion issues de votre "
+"boîte de réception"
#: ../../mod/newmember.php:30
msgid ""
@@ -5321,8 +5582,8 @@ msgid ""
"URL in the <em>Connect</em> dialog."
msgstr ""
"Votre page Contacts est l'endroit idéal pour gérer vos relations et vous "
-"connecter à des amis issus d'autres réseaux. En général, il suffit de "
-"saisir leur adresse dans la section <em>Relier</em>."
+"connecter à des amis issus d'autres réseaux. En général, il suffit de saisir "
+"leur adresse dans la section <em>Relier</em>."
#: ../../mod/newmember.php:36
msgid ""
@@ -5332,8 +5593,8 @@ msgid ""
msgstr ""
"L'Annuaire vous permet de rechercher d'autres personnes au sein de ce "
"réseau, ou dans l'ensemble des sites fédérés. Cherchez un lien nommé "
-"<em>Relier</em>, <em>Connect</em> ou <em>Follow</em> sur leurs profils. "
-"Vous aurez peut-être à fournir votre propre adresse d'identité."
+"<em>Relier</em>, <em>Connect</em> ou <em>Follow</em> sur leurs profils. Vous "
+"aurez peut-être à fournir votre propre adresse d'identité."
#: ../../mod/newmember.php:38
msgid ""
@@ -5343,8 +5604,8 @@ msgid ""
msgstr ""
"Une fois que vous aurez retrouvé quelques amis ou contacts, vous pourrez les "
"classer en groupes depuis le panneau latéral de votre page Contacts. Vous "
-"serez désormais en mesure d'interagir avec chaque groupe de manière exclusive "
-"et privée depuis la page Réseau."
+"serez désormais en mesure d'interagir avec chaque groupe de manière "
+"exclusive et privée depuis la page Réseau."
#: ../../mod/newmember.php:40
msgid ""
@@ -5356,14 +5617,16 @@ msgstr ""
#: ../../mod/match.php:18
msgid "No keywords to match. Please add keywords to your default profile."
-msgstr "Aucun mot-clé ne correspond. Merci d'ajouter quelques mots-clés à votre profil par défaut."
+msgstr ""
+"Aucun mot-clé ne correspond. Merci d'ajouter quelques mots-clés à votre "
+"profil par défaut."
#: ../../mod/update_community.php:18 ../../mod/update_profile.php:41
-#: ../../mod/update_network.php:22
+#: ../../mod/update_network.php:22 ../../mod/update_notes.php:41
msgid "[Embedded content - reload page to view]"
msgstr "[Contenu incorporé - rechargez la page]"
-#: ../../mod/apps.php:11
+#: ../../mod/apps.php:11 ../../mod/apps.php:7
msgid "No installed applications."
msgstr "Pas d'application installée."
@@ -5383,7 +5646,7 @@ msgstr "Tout voir"
msgid "View Starred Items"
msgstr "Voir les favoris"
-#: ../../mod/network.php:94
+#: ../../mod/network.php:94 ../../mod/network.php:194
#, php-format
msgid "Warning: This group contains %s member from an insecure network."
msgid_plural ""
@@ -5392,18 +5655,21 @@ msgstr[0] "Ce groupe contient %s membre issu d'un réseau non-fiable."
msgstr[1] "Ce groupe contient %s membres issus de réseaux non-fiables."
#: ../../mod/display.php:63 ../../mod/profile.php:103
+#: ../../mod/profile.php:104
msgid "Access to this profile has been restricted."
msgstr "L'accès à ce profil a été restreint."
-#: ../../mod/admin.php:66 ../../mod/admin.php:299
+#: ../../mod/admin.php:66 ../../mod/admin.php:299 ../../mod/admin.php:302
msgid "Site"
msgstr "Site"
#: ../../mod/admin.php:67 ../../mod/admin.php:463 ../../mod/admin.php:475
+#: ../../mod/admin.php:467 ../../mod/admin.php:479
msgid "Users"
msgstr "Utilisateurs"
#: ../../mod/admin.php:68 ../../mod/admin.php:552 ../../mod/admin.php:589
+#: ../../mod/admin.php:556 ../../mod/admin.php:593
msgid "Plugins"
msgstr "Extensions"
@@ -5411,7 +5677,7 @@ msgstr "Extensions"
msgid "Update"
msgstr "Mises-à-jour"
-#: ../../mod/admin.php:83 ../../mod/admin.php:654
+#: ../../mod/admin.php:83 ../../mod/admin.php:654 ../../mod/admin.php:658
msgid "Logs"
msgstr "Journaux"
@@ -5421,6 +5687,8 @@ msgstr "Inscriptions d'utilisateurs en attente de confirmation"
#: ../../mod/admin.php:151 ../../mod/admin.php:298 ../../mod/admin.php:462
#: ../../mod/admin.php:551 ../../mod/admin.php:588 ../../mod/admin.php:653
+#: ../../mod/admin.php:301 ../../mod/admin.php:466 ../../mod/admin.php:555
+#: ../../mod/admin.php:592 ../../mod/admin.php:657
msgid "Administration"
msgstr "Administration"
@@ -5444,196 +5712,198 @@ msgstr "Version"
msgid "Active plugins"
msgstr "Extensions actives"
-#: ../../mod/admin.php:247
+#: ../../mod/admin.php:247 ../../mod/admin.php:250
msgid "Site settings updated."
msgstr "Réglages du site appliqués."
-#: ../../mod/admin.php:291
+#: ../../mod/admin.php:291 ../../mod/admin.php:294
msgid "Closed"
msgstr "Fermé"
-#: ../../mod/admin.php:292
+#: ../../mod/admin.php:292 ../../mod/admin.php:295
msgid "Requires approval"
msgstr "Après autorisation"
-#: ../../mod/admin.php:293
+#: ../../mod/admin.php:293 ../../mod/admin.php:296
msgid "Open"
msgstr "Ouvert"
-#: ../../mod/admin.php:302
+#: ../../mod/admin.php:302 ../../mod/admin.php:305
msgid "File upload"
msgstr "Envoi de fichiers"
-#: ../../mod/admin.php:303
+#: ../../mod/admin.php:303 ../../mod/admin.php:306
msgid "Policies"
msgstr "Politiques"
-#: ../../mod/admin.php:304
+#: ../../mod/admin.php:304 ../../mod/admin.php:307
msgid "Advanced"
msgstr "Avancé"
-#: ../../mod/admin.php:309
+#: ../../mod/admin.php:309 ../../mod/admin.php:312
msgid "Banner/Logo"
msgstr "Titre/Logo"
-#: ../../mod/admin.php:310
+#: ../../mod/admin.php:310 ../../mod/admin.php:313
msgid "System language"
msgstr "Langue du système"
-#: ../../mod/admin.php:311
+#: ../../mod/admin.php:311 ../../mod/admin.php:314
msgid "System theme"
msgstr "Thème du système"
-#: ../../mod/admin.php:313
+#: ../../mod/admin.php:313 ../../mod/admin.php:316
msgid "Maximum image size"
msgstr "Taille maximum des images"
-#: ../../mod/admin.php:315
+#: ../../mod/admin.php:315 ../../mod/admin.php:318
msgid "Register policy"
msgstr "Politique d'inscription"
-#: ../../mod/admin.php:316
+#: ../../mod/admin.php:316 ../../mod/admin.php:319
msgid "Register text"
msgstr "Texte à l'inscription"
-#: ../../mod/admin.php:317
+#: ../../mod/admin.php:317 ../../mod/admin.php:321
msgid "Allowed friend domains"
msgstr "Domaines autorisés pour la mise en relation"
-#: ../../mod/admin.php:318
+#: ../../mod/admin.php:318 ../../mod/admin.php:322
msgid "Allowed email domains"
msgstr "Domaines autorisés pour les courriels"
-#: ../../mod/admin.php:319
+#: ../../mod/admin.php:319 ../../mod/admin.php:323
msgid "Block public"
msgstr "Bloquer public"
-#: ../../mod/admin.php:320
+#: ../../mod/admin.php:320 ../../mod/admin.php:324
msgid "Force publish"
msgstr "Forcer la publication"
-#: ../../mod/admin.php:321
+#: ../../mod/admin.php:321 ../../mod/admin.php:325
msgid "Global directory update URL"
msgstr "URL de mise à jour de l'annuaire global"
-#: ../../mod/admin.php:323
+#: ../../mod/admin.php:323 ../../mod/admin.php:327
msgid "Block multiple registrations"
msgstr "Interdire les inscriptions multiples"
-#: ../../mod/admin.php:324
+#: ../../mod/admin.php:324 ../../mod/admin.php:328
msgid "OpenID support"
msgstr "Support d'OpenID"
-#: ../../mod/admin.php:325
+#: ../../mod/admin.php:325 ../../mod/admin.php:329
msgid "Gravatar support"
msgstr "Support de Gravatar"
-#: ../../mod/admin.php:326
+#: ../../mod/admin.php:326 ../../mod/admin.php:330
msgid "Fullname check"
msgstr "Imposer 'Prénom Nom'"
-#: ../../mod/admin.php:327
+#: ../../mod/admin.php:327 ../../mod/admin.php:331
msgid "UTF-8 Regular expressions"
msgstr "Expressions rationnelles en UTF-8"
-#: ../../mod/admin.php:328
+#: ../../mod/admin.php:328 ../../mod/admin.php:332
msgid "Show Community Page"
msgstr "Montrer la Place publique"
-#: ../../mod/admin.php:329
+#: ../../mod/admin.php:329 ../../mod/admin.php:333
msgid "Enable OStatus support"
msgstr "Activer OStatus"
-#: ../../mod/admin.php:330
+#: ../../mod/admin.php:330 ../../mod/admin.php:334
msgid "Enable Diaspora support"
msgstr "Activer Diaspora"
-#: ../../mod/admin.php:331
+#: ../../mod/admin.php:331 ../../mod/admin.php:335
msgid "Only allow Friendika contacts"
msgstr "N'autoriser que les contacts Friendika"
-#: ../../mod/admin.php:332
+#: ../../mod/admin.php:332 ../../mod/admin.php:336
msgid "Verify SSL"
msgstr "Vérifier SSL"
-#: ../../mod/admin.php:333
+#: ../../mod/admin.php:333 ../../mod/admin.php:337
msgid "Proxy user"
msgstr "Utilisateur du proxy"
-#: ../../mod/admin.php:334
+#: ../../mod/admin.php:334 ../../mod/admin.php:338
msgid "Proxy URL"
msgstr "URL du proxy"
-#: ../../mod/admin.php:335
+#: ../../mod/admin.php:335 ../../mod/admin.php:339
msgid "Network timeout"
msgstr "Délai d'attente du réseau"
-#: ../../mod/admin.php:356
+#: ../../mod/admin.php:356 ../../mod/admin.php:360
#, php-format
msgid "%s user blocked"
msgid_plural "%s users blocked/unblocked"
msgstr[0] "%s utilisateur bloqué"
msgstr[1] "%s utilisateurs bloqués/débloqués"
-#: ../../mod/admin.php:363
+#: ../../mod/admin.php:363 ../../mod/admin.php:367
#, php-format
msgid "%s user deleted"
msgid_plural "%s users deleted"
msgstr[0] "%s utilisateur supprimé"
msgstr[1] "%s utilisateurs supprimés"
-#: ../../mod/admin.php:397
+#: ../../mod/admin.php:397 ../../mod/admin.php:401
#, php-format
msgid "User '%s' deleted"
msgstr "Utilisateur '%s' supprimé"
-#: ../../mod/admin.php:404
+#: ../../mod/admin.php:404 ../../mod/admin.php:408
#, php-format
msgid "User '%s' unblocked"
msgstr "Utilisateur '%s' débloqué"
-#: ../../mod/admin.php:404
+#: ../../mod/admin.php:404 ../../mod/admin.php:408
#, php-format
msgid "User '%s' blocked"
msgstr "Utilisateur '%s' bloqué"
-#: ../../mod/admin.php:465
+#: ../../mod/admin.php:465 ../../mod/admin.php:469
msgid "select all"
msgstr "tout sélectionner"
-#: ../../mod/admin.php:467
+#: ../../mod/admin.php:467 ../../mod/admin.php:471
msgid "Request date"
msgstr "Date de la demande"
#: ../../mod/admin.php:467 ../../mod/admin.php:476
+#: ../../include/contact_selectors.php:78 ../../mod/admin.php:471
+#: ../../mod/admin.php:480
msgid "Email"
msgstr "Courriel"
-#: ../../mod/admin.php:472
+#: ../../mod/admin.php:472 ../../mod/admin.php:476
msgid "Block"
msgstr "Bloquer"
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:473 ../../mod/admin.php:477
msgid "Unblock"
msgstr "Débloquer"
-#: ../../mod/admin.php:476
+#: ../../mod/admin.php:476 ../../mod/admin.php:480
msgid "Register date"
msgstr "Date d'inscription"
-#: ../../mod/admin.php:476
+#: ../../mod/admin.php:476 ../../mod/admin.php:480
msgid "Last login"
msgstr "Dernière connexion"
-#: ../../mod/admin.php:476
+#: ../../mod/admin.php:476 ../../mod/admin.php:480
msgid "Last item"
msgstr "Dernière entrée"
-#: ../../mod/admin.php:476
+#: ../../mod/admin.php:476 ../../mod/admin.php:480
msgid "Account"
msgstr "Compte"
-#: ../../mod/admin.php:478
+#: ../../mod/admin.php:478 ../../mod/admin.php:482
msgid ""
"Selected users will be deleted!\\n\\nEverything these users had posted on "
"this site will be permanently deleted!\\n\\nAre you sure?"
@@ -5641,77 +5911,79 @@ msgstr ""
"Les utilisateurs selectionnés seront supprimés!\\n\\nTout ce qu'ils ont "
"posté sur ce site sera définitivement perdu!\\n\\nÊtes-vous certain?"
-#: ../../mod/admin.php:479
+#: ../../mod/admin.php:479 ../../mod/admin.php:483
msgid ""
"The user {0} will be deleted!\\n\\nEverything this user has posted on this "
"site will be permanently deleted!\\n\\nAre you sure?"
msgstr ""
-"L'utilisateur {0} sera supprimé!\\n\\nTout ce qu'il a posté sur ce site "
-"sera définitivement perdu!\\n\\nÊtes-vous certain?"
+"L'utilisateur {0} sera supprimé!\\n\\nTout ce qu'il a posté sur ce site sera "
+"définitivement perdu!\\n\\nÊtes-vous certain?"
-#: ../../mod/admin.php:515
+#: ../../mod/admin.php:515 ../../mod/admin.php:519
#, php-format
msgid "Plugin %s disabled."
msgstr "Extension %s désactivée."
-#: ../../mod/admin.php:519
+#: ../../mod/admin.php:519 ../../mod/admin.php:523
#, php-format
msgid "Plugin %s enabled."
msgstr "Extension %s activée."
-#: ../../mod/admin.php:529
+#: ../../mod/admin.php:529 ../../mod/admin.php:533
msgid "Disable"
msgstr "Désactiver"
-#: ../../mod/admin.php:531
+#: ../../mod/admin.php:531 ../../mod/admin.php:535
msgid "Enable"
msgstr "Activer"
-#: ../../mod/admin.php:553
+#: ../../mod/admin.php:553 ../../mod/admin.php:557
msgid "Toggle"
msgstr "Activer/Désactiver"
-#: ../../mod/admin.php:616
+#: ../../mod/admin.php:616 ../../mod/admin.php:620
msgid "Log settings updated."
msgstr "Réglages des journaux mis-à-jour."
-#: ../../mod/admin.php:656
+#: ../../mod/admin.php:656 ../../mod/admin.php:660
msgid "Clear"
msgstr "Remettre à zéro"
-#: ../../mod/admin.php:662
+#: ../../mod/admin.php:662 ../../mod/admin.php:666
msgid "Debugging"
msgstr "Débogage"
-#: ../../mod/admin.php:663
+#: ../../mod/admin.php:663 ../../mod/admin.php:667
msgid "Log file"
msgstr "Fichier de journal"
-#: ../../mod/admin.php:663
+#: ../../mod/admin.php:663 ../../mod/admin.php:667
msgid "Must be writable by web server. Relative to your Friendika index.php."
-msgstr "Doit pouvoir être modifié par le serveur web. Chemin relatif à l'index.php de Friendika."
+msgstr ""
+"Doit pouvoir être modifié par le serveur web. Chemin relatif à l'index.php "
+"de Friendika."
-#: ../../mod/admin.php:664
+#: ../../mod/admin.php:664 ../../mod/admin.php:668
msgid "Log level"
msgstr "Niveau de journalisation"
-#: ../../mod/admin.php:705
+#: ../../mod/admin.php:705 ../../mod/admin.php:709
msgid "Close"
msgstr "Fermer"
-#: ../../mod/admin.php:711
+#: ../../mod/admin.php:711 ../../mod/admin.php:715
msgid "FTP Host"
msgstr "Hôte FTP"
-#: ../../mod/admin.php:712
+#: ../../mod/admin.php:712 ../../mod/admin.php:716
msgid "FTP Path"
msgstr "Chemin FTP"
-#: ../../mod/admin.php:713
+#: ../../mod/admin.php:713 ../../mod/admin.php:717
msgid "FTP User"
msgstr "Utilisateur FTP"
-#: ../../mod/admin.php:714
+#: ../../mod/admin.php:714 ../../mod/admin.php:718
msgid "FTP Password"
msgstr "Mot de passe FTP"
@@ -5720,30 +5992,30 @@ msgid ""
"In order to install Friendika we need to know how to connect to your "
"database."
msgstr ""
-"Pour installer Friendika, nous avons besoin des coordonnées de votre "
-"base de données."
+"Pour installer Friendika, nous avons besoin des coordonnées de votre base de "
+"données."
#: ../../mod/install.php:128
msgid ""
"The database you specify below should already exist. If it does not, please "
"create it before continuing."
msgstr ""
-"La base spécifiée ci-dessous doit exister. Si ce n'est le cas, créez-la avant "
-"de continuer."
+"La base spécifiée ci-dessous doit exister. Si ce n'est le cas, créez-la "
+"avant de continuer."
#: ../../mod/install.php:134
msgid ""
"Site administrator email address. Your account email address must match this "
"in order to use the web admin panel."
msgstr ""
-"Courriel de l'administrateur du site. L'adresse de courriel de votre compte doit "
-"correspondre pour pouvoir utiliser la page d'Administration."
+"Courriel de l'administrateur du site. L'adresse de courriel de votre compte "
+"doit correspondre pour pouvoir utiliser la page d'Administration."
#: ../../mod/install.php:204
msgid "Error: mb_string PHP module required but not installed."
msgstr "Erreur: le module mb_string de PHP est manquant."
-#: ../../mod/settings.php:9 ../../mod/photos.php:57
+#: ../../mod/settings.php:9 ../../mod/photos.php:57 ../../mod/photos.php:62
msgid "everybody"
msgstr "tout le monde"
@@ -5785,7 +6057,9 @@ msgstr "Expiration automatique des entrées de plus de <em>n</em> jours:"
#: ../../mod/settings.php:515
msgid "If empty, posts will not expire. Expired posts will be deleted"
-msgstr "Si le champ est vide, les entrées n'expireront pas. L'expiration équivaut à une suppression"
+msgstr ""
+"Si le champ est vide, les entrées n'expireront pas. L'expiration équivaut à "
+"une suppression"
#: ../../mod/settings.php:536
msgid "Last successful email check:"
@@ -5807,68 +6081,70 @@ msgstr "Adresse de réponse:"
msgid "No valid account found."
msgstr "Pas de compte valide trouvé."
-#: ../../mod/events.php:210
+#: ../../mod/events.php:210 ../../mod/events.php:217
msgid "Create New Event"
msgstr "Créer un évènement"
-#: ../../mod/events.php:213
+#: ../../mod/events.php:213 ../../mod/events.php:220
msgid "Previous"
msgstr "Précédent"
-#: ../../mod/events.php:216
+#: ../../mod/events.php:216 ../../mod/events.php:223
msgid "Next"
msgstr "Suivant"
-#: ../../mod/events.php:223
+#: ../../mod/events.php:223 ../../mod/events.php:230
msgid "l, F j"
msgstr "l, F j"
-#: ../../mod/events.php:235
+#: ../../mod/events.php:235 ../../mod/events.php:242
msgid "Edit event"
msgstr "Modifier l'évènement"
-#: ../../mod/events.php:305
+#: ../../mod/events.php:305 ../../mod/events.php:312
msgid "hour:minute"
msgstr "heure:minute"
-#: ../../mod/events.php:314
+#: ../../mod/events.php:314 ../../mod/events.php:321
msgid "Event details"
msgstr "Détails de l'évènement"
-#: ../../mod/events.php:315
+#: ../../mod/events.php:315 ../../mod/events.php:322
#, php-format
msgid "Format is %s %s. Starting date and Description are required."
-msgstr "Le format est %s %s. La date de début et la description sont obligatoires."
+msgstr ""
+"Le format est %s %s. La date de début et la description sont obligatoires."
-#: ../../mod/events.php:316
+#: ../../mod/events.php:316 ../../mod/events.php:323
msgid "Event Starts:"
msgstr "Date/heure de début:"
-#: ../../mod/events.php:319
+#: ../../mod/events.php:319 ../../mod/events.php:326
msgid "Finish date/time is not known or not relevant"
msgstr "La date/heure de fin est inconnue ou sans objet"
-#: ../../mod/events.php:321
+#: ../../mod/events.php:321 ../../mod/events.php:328
msgid "Event Finishes:"
msgstr "Date/heure de fin:"
-#: ../../mod/events.php:324
+#: ../../mod/events.php:324 ../../mod/events.php:331
msgid "Adjust for viewer timezone"
msgstr "Ajuster au fuseau horaire du visiteur"
-#: ../../mod/events.php:326
+#: ../../mod/events.php:326 ../../mod/events.php:333
msgid "Description:"
msgstr "Description:"
-#: ../../mod/events.php:330
+#: ../../mod/events.php:330 ../../mod/events.php:337
msgid "Share this event"
msgstr "Partager cet évènement"
#: ../../mod/item.php:667 ../../mod/item.php:733 ../../mod/dfrn_notify.php:684
+#: ../../mod/item.php:684 ../../mod/item.php:771
msgid "Administrator@"
msgstr "Administrator@"
-#: ../../mod/item.php:736
+#: ../../mod/item.php:736 ../../mod/item.php:774
#, php-format
msgid "%s posted to your profile wall at %s"
msgstr "%s a écrit sur votre profil (%s)"
@@ -5882,7 +6158,8 @@ msgid "View all site entries"
msgstr "Vue de toutes les entrées"
#: ../../mod/viewcontacts.php:61 ../../mod/contacts.php:306
-#: ../../mod/contacts.php:423
+#: ../../mod/contacts.php:423 ../../mod/contacts.php:300
+#: ../../mod/contacts.php:415
#, php-format
msgid "Visit %s's profile [%s]"
msgstr "Visiter le profile de %s [%s]"
@@ -5900,7 +6177,7 @@ msgstr "Le fichier dépasse la limite de %d"
msgid "File upload failed."
msgstr "Echec du téléversement."
-#: ../../mod/profile.php:134
+#: ../../mod/profile.php:134 ../../mod/profile.php:135
msgid "Tips for New Members"
msgstr "Astuces pour les nouveaux inscrits"
@@ -5925,7 +6202,7 @@ msgstr "Suggérer de amis/contacts"
msgid "Suggest a friend for %s"
msgstr "Suggérer un ami/contact pour %s"
-#: ../../mod/dfrn_request.php:631
+#: ../../mod/dfrn_request.php:631 ../../mod/dfrn_request.php:640
#, php-format
msgid "Does %s know you?"
msgstr "Est-ce que %s vous connaît?"
@@ -5934,8 +6211,8 @@ msgstr "Est-ce que %s vous connaît?"
msgid ""
"This site is not configured to allow communications with other networks."
msgstr ""
-"Ce site n'est pas configuré pour permettre les communication avec "
-"d'autres réseaux."
+"Ce site n'est pas configuré pour permettre les communication avec d'autres "
+"réseaux."
#: ../../mod/follow.php:40 ../../mod/follow.php:50
msgid "No compatible communication protocols or feeds were discovered."
@@ -5965,11 +6242,11 @@ msgstr "Entrée inaccessible."
msgid "Item was not found."
msgstr "Entrée introuvable."
-#: ../../mod/photos.php:616
+#: ../../mod/photos.php:616 ../../mod/photos.php:621
msgid "Image file is empty."
msgstr "L'image est vide."
-#: ../../mod/photos.php:820
+#: ../../mod/photos.php:820 ../../mod/photos.php:825
msgid "Access to this item is restricted."
msgstr "L'accès à cette entrée est restreint."
@@ -5986,13 +6263,262 @@ msgstr "suggéré(e) par %s"
msgid "Sharer"
msgstr "Source du partage"
-#: ../../mod/contacts.php:32
+#: ../../mod/contacts.php:32 ../../mod/contacts.php:30
#, php-format
msgid "%d invitation available"
msgid_plural "%d invitations available"
msgstr[0] "%d invitation disponible"
msgstr[1] "%d invitations disponibles"
-#: ../../mod/contacts.php:293
+#: ../../mod/contacts.php:293 ../../mod/contacts.php:284
msgid "Suggest friends"
msgstr "Suggérer des amis/contacts"
+
+#: ../../include/conversation.php:225 ../../include/conversation.php:531
+#: ../../include/conversation.php:532
+#, php-format
+msgid "View %s's profile @ %s"
+msgstr "Voir le profil de %s sur %s"
+
+#: ../../include/conversation.php:416
+msgid "like"
+msgstr "aime"
+
+#: ../../include/conversation.php:417
+msgid "dislike"
+msgstr "n'aime pas"
+
+#: ../../include/conversation.php:419
+msgid "Share this"
+msgstr "Partager ça"
+
+#: ../../include/conversation.php:419
+msgid "share"
+msgstr "partager"
+
+#: ../../include/conversation.php:463
+msgid "add star"
+msgstr "mettre en avant"
+
+#: ../../include/conversation.php:464
+msgid "remove star"
+msgstr "ne plus mettre en avant"
+
+#: ../../include/conversation.php:468
+msgid "starred"
+msgstr "mis en avant"
+
+#: ../../include/text.php:872
+msgid "default"
+msgstr ""
+
+#: ../../include/diaspora.php:1192
+#, php-format
+msgid "[Relayed] Comment authored by %s from network %s"
+msgstr "[Relayé] Commentaire de %s du réseau %s"
+
+#: ../../include/contact_selectors.php:78
+msgid "OStatus"
+msgstr "OStatus"
+
+#: ../../include/contact_selectors.php:78
+msgid "RSS/Atom"
+msgstr "RSS/Atom"
+
+#: ../../include/contact_selectors.php:78 ../../mod/dfrn_request.php:647
+msgid "Diaspora"
+msgstr "Diaspora"
+
+#: ../../include/contact_selectors.php:78
+msgid "Zot!"
+msgstr "Zot!"
+
+#: ../../include/group.php:25
+msgid ""
+"A deleted group with this name was revived. Existing item permissions "
+"<strong>may</strong> apply to this group and any future members. If this is "
+"not what you intended, please create another group with a different name."
+msgstr ""
+"Un groupe supprimé portant ce nom a été re-créé. Les anciennes permissions "
+"<strong>peuvent</strong> s'appliquer à ce groupe ainsi qu'à tous ses membres "
+"futurs. Si ce n'est pas ce que vous souhaitez, merci de créer un nouveau groupe "
+"avec un nom différent."
+
+#: ../../include/items.php:1617
+msgid "A new person is sharing with you at "
+msgstr "Une nouvelle personne partage avec vous sur "
+
+#: ../../include/nav.php:48
+msgid "Your profile page"
+msgstr "Votre page de profil"
+
+#: ../../include/nav.php:49
+msgid "Your photos"
+msgstr "Vos photos"
+
+#: ../../include/nav.php:50
+msgid "Your events"
+msgstr "Vos évènements"
+
+#: ../../include/nav.php:51
+msgid "Personal notes"
+msgstr "Notes personnelles"
+
+#: ../../include/nav.php:51
+msgid "Your personal photos"
+msgstr "Vos photos personnelles"
+
+#: ../../include/nav.php:158
+msgid "Nothing new here"
+msgstr "Rien de neuf ici"
+
+#: ../../mod/tagmatch.php:10
+msgid "Tag Match"
+msgstr ""
+
+#: ../../mod/network.php:85
+msgid "All"
+msgstr "Tout"
+
+#: ../../mod/network.php:91
+msgid "New"
+msgstr "Nouveaux"
+
+#: ../../mod/network.php:96
+msgid "Starred"
+msgstr "Mis en avant"
+
+#: ../../mod/network.php:101
+msgid "Bookmarks"
+msgstr "Favoris"
+
+#: ../../mod/network.php:134 ../../mod/search.php:13
+msgid "Saved Searches"
+msgstr "Recherches sauvées"
+
+#: ../../mod/network.php:140 ../../mod/search.php:16
+msgid "Remove term"
+msgstr "Retirer le terme"
+
+#: ../../mod/dfrn_confirm.php:585
+#, php-format
+msgid "Site public key not available in contact record for URL %s."
+msgstr "La clé publique du site n'est pas disponible dans l'enregistrement de contact pour l'URL %s."
+
+#: ../../mod/localtime.php:24
+msgid "Time Conversion"
+msgstr "Conversion de date/heure"
+
+#: ../../mod/localtime.php:26
+msgid ""
+"Friendika provides this service for sharing events with other networks and "
+"friends in unknown timezones."
+msgstr ""
+"Friendika fournit ce service pour partager des évènements avec d'autres "
+"réseaux, et des contacts situés dans des fuseaux horaires inconnus."
+
+#: ../../mod/localtime.php:30
+#, php-format
+msgid "UTC time: %s"
+msgstr "Temps universel (UTC): %s"
+
+#: ../../mod/localtime.php:33
+#, php-format
+msgid "Current timezone: %s"
+msgstr "Fuseau horaire actuel: %s"
+
+#: ../../mod/localtime.php:36
+#, php-format
+msgid "Converted localtime: %s"
+msgstr "Temps converti: %s"
+
+#: ../../mod/localtime.php:41
+msgid "Please select your timezone:"
+msgstr "Merci de choisir votre fuseau:"
+
+#: ../../mod/admin.php:320
+msgid "Accounts abandoned after x days"
+msgstr "Délai d'\"expiration\" des comptes (en jours)"
+
+#: ../../mod/admin.php:320
+msgid ""
+"Will not waste system resources polling external sites for abandonded "
+"accounts. Enter 0 for no time limit."
+msgstr ""
+"Pour ne pas gaspiller les ressources du système en surveillant des sites "
+"externes, Friendika peut marquer certains comptes inactifs comme abandonnés. "
+"Mettre 0 pour ne pas avoir de limite."
+
+#: ../../mod/ping.php:133
+msgid "{0} wants to be your friend"
+msgstr "{0} veut être relié"
+
+#: ../../mod/ping.php:138
+msgid "{0} sent you a message"
+msgstr "{0} vous a envoyé un message"
+
+#: ../../mod/ping.php:143
+msgid "{0} requested registration"
+msgstr "{0} a demandé à s'enregistrer"
+
+#: ../../mod/ping.php:149
+#, php-format
+msgid "{0} commented %s's post"
+msgstr "{0} a commenté l'entrée de %s"
+
+#: ../../mod/ping.php:154
+#, php-format
+msgid "{0} like %s's post"
+msgstr "{0} aime l'entrée de %s"
+
+#: ../../mod/ping.php:159
+#, php-format
+msgid "{0} dislike %s's post"
+msgstr "{0} n'aime pas l'entrée de %s"
+
+#: ../../mod/ping.php:164
+#, php-format
+msgid "{0} is now friend with %s"
+msgstr "{0} est désormais relié à %s"
+
+#: ../../mod/events.php:61
+msgid "Event description and start time are required."
+msgstr "L'évènement requiert une description et un début."
+
+#: ../../mod/dfrn_request.php:631
+#, php-format
+msgid ""
+"Diaspora members: Please do not use this form. Instead, enter \"%s\" into "
+"your Diaspora search bar."
+msgstr ""
+"Aux membres de Diaspora: merci de ne pas utiliser ce formulaire. Entrez "
+"plutôt \"%s\" dans votre barre de recherche Diaspora."
+
+#: ../../mod/dfrn_request.php:648
+msgid "- please share from your own site as noted above"
+msgstr "- merci de partager depuis votre propre site, comme indiqué plus haut"
+
+#: ../../mod/crepair.php:89
+msgid "@Tagname - overrides Name/Nickname"
+msgstr "@NomDuTag - outrepasse Nom/Surnom"
+
+#: ../../mod/photos.php:894
+msgid "Do not show a status post for this upload"
+msgstr "Ne pas notifier le réseau de cet envoi"
+
+#: ../../mod/photos.php:996
+msgid "Permission denied. Access to this item may be restricted."
+msgstr "Permission refusée. L'accès à cet élément peut avoir été restreint."
+
+#: ../../mod/photos.php:1048
+msgid "View photo"
+msgstr "Voir photo"
+
+#: ../../mod/contacts.php:38
+msgid "Similar Interests"
+msgstr "Intérêts similaires"
+
+#: ../../mod/contacts.php:288
+#, php-format
+msgid "Network type: %s"
+msgstr "Type de réseau: %s"
diff --git a/view/fr/strings.php b/view/fr/strings.php
index bbe728bf0..b5f736ae0 100644
--- a/view/fr/strings.php
+++ b/view/fr/strings.php
@@ -1,8 +1,5 @@
<?php
-function string_plural_select_fr($n){
- return ($n != 1);
-}
;
$a->strings["Logged out."] = "Déconnecté.";
$a->strings["Login failed."] = "Échec de connexion.";
@@ -37,7 +34,7 @@ $a->strings["Abstinent"] = "Abstinent";
$a->strings["Virgin"] = "Vierge";
$a->strings["Deviant"] = "Déviant";
$a->strings["Fetish"] = "Fétichiste";
-$a->strings["Oodles"] = "Oodles";
+$a->strings["Oodles"] = "";
$a->strings["Nonsexual"] = "Non-sexuel";
$a->strings["Single"] = "Célibataire";
$a->strings["Lonely"] = "Esseulé";
@@ -48,10 +45,10 @@ $a->strings["Unfaithful"] = "Infidèle";
$a->strings["Sex Addict"] = "Accro au sexe";
$a->strings["Friends"] = "Amis";
$a->strings["Friends/Benefits"] = "Amis par intérêt";
-$a->strings["Casual"] = "Casual";
+$a->strings["Casual"] = "Relation informelle";
$a->strings["Engaged"] = "Fiancé";
$a->strings["Married"] = "Marié";
-$a->strings["Partners"] = "Partenaire";
+$a->strings["Partners"] = "Avec partenaire";
$a->strings["Cohabiting"] = "En cohabitation";
$a->strings["Happy"] = "Heureux";
$a->strings["Not Looking"] = "Sans recherche";
@@ -676,7 +673,7 @@ $a->strings["%d member"] = array(
1 => "%d membres",
);
$a->strings["Warning: This group contains %s from an insecure network."] = "Attention : ce groupe contient %s, qui se connecte depuis un réseau non-sécurisé.";
-$a->strings["Private messages to this group are at risk of public disclosure."] = "es messages privés envoyés à ce groupe s'exposent à une diffusion incontrôlée.";
+$a->strings["Private messages to this group are at risk of public disclosure."] = "Les messages privés envoyés à ce groupe s'exposent à une diffusion incontrôlée.";
$a->strings["D, d M Y - g:i A"] = "D, d M Y - g:i A";
$a->strings["Friendika Social Network"] = "Réseau social Friendika";
$a->strings["Installation"] = "Installation";
@@ -689,9 +686,9 @@ $a->strings["Database Login Password"] = "Mot de passe de la base";
$a->strings["Database Name"] = "Nom de la base";
$a->strings["Please select a default timezone for your website"] = "Sélectionner un fuseau horaire par défaut pour votre site";
$a->strings["Normal Account"] = "Compte normal";
-$a->strings["This account is a normal personal profile"] = "e compte correspond à un profil normal, pour une seule personne (physique, généralement)";
+$a->strings["This account is a normal personal profile"] = "Ce compte correspond à un profil normal, pour une seule personne (physique, généralement)";
$a->strings["Soapbox Account"] = "Compte \"boîte à savon\"";
-$a->strings["Automatically approve all connection/friend requests as read-only fans"] = "ccepter automatiquement toutes les demandes d'amitié/connexion comme étant des fans 'en lecture seule'";
+$a->strings["Automatically approve all connection/friend requests as read-only fans"] = "Accepter automatiquement toutes les demandes d'amitié/connexion comme étant des fans 'en lecture seule'";
$a->strings["Community/Celebrity Account"] = "Compte de communauté/célébrité";
$a->strings["Automatically approve all connection/friend requests as read-write fans"] = "Accepter automatiquement toutes les demandes d'amitié/connexion comme étant des fans en 'lecture/écriture'";
$a->strings["Automatic Friend Account"] = "Compte auto-amical";
@@ -828,7 +825,7 @@ $a->strings["Delete Selected Items"] = "Supprimer les éléments selectionnés";
$a->strings["Attach file"] = "Joindre un fichier";
$a->strings["Public post"] = "Entrée publique";
$a->strings["bytes"] = "octets";
-$a->strings["Select an alternate language"] = "Choisir une autre langue";
+$a->strings["Select an alternate language"] = "Choisir une langue complémentaire";
$a->strings["show"] = "montrer";
$a->strings["don't show"] = "ne pas montrer";
$a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
@@ -907,7 +904,7 @@ $a->strings["Hide your contact/friend list from viewers of this profile?"] = "Ca
$a->strings["Birthday (%s):"] = "Date de naissance (%s):";
$a->strings["visible to everybody"] = "visible par tout le monde";
$a->strings["Events"] = "Evènements";
-$a->strings["Personal Notes"] = "Notes personnelles";
+$a->strings["Personal Notes"] = "Notes";
$a->strings["Save"] = "Enregistrer";
$a->strings["An invitation is required."] = "Une invitation est requise.";
$a->strings["Invitation could not be verified."] = "L'invitation n'a pu être vérifiée.";
@@ -1086,3 +1083,57 @@ $a->strings["%d invitation available"] = array(
1 => "%d invitations disponibles",
);
$a->strings["Suggest friends"] = "Suggérer des amis/contacts";
+$a->strings["View %s's profile @ %s"] = "Voir le profil de %s sur %s";
+$a->strings["like"] = "aime";
+$a->strings["dislike"] = "n'aime pas";
+$a->strings["Share this"] = "Partager ça";
+$a->strings["share"] = "partager";
+$a->strings["add star"] = "mettre en avant";
+$a->strings["remove star"] = "ne plus mettre en avant";
+$a->strings["starred"] = "mis en avant";
+$a->strings["default"] = "";
+$a->strings["[Relayed] Comment authored by %s from network %s"] = "[Relayé] Commentaire de %s du réseau %s";
+$a->strings["OStatus"] = "OStatus";
+$a->strings["RSS/Atom"] = "RSS/Atom";
+$a->strings["Diaspora"] = "Diaspora";
+$a->strings["Zot!"] = "Zot!";
+$a->strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Un groupe supprimé portant ce nom a été re-créé. Les anciennes permissions <strong>peuvent</strong> s'appliquer à ce groupe ainsi qu'à tous ses membres futurs. Si ce n'est pas ce que vous souhaitez, merci de créer un nouveau groupe avec un nom différent.";
+$a->strings["A new person is sharing with you at "] = "Une nouvelle personne partage avec vous sur ";
+$a->strings["Your profile page"] = "Votre page de profil";
+$a->strings["Your photos"] = "Vos photos";
+$a->strings["Your events"] = "Vos évènements";
+$a->strings["Personal notes"] = "Notes personnelles";
+$a->strings["Your personal photos"] = "Vos photos personnelles";
+$a->strings["Nothing new here"] = "Rien de neuf ici";
+$a->strings["Tag Match"] = "";
+$a->strings["All"] = "Tout";
+$a->strings["New"] = "Nouveaux";
+$a->strings["Starred"] = "Mis en avant";
+$a->strings["Bookmarks"] = "Favoris";
+$a->strings["Saved Searches"] = "Recherches sauvées";
+$a->strings["Remove term"] = "Retirer le terme";
+$a->strings["Site public key not available in contact record for URL %s."] = "La clé publique du site n'est pas disponible dans l'enregistrement de contact pour l'URL %s.";
+$a->strings["Time Conversion"] = "Conversion de date/heure";
+$a->strings["Friendika provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendika fournit ce service pour partager des évènements avec d'autres réseaux, et des contacts situés dans des fuseaux horaires inconnus.";
+$a->strings["UTC time: %s"] = "Temps universel (UTC): %s";
+$a->strings["Current timezone: %s"] = "Fuseau horaire actuel: %s";
+$a->strings["Converted localtime: %s"] = "Temps converti: %s";
+$a->strings["Please select your timezone:"] = "Merci de choisir votre fuseau:";
+$a->strings["Accounts abandoned after x days"] = "Délai d'\"expiration\" des comptes (en jours)";
+$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Pour ne pas gaspiller les ressources du système en surveillant des sites externes, Friendika peut marquer certains comptes inactifs comme abandonnés. Mettre 0 pour ne pas avoir de limite.";
+$a->strings["{0} wants to be your friend"] = "{0} veut être relié";
+$a->strings["{0} sent you a message"] = "{0} vous a envoyé un message";
+$a->strings["{0} requested registration"] = "{0} a demandé à s'enregistrer";
+$a->strings["{0} commented %s's post"] = "{0} a commenté l'entrée de %s";
+$a->strings["{0} like %s's post"] = "{0} aime l'entrée de %s";
+$a->strings["{0} dislike %s's post"] = "{0} n'aime pas l'entrée de %s";
+$a->strings["{0} is now friend with %s"] = "{0} est désormais relié à %s";
+$a->strings["Event description and start time are required."] = "L'évènement requiert une description et un début.";
+$a->strings["Diaspora members: Please do not use this form. Instead, enter \"%s\" into your Diaspora search bar."] = "Aux membres de Diaspora: merci de ne pas utiliser ce formulaire. Entrez plutôt \"%s\" dans votre barre de recherche Diaspora.";
+$a->strings["- please share from your own site as noted above"] = "- merci de partager depuis votre propre site, comme indiqué plus haut";
+$a->strings["@Tagname - overrides Name/Nickname"] = "@NomDuTag - outrepasse Nom/Surnom";
+$a->strings["Do not show a status post for this upload"] = "Ne pas notifier le réseau de cet envoi";
+$a->strings["Permission denied. Access to this item may be restricted."] = "Permission refusée. L'accès à cet élément peut avoir été restreint.";
+$a->strings["View photo"] = "Voir photo";
+$a->strings["Similar Interests"] = "Intérêts similaires";
+$a->strings["Network type: %s"] = "Type de réseau: %s";
From 07b09300a9aa6f10941b07dd289539b675d1e6ec Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 4 Oct 2011 03:06:34 -0700
Subject: [PATCH 34/46] improve feed import performance
---
include/items.php | 18 +++++++++---------
include/poller.php | 4 ++--
mod/pubsub.php | 4 ++--
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/include/items.php b/include/items.php
index d907aeddb..c8dd4ca42 100644
--- a/include/items.php
+++ b/include/items.php
@@ -1081,7 +1081,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
*
*/
-function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $secure_feed = false) {
+function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0) {
require_once('library/simplepie/simplepie.inc');
@@ -1249,7 +1249,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $secure_fee
// process any deleted entries
$del_entries = $feed->get_feed_tags(NAMESPACE_TOMB, 'deleted-entry');
- if(is_array($del_entries) && count($del_entries)) {
+ if(is_array($del_entries) && count($del_entries) && $pass != 2) {
foreach($del_entries as $dentry) {
$deleted = false;
if(isset($dentry['attribs']['']['ref'])) {
@@ -1341,7 +1341,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $secure_fee
$parent_uri = $rawthread[0]['attribs']['']['ref'];
}
- if(($is_reply) && is_array($contact)) {
+ if(($is_reply) && is_array($contact) && $pass != 1) {
// Have we seen it? If not, import it.
@@ -1393,7 +1393,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $secure_fee
}
$force_parent = false;
- if($contact['network'] === 'stat') {
+ if($contact['network'] === NETWORK_OSTATUS) {
$force_parent = true;
if(strlen($datarray['title']))
unset($datarray['title']);
@@ -1405,7 +1405,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $secure_fee
$datarray['last-child'] = 1;
}
- if(($contact['network'] === 'feed') || (! strlen($contact['notify']))) {
+ if(($contact['network'] === NETWORK_FEED) || (! strlen($contact['notify']))) {
// one way feed - no remote comment ability
$datarray['last-child'] = 0;
}
@@ -1438,6 +1438,8 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $secure_fee
$datarray['author-avatar'] = $contact['thumb'];
}
+ // special handling for events
+
if((x($datarray,'object-type')) && ($datarray['object-type'] === ACTIVITY_OBJ_EVENT)) {
$ev = bbtoevent($datarray['body']);
if(x($ev,'desc') && x($ev,'start')) {
@@ -1511,18 +1513,16 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $secure_fee
}
-
-
if(! is_array($contact))
return;
- if($contact['network'] === 'stat' || stristr($permalink,'twitter.com')) {
+ if($contact['network'] === NETWORK_OSTATUS || stristr($permalink,'twitter.com')) {
if(strlen($datarray['title']))
unset($datarray['title']);
$datarray['last-child'] = 1;
}
- if(($contact['network'] === 'feed') || (! strlen($contact['notify']))) {
+ if(($contact['network'] === NETWORK_FEED) || (! strlen($contact['notify']))) {
// one way feed - no remote comment ability
$datarray['last-child'] = 0;
}
diff --git a/include/poller.php b/include/poller.php
index 89a3408ec..427f8887c 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -486,11 +486,11 @@ function poller_run($argv, $argc){
}
- consume_feed($xml,$importer,$contact,$hub,1, true);
+ consume_feed($xml,$importer,$contact,$hub,1,1);
// do it twice. Ensures that children of parents which may be later in the stream aren't tossed
- consume_feed($xml,$importer,$contact,$hub,1);
+ consume_feed($xml,$importer,$contact,$hub,1,2);
$hubmode = 'subscribe';
if($contact['network'] === NETWORK_DFRN || $contact['blocked'] || $contact['readonly'])
diff --git a/mod/pubsub.php b/mod/pubsub.php
index b2f006927..0c506db00 100644
--- a/mod/pubsub.php
+++ b/mod/pubsub.php
@@ -132,11 +132,11 @@ function pubsub_post(&$a) {
require_once('include/items.php');
- consume_feed($xml,$importer,$contact,$feedhub,1);
+ consume_feed($xml,$importer,$contact,$feedhub,1,1);
// do it a second time so that any children find their parents.
- consume_feed($xml,$importer,$contact,$feedhub,1);
+ consume_feed($xml,$importer,$contact,$feedhub,1,2);
hub_post_return();
From aeb83fa063297db774826f750fcef68904c901a0 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 4 Oct 2011 04:38:58 -0700
Subject: [PATCH 35/46] document multi-pass mode on consume_feed
---
include/items.php | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/include/items.php b/include/items.php
index c8dd4ca42..dc08fb3db 100644
--- a/include/items.php
+++ b/include/items.php
@@ -1078,7 +1078,18 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
* have a contact record.
* $hub = should we find a hub declation in the feed, pass it back to our calling process, who might (or
* might not) try and subscribe to it.
+ * $datedir sorts in reverse order
+ * $pass - by default ($pass = 0) we cannot guarantee that a parent item has been
+ * imported prior to its children being seen in the stream unless we are certain
+ * of how the feed is arranged/ordered.
+ * With $pass = 1, we only pull parent items out of the stream.
+ * With $pass = 2, we only pull children (comments/likes).
*
+ * So running this twice, first with pass 1 and then with pass 2 will do the right
+ * thing regardless of feed ordering. This won't be adequate in a fully-threaded
+ * model where comments can have sub-threads. That would require some massive sorting
+ * to get all the feed items into a mostly linear ordering, and might still require
+ * recursion.
*/
function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0) {
From 4a5079f8fb73f65820229783d2ef0e9374e3a743 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 4 Oct 2011 05:19:25 -0700
Subject: [PATCH 36/46] urlescape saved search terms
---
mod/network.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mod/network.php b/mod/network.php
index 371a35402..f0e9e4441 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -137,7 +137,7 @@ function saved_searches($search) {
if(count($r)) {
$o .= '<ul id="saved-search-ul">' . "\r\n";
foreach($r as $rr) {
- $o .= '<li class="saved-search-li clear"><a href="network/?f=&remove=1&search=' . $rr['term'] . '" class="icon drophide savedsearchdrop" title="' . t('Remove term') . '" onclick="return confirmDelete();" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a> <a href="network/?f&search=' . $rr['term'] . '" class="savedsearchterm" >' . $rr['term'] . '</a></li>' . "\r\n";
+ $o .= '<li class="saved-search-li clear"><a href="network/?f=&remove=1&search=' . $rr['term'] . '" class="icon drophide savedsearchdrop" title="' . t('Remove term') . '" onclick="return confirmDelete();" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a> <a href="network/?f&search=' . urlencode($rr['term']) . '" class="savedsearchterm" >' . $rr['term'] . '</a></li>' . "\r\n";
}
$o .= '</ul>';
}
From f7d055687eb8e87368023a94a613b027458cdd83 Mon Sep 17 00:00:00 2001
From: Devlon Duthie <duthied@gmail.com>
Date: Tue, 4 Oct 2011 11:10:57 -0500
Subject: [PATCH 37/46] - moved the header for profile permissions out of the
scrolling div - tweaks to the testbubble theme's nav
---
mod/profperm.php | 13 +++++++++----
view/theme/testbubble/nav.tpl | 2 +-
view/theme/testbubble/style.css | 25 ++++++++++++++++++++-----
3 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/mod/profperm.php b/mod/profperm.php
index 33479cad1..8d09c429c 100644
--- a/mod/profperm.php
+++ b/mod/profperm.php
@@ -109,9 +109,11 @@ function profperm_content(&$a) {
$o .= '<div id="prof-update-wrapper">';
if($change)
$o = '';
-
- $o .= '<div id="prof-members">';
+
+ $o .= '<div id="prof-members-title">';
$o .= '<h3>' . t('Visible To') . '</h3>';
+ $o .= '</div>';
+ $o .= '<div id="prof-members">';
$textmode = (($switchtotext && (count($members) > $switchtotext)) ? true : false);
@@ -123,9 +125,12 @@ function profperm_content(&$a) {
}
$o .= '</div><div id="prof-members-end"></div>';
$o .= '<hr id="prof-separator" />';
- $o .= '<div id="prof-all-contacts">';
- $o .= '<h3>' . t("All Contacts \x28with secure profile access\x29") . '</h3>';
+ $o .= '<div id="prof-all-contcts-title">';
+ $o .= '<h3>' . t("All Contacts \x28with secure profile access\x29") . '</h3>';
+ $o .= '</div>';
+ $o .= '<div id="prof-all-contacts">';
+
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `blocked` = 0 and `pending` = 0 and `self` = 0
AND `network` = 'dfrn' ORDER BY `name` ASC",
intval(local_user())
diff --git a/view/theme/testbubble/nav.tpl b/view/theme/testbubble/nav.tpl
index 38d2dfac6..80bcfbeb1 100644
--- a/view/theme/testbubble/nav.tpl
+++ b/view/theme/testbubble/nav.tpl
@@ -6,7 +6,7 @@
<div id="notifications">
{{ if $nav.network }}<a id="net-update" class="nav-ajax-update" href="$nav.network.0" title="$nav.network.1"></a>{{ endif }}
{{ if $nav.home }}<a id="home-update" class="nav-ajax-update" href="$nav.home.0" title="$nav.home.1"></a>{{ endif }}
- {{ if $nav.notifications }}<a id="notify-update" class="nav-ajax-update" href="$nav.notifications.0" title="$nav.notifications.1"></a>{{ endif }}
+ {{ if $nav.notifications }}<a id="intro-update" class="nav-ajax-update" href="$nav.notifications.0" title="$nav.notifications.1"></a>{{ endif }}
{{ if $nav.messages }}<a id="mail-update" class="nav-ajax-update" href="$nav.messages.0" title="$nav.messages.1"></a>{{ endif }}
</div>
diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css
index a468296fb..03f50762b 100644
--- a/view/theme/testbubble/style.css
+++ b/view/theme/testbubble/style.css
@@ -377,7 +377,7 @@ ul#user-menu-popup li a.nav-sep { border-top: 1px solid #989898; border-style:in
}
#net-update { background-position: 0px 0px; }
#mail-update { background-position: 0px -40px; }
-#notify-update { background-position: 0px -84px; }
+#intro-update { background-position: 0px -84px; }
#home-update { background-position: 0px -126px; }
#lang-select-icon {
@@ -848,7 +848,12 @@ profile-jot-banner-wrapper {
}
.wall-item-outside-wrapper-end { clear: both;}
-.wall-item-content-wrapper { position: relative; max-width: 100%; }
+.wall-item-content-wrapper {
+ position: relative;
+ max-width: 100%;
+ word-wrap: break-word;
+}
+
.wall-item-photo-menu { display: none;}
.wall-item-photo-menu-button {
display:none;
@@ -1192,7 +1197,8 @@ div[id$="wrapper"] br { clear: left; }
#profile-listing-new-link-wrapper {
float: left;
- display: inline;
+ display: inline-block;
+ clear: right;
width: 130px;
margin-left:5px;
margin-top: 20px;
@@ -2022,7 +2028,7 @@ margin-left: 0px;
border-radius:5px;
padding: 5px 10px 5px 10px;
color: #efefef;
- font-size: 1.2em;
+ font-size: 1em;
text-align: center;
}
@@ -2181,7 +2187,12 @@ margin-left: 0px;
.settings-submit-wrapper,
.profile-edit-submit-wrapper { margin: 30px 0px;}
-.profile-listing { float: left; clear: both; margin: 20px 20px 0px 0px}
+.profile-listing {
+ float: left;
+ clear: left;
+ display: inline;
+ margin: 20px 20px 0px 0px;
+}
#profile-edit-links ul { margin: 20px 0px; padding: 0px; list-style: none; }
@@ -2245,6 +2256,10 @@ margin-left: 0px;
#group-edit-desc { margin: 10px 0xp; }
#group-new-text {font-size: 1.1em;}
+#prof-members-title,#prof-all-contcts-title {
+ margin-top: 10px;
+ margin-bottom: 5px;
+}
#group-members,
#prof-members {
width: 83%;
From 7b648e6da85ece5b402dfce6d546f5711bc63bea Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 4 Oct 2011 18:53:56 -0700
Subject: [PATCH 38/46] performance enhancements
---
boot.php | 2 +-
include/delivery.php | 8 ++++++--
include/items.php | 4 ++--
include/notifier.php | 7 ++++++-
mod/pubsub.php | 9 +++++++--
5 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/boot.php b/boot.php
index 770667177..65a1b8229 100644
--- a/boot.php
+++ b/boot.php
@@ -8,7 +8,7 @@ require_once("include/pgettext.php");
require_once('include/nav.php');
define ( 'FRIENDIKA_PLATFORM', 'Free Friendika');
-define ( 'FRIENDIKA_VERSION', '2.3.1123' );
+define ( 'FRIENDIKA_VERSION', '2.3.1124' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1094 );
diff --git a/include/delivery.php b/include/delivery.php
index 46112d78e..e06db6d97 100644
--- a/include/delivery.php
+++ b/include/delivery.php
@@ -123,7 +123,6 @@ function delivery_run($argv, $argc){
if( ! ($icontacts && count($icontacts)))
return;
-
// avoid race condition with deleting entries
if($items[0]['deleted']) {
@@ -269,7 +268,12 @@ function delivery_run($argv, $argc){
if(! $item_contact)
continue;
- $atom .= atom_entry($item,'text',$item_contact,$owner,true);
+ if($normal_mode) {
+ if($item_id == $item['id'])
+ $atom .= atom_entry($item,'text',$item_contact,$owner,true);
+ }
+ else
+ $atom .= atom_entry($item,'text',$item_contact,$owner,true);
}
diff --git a/include/items.php b/include/items.php
index dc08fb3db..93a730d22 100644
--- a/include/items.php
+++ b/include/items.php
@@ -1663,7 +1663,7 @@ function lose_sharer($importer,$contact,$datarray,$item) {
}
-function subscribe_to_hub($url,$importer,$contact,$submode = 'subscribe') {
+function subscribe_to_hub($url,$importer,$contact,$hubmode = 'subscribe') {
if(is_array($importer)) {
$r = q("SELECT `nickname` FROM `user` WHERE `uid` = %d LIMIT 1",
@@ -1686,7 +1686,7 @@ function subscribe_to_hub($url,$importer,$contact,$submode = 'subscribe') {
$params= 'hub.mode=' . $hubmode . '&hub.callback=' . urlencode($push_url) . '&hub.topic=' . urlencode($contact['poll']) . '&hub.verify=async&hub.verify_token=' . $verify_token;
- logger('subscribe_to_hub: subscribing ' . $contact['name'] . ' to hub ' . $url . ' with verifier ' . $verify_token);
+ logger('subscribe_to_hub: ' . $hubmode . ' ' . $contact['name'] . ' to hub ' . $url . ' endpoint: ' . $push_url . ' with verifier ' . $verify_token);
if(! strlen($contact['hub-verify'])) {
$r = q("UPDATE `contact` SET `hub-verify` = '%s' WHERE `id` = %d LIMIT 1",
diff --git a/include/notifier.php b/include/notifier.php
index d1cd1cc73..ceeea2368 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -360,7 +360,12 @@ function notifier_run($argv, $argc){
if(! $contact)
continue;
- $atom .= atom_entry($item,'text',$contact,$owner,true);
+ if($normal_mode) {
+ if($item_id == $item['id'])
+ $atom .= atom_entry($item,'text',$contact,$owner,true);
+ }
+ else
+ $atom .= atom_entry($item,'text',$contact,$owner,true);
if(($top_level) && ($public_message) && ($item['author-link'] === $item['owner-link']) && (! $expire))
$slaps[] = atom_entry($item,'html',$contact,$owner,true);
diff --git a/mod/pubsub.php b/mod/pubsub.php
index 0c506db00..93d50ef90 100644
--- a/mod/pubsub.php
+++ b/mod/pubsub.php
@@ -69,8 +69,13 @@ function pubsub_init(&$a) {
// We must initiate an unsubscribe request with a verify_token.
// Don't allow outsiders to unsubscribe us.
- if(($hub_mode === 'unsubscribe') && (! strlen($hub_verify)))
- hub_return(false, '');
+ if($hub_mode === 'unsubscribe') {
+ if(! strlen($hub_verify)) {
+ logger('pubsub: bogus unsubscribe');
+ hub_return(false, '');
+ }
+ logger('pubsub: unsubscribe success');
+ }
$r = q("UPDATE `contact` SET `subhub` = %d WHERE `id` = %d LIMIT 1",
intval($subscribe),
From 159d06df828d3837a0bcb80add338efffa984cfb Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 4 Oct 2011 21:43:21 -0700
Subject: [PATCH 39/46] notification issue after last checkin
---
mod/dfrn_notify.php | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 23bdd7388..c7ad61ecc 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -450,7 +450,15 @@ function dfrn_notify_post(&$a) {
}
if($is_reply) {
- if($feed->get_item_quantity() == 1) {
+
+ // was the top-level post for this reply written by somebody on this site? Specifically, the recipient?
+
+ $r = q("select `id` from `item` where `uri` = '%s' and AND `uid` = %d LIMIT 1",
+ dbesc($parent_uri),
+ intval($importer['importer_uid'])
+ )
+ if($r && count($r)) {
+
logger('dfrn_notify: received remote comment');
$is_like = false;
// remote reply to our post. Import and then notify everybody else.
From c2d70d005bc967e19c0da23d1490bf64e3582c10 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 4 Oct 2011 21:45:15 -0700
Subject: [PATCH 40/46] and a typo fix
---
mod/dfrn_notify.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index c7ad61ecc..1ec825786 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -456,7 +456,7 @@ function dfrn_notify_post(&$a) {
$r = q("select `id` from `item` where `uri` = '%s' and AND `uid` = %d LIMIT 1",
dbesc($parent_uri),
intval($importer['importer_uid'])
- )
+ );
if($r && count($r)) {
logger('dfrn_notify: received remote comment');
From 6ff221d5a16ed9ca18a3fe8399b1588d5234fcc5 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 4 Oct 2011 21:53:33 -0700
Subject: [PATCH 41/46] another typo
---
mod/dfrn_notify.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 1ec825786..9e9809950 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -453,7 +453,7 @@ function dfrn_notify_post(&$a) {
// was the top-level post for this reply written by somebody on this site? Specifically, the recipient?
- $r = q("select `id` from `item` where `uri` = '%s' and AND `uid` = %d LIMIT 1",
+ $r = q("select `id` from `item` where `uri` = '%s' AND `uid` = %d LIMIT 1",
dbesc($parent_uri),
intval($importer['importer_uid'])
);
From ab5052197137b1fbf069f3791c75d6163c569bc0 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 4 Oct 2011 22:00:45 -0700
Subject: [PATCH 42/46] yikes
---
include/delivery.php | 2 +-
include/notifier.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/delivery.php b/include/delivery.php
index e06db6d97..1ba1d9c3a 100644
--- a/include/delivery.php
+++ b/include/delivery.php
@@ -269,7 +269,7 @@ function delivery_run($argv, $argc){
continue;
if($normal_mode) {
- if($item_id == $item['id'])
+ if($item_id == $item['id'] || $item['id'] == $item['parent'])
$atom .= atom_entry($item,'text',$item_contact,$owner,true);
}
else
diff --git a/include/notifier.php b/include/notifier.php
index ceeea2368..ccac5106f 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -361,7 +361,7 @@ function notifier_run($argv, $argc){
continue;
if($normal_mode) {
- if($item_id == $item['id'])
+ if($item_id == $item['id'] || $item['id'] == $item['parent'])
$atom .= atom_entry($item,'text',$contact,$owner,true);
}
else
From 6c521017f5e58432d0eaadb90d0745fe7c4f1472 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 4 Oct 2011 22:03:57 -0700
Subject: [PATCH 43/46] document backward compat issue
---
include/notifier.php | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/include/notifier.php b/include/notifier.php
index ccac5106f..c3f7f33ea 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -361,6 +361,10 @@ function notifier_run($argv, $argc){
continue;
if($normal_mode) {
+
+ // we only need the current item, but include the parent because without it
+ // older sites without a corresponding dfrn_notify change may do the wrong thing.
+
if($item_id == $item['id'] || $item['id'] == $item['parent'])
$atom .= atom_entry($item,'text',$contact,$owner,true);
}
From 924d4193789217dadbddf8e0dddb960a2988136c Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Wed, 5 Oct 2011 02:35:25 -0700
Subject: [PATCH 44/46] added prepare_body hooks
---
include/text.php | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/include/text.php b/include/text.php
index 656cd8809..701c1e41b 100644
--- a/include/text.php
+++ b/include/text.php
@@ -744,7 +744,12 @@ function link_compare($a,$b) {
if(! function_exists('prepare_body')) {
function prepare_body($item,$attach = false) {
+ call_hooks('prepare_body_init', $item);
+
$s = prepare_text($item['body']);
+
+ call_hooks('prepare_body', $s);
+
if(! $attach)
return $s;
@@ -776,6 +781,7 @@ function prepare_body($item,$attach = false) {
}
$s .= '<div class="clear"></div></div>';
}
+ call_hooks('prepare_body_final', $s);
return $s;
}}
From 7d5e839664edc65bbb7dde5c2533393a8ebb8433 Mon Sep 17 00:00:00 2001
From: Devlon Duthie <duthied@gmail.com>
Date: Wed, 5 Oct 2011 11:29:25 -0500
Subject: [PATCH 45/46] - added drop-down notification support in testbubble
theme
---
view/theme/testbubble/nav.tpl | 21 ++---
view/theme/testbubble/style.css | 135 ++++++++++++++++++++++++++------
2 files changed, 123 insertions(+), 33 deletions(-)
diff --git a/view/theme/testbubble/nav.tpl b/view/theme/testbubble/nav.tpl
index 80bcfbeb1..dc16d40eb 100644
--- a/view/theme/testbubble/nav.tpl
+++ b/view/theme/testbubble/nav.tpl
@@ -3,13 +3,16 @@
<span id="banner">$banner</span>
- <div id="notifications">
- {{ if $nav.network }}<a id="net-update" class="nav-ajax-update" href="$nav.network.0" title="$nav.network.1"></a>{{ endif }}
- {{ if $nav.home }}<a id="home-update" class="nav-ajax-update" href="$nav.home.0" title="$nav.home.1"></a>{{ endif }}
- {{ if $nav.notifications }}<a id="intro-update" class="nav-ajax-update" href="$nav.notifications.0" title="$nav.notifications.1"></a>{{ endif }}
- {{ if $nav.messages }}<a id="mail-update" class="nav-ajax-update" href="$nav.messages.0" title="$nav.messages.1"></a>{{ endif }}
+ <div id="notifications">
+ {{ if $nav.network }}<a rel="#nav-notifications-menu" id="net-update" class="nav-ajax-update" href="$nav.network.0" title="$nav.network.1"></a>{{ endif }}
+ {{ if $nav.home }}<a rel="#nav-notifications-menu" id="home-update" class="nav-ajax-update" href="$nav.home.0" title="$nav.home.1"></a>{{ endif }}
+ {{ if $nav.notifications }}<a rel="#nav-notifications-menu" id="intro-update" class="nav-ajax-update" href="$nav.notifications.0" title="$nav.notifications.1"></a>{{ endif }}
+ {{ if $nav.messages }}<a rel="#nav-notifications-menu" id="mail-update" class="nav-ajax-update" href="$nav.messages.0" title="$nav.messages.1"></a>{{ endif }}
+ <ul id="nav-notifications-menu" class="menu-popup">
+ <li class="empty">$emptynotifications</li>
+ </ul>
</div>
-
+
<div id="user-menu" >
<a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="$nav.home.0">$sitelocation</a>
@@ -48,8 +51,8 @@
{{ if $nav.logout }}<li><a id="nav-logout-link" class="nav-commlink nav-sep $nav.logout.2" href="$nav.logout.0">$nav.logout.1</a></li> {{ endif }}
</ul>
</div>
-
-
-
</nav>
+<ul id="nav-notifications-template" style="display:none;" rel="template">
+ <li><a href="{0}">{2} <span class="notif-when">{3}</span></a></li>
+</ul>
diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css
index 03f50762b..5e31a2c8a 100644
--- a/view/theme/testbubble/style.css
+++ b/view/theme/testbubble/style.css
@@ -375,10 +375,10 @@ ul#user-menu-popup li a.nav-sep { border-top: 1px solid #989898; border-style:in
padding-left: 11px;
/*display: none;*/
}
-#net-update { background-position: 0px 0px; }
+#net-update { background-position: 0px -126px; }
#mail-update { background-position: 0px -40px; }
#intro-update { background-position: 0px -84px; }
-#home-update { background-position: 0px -126px; }
+#home-update { background-position: 0px 0px; }
#lang-select-icon {
cursor: pointer;
@@ -845,15 +845,12 @@ profile-jot-banner-wrapper {
border-bottom: 1px solid #dedede;
margin-top: 20px;
padding-right: 10px;
+ padding-left: 12px;
+ overflow: hidden;
}
.wall-item-outside-wrapper-end { clear: both;}
-.wall-item-content-wrapper {
- position: relative;
- max-width: 100%;
- word-wrap: break-word;
-}
-
+.wall-item-content-wrapper { position: relative; max-width: 100%; }
.wall-item-photo-menu { display: none;}
.wall-item-photo-menu-button {
display:none;
@@ -1197,8 +1194,7 @@ div[id$="wrapper"] br { clear: left; }
#profile-listing-new-link-wrapper {
float: left;
- display: inline-block;
- clear: right;
+ display: inline;
width: 130px;
margin-left:5px;
margin-top: 20px;
@@ -1256,8 +1252,8 @@ div[id$="wrapper"] br { clear: left; }
}
.profile-match-wrapper {
- width: 80%;
- padding: 15px;
+ width: 82%;
+ padding: 5px;
margin-bottom:10px;
margin-left: 20px;
background-color: #f6f6f6;
@@ -1734,6 +1730,48 @@ margin-left: 0px;
border: 1px solid #dddddd;
}
+/* ================= */
+/* = Notifications = */
+/* ================= */
+
+/*#notification-show-hide-wrapper {
+ width: 160px;
+ -moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
+ -webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
+ box-shadow:inset 0px 1px 0px 0px #cfcfcf;
+ background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
+ background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
+ filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
+ background-color:#bdbdbd;
+ -moz-border-radius:5px;
+ -webkit-border-radius:5px;
+ border-radius:5px;
+ padding: 5px 10px 5px 10px;
+ margin-right: 5px;
+ margin-top: 10px;
+ font-style: bold;
+ color: #efefef;
+ text-align: center;
+}
+
+#notification-show-hide-wrapper:hover {
+ color: #efefef;
+ background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );
+ background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% );
+ filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808');
+ background-color:#b20202;
+}
+
+#notification-show-hide-wrapper:active {
+ background-color: #b20202;
+ position:relative;
+ top:1px;
+}
+
+#notification-show-hide-wrapper a {
+ color: #efefef;
+}*/
+
/* ============ */
/* = Contacts = */
/* ============ */
@@ -2028,7 +2066,7 @@ margin-left: 0px;
border-radius:5px;
padding: 5px 10px 5px 10px;
color: #efefef;
- font-size: 1em;
+ font-size: 1.2em;
text-align: center;
}
@@ -2187,12 +2225,7 @@ margin-left: 0px;
.settings-submit-wrapper,
.profile-edit-submit-wrapper { margin: 30px 0px;}
-.profile-listing {
- float: left;
- clear: left;
- display: inline;
- margin: 20px 20px 0px 0px;
-}
+.profile-listing { float: left; clear: both; margin: 20px 20px 0px 0px}
#profile-edit-links ul { margin: 20px 0px; padding: 0px; list-style: none; }
@@ -2256,10 +2289,6 @@ margin-left: 0px;
#group-edit-desc { margin: 10px 0xp; }
#group-new-text {font-size: 1.1em;}
-#prof-members-title,#prof-all-contcts-title {
- margin-top: 10px;
- margin-bottom: 5px;
-}
#group-members,
#prof-members {
width: 83%;
@@ -2972,4 +3001,62 @@ a.active {
color:#efefef;
padding: 5px 10px 5px 10px;
margin-right: 5px;
-}
\ No newline at end of file
+}
+
+/* notifications popup menu */
+.nav-notify {
+ display: none;
+ position: absolute;
+ font-size: 10px;
+ padding: 1px 3px;
+ top: 0px;
+ right: -10px;
+ min-width: 15px;
+ text-align: right;
+}
+.nav-notify.show {
+ display: block;
+}
+ul.menu-popup {
+ position: absolute;
+ display: none;
+ width: 10em;
+ margin: 0px;
+ padding: 0px;
+ list-style: none;
+ z-index: 100000;
+ top: 40px;
+}
+#nav-notifications-menu {
+ width: 320px;
+ max-height: 400px;
+ overflow-y: scroll;
+ background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #797979), color-stop(1, #898988) );
+ background:-moz-linear-gradient( center top, #797979 5%, #898988 100% );
+ filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#797979', endColorstr='#898988');
+ background-color:#a2a2a2;
+ -moz-border-radius:0px 0px 5px 5px;
+ -webkit-border-radius:0px 0px 5px 5px;
+ border-radius:0px 0px 5px 5px;
+ border: 1px solid #9A9A9A;
+ border-top: none;
+ -moz-box-shadow: 5px 5px 10px #242424;
+ -webkit-box-shadow: 5px 5px 10px #242424;
+ box-shadow: 5px 5px 10px #242424;
+
+}
+#nav-notifications-menu .contactname { font-weight: bold; font-size: 0.9em; }
+#nav-notifications-menu img { float: left; margin-right: 5px; }
+#nav-notifications-menu .notif-when { font-size: 0.8em; display: block; }
+#nav-notifications-menu li {
+ padding: 7px 10px 7px 10px;
+ word-wrap:normal;
+ border-bottom: 1px solid #626262;
+}
+
+#nav-notifications-menu li:hover {
+ background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );
+ background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% );
+ filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808');
+ background-color:#b20202;
+}
From 2d89f3b421fa23d567da87bc346875a94a0e094a Mon Sep 17 00:00:00 2001
From: Devlon Duthie <duthied@gmail.com>
Date: Wed, 5 Oct 2011 12:24:12 -0500
Subject: [PATCH 46/46] wrapped notification line item with the anchros tag
instead of the inner, makes the whole line item a link (better)
---
view/theme/testbubble/nav.tpl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/view/theme/testbubble/nav.tpl b/view/theme/testbubble/nav.tpl
index dc16d40eb..baf5f7d30 100644
--- a/view/theme/testbubble/nav.tpl
+++ b/view/theme/testbubble/nav.tpl
@@ -54,5 +54,5 @@
</nav>
<ul id="nav-notifications-template" style="display:none;" rel="template">
- <li><a href="{0}">{2} <span class="notif-when">{3}</span></a></li>
+ <a href="{0}"><li>{2} <span class="notif-when">{3}</span></li></a>
</ul>