aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Zotlabs/Access/PermissionLimits.php10
-rw-r--r--Zotlabs/Access/PermissionRoles.php4
-rw-r--r--Zotlabs/Module/New_channel.php6
-rw-r--r--Zotlabs/Module/Owa.php9
-rw-r--r--Zotlabs/Module/Settings/Channel.php2
-rw-r--r--Zotlabs/Module/Webfinger.php28
-rw-r--r--Zotlabs/Update/_1212.php26
-rw-r--r--Zotlabs/Web/HTTPSig.php4
-rwxr-xr-xboot.php2
-rw-r--r--doc/about/project.bb2
-rw-r--r--doc/member/member_guide.bb118
-rw-r--r--include/permissions.php2
-rw-r--r--include/photo/photo_driver.php1
-rw-r--r--include/photo/photo_gd.php5
-rw-r--r--include/photo/photo_imagick.php13
-rw-r--r--include/photos.php4
-rw-r--r--include/taxonomy.php3
-rw-r--r--tests/unit/Access/PermissionLimitsTest.php2
-rw-r--r--tests/unit/Access/PermissionRolesTest.php2
-rw-r--r--view/fr/hmessages.po3076
-rw-r--r--view/fr/hstrings.php167
-rw-r--r--view/js/autocomplete.js2
22 files changed, 1890 insertions, 1598 deletions
diff --git a/Zotlabs/Access/PermissionLimits.php b/Zotlabs/Access/PermissionLimits.php
index 1d15098fc..c11dc95e6 100644
--- a/Zotlabs/Access/PermissionLimits.php
+++ b/Zotlabs/Access/PermissionLimits.php
@@ -41,10 +41,8 @@ class PermissionLimits {
$limits = [];
$perms = Permissions::Perms();
- $anon_comments = get_config('system','anonymous_comments',true);
-
foreach($perms as $k => $v) {
- if(strstr($k, 'view') || ($k === 'post_comments' && $anon_comments))
+ if(strstr($k, 'view'))
$limits[$k] = PERMS_PUBLIC;
else
$limits[$k] = PERMS_SPECIFIC;
@@ -74,13 +72,13 @@ class PermissionLimits {
* @param int $channel_id
* @param string $perm (optional)
* @return
- * * \b boolean false if no perm_limits set for this channel
- * * \b int if $perm is set, return one of PERMS_* constants for this permission
+ * * \b false if no perm_limits set for this channel
+ * * \b int if $perm is set, return one of PERMS_* constants for this permission, default 0
* * \b array with all permission limits, if $perm is not set
*/
static public function Get($channel_id, $perm = '') {
if($perm) {
- return PConfig::Get($channel_id, 'perm_limits', $perm);
+ return intval(PConfig::Get($channel_id, 'perm_limits', $perm));
}
PConfig::Load($channel_id);
diff --git a/Zotlabs/Access/PermissionRoles.php b/Zotlabs/Access/PermissionRoles.php
index a8a9ae462..9855a05c4 100644
--- a/Zotlabs/Access/PermissionRoles.php
+++ b/Zotlabs/Access/PermissionRoles.php
@@ -41,7 +41,7 @@ class PermissionRoles {
break;
- case 'social_party':
+ case 'social_federation':
$ret['perms_auto'] = false;
$ret['default_collection'] = false;
$ret['directory_publish'] = true;
@@ -281,7 +281,7 @@ class PermissionRoles {
static public function roles() {
$roles = [
t('Social Networking') => [
- 'social_party' => t('Social - Party'),
+ 'social_federation' => t('Social - Federation'),
'social' => t('Social - Mostly Public'),
'social_restricted' => t('Social - Restricted'),
'social_private' => t('Social - Private')
diff --git a/Zotlabs/Module/New_channel.php b/Zotlabs/Module/New_channel.php
index ea9f27447..d9becbc22 100644
--- a/Zotlabs/Module/New_channel.php
+++ b/Zotlabs/Module/New_channel.php
@@ -146,14 +146,14 @@ class New_channel extends \Zotlabs\Web\Controller {
$name = array('name', t('Name or caption'), ((x($_REQUEST,'name')) ? $_REQUEST['name'] : ''), t('Examples: "Bob Jameson", "Lisa and her Horses", "Soccer", "Aviation Group"'), "*");
$nickhub = '@' . \App::get_hostname();
$nickname = array('nickname', t('Choose a short nickname'), ((x($_REQUEST,'nickname')) ? $_REQUEST['nickname'] : ''), sprintf( t('Your nickname will be used to create an easy to remember channel address e.g. nickname%s'), $nickhub), "*");
- $role = array('permissions_role' , t('Channel role and privacy'), ($privacy_role) ? $privacy_role : 'social', t('Select a channel role with your privacy requirements.') . ' <a href="help/member/member_guide#Account_Permission_Roles" target="_blank">' . t('Read more about roles') . '</a>',$perm_roles);
+ $role = array('permissions_role' , t('Channel role and privacy'), ($privacy_role) ? $privacy_role : 'social', t('Select a channel role with your privacy requirements.') . ' <a href="help/member/member_guide#Channel_Permission_Roles" target="_blank">' . t('Read more about roles') . '</a>',$perm_roles);
$o = replace_macros(get_markup_template('new_channel.tpl'), array(
'$title' => t('Create Channel'),
- '$desc' => t('A channel is your identity on this network. It can represent a person, a blog, or a forum to name a few. Channels can make connections with other channels to share information with highly detailed permissions.'),
+ '$desc' => t('A channel is a unique network identity. It can represent a person (social network profile), a forum (group), a business or celebrity page, a newsfeed, and many other things. Channels can make connections with other channels to share information with each other.') . ' ' . t('The type of channel you create affects the basic privacy settings, the permissions that are granted to connections/friends, and also the channel\'s visibility across the network.'),
'$label_import' => t('or <a href="import">import an existing channel</a> from another location.'),
'$name' => $name,
- '$role' => $role,
+ '$role' => $role,
'$default_role' => $default_role,
'$nickname' => $nickname,
'$validate' => t('Validate'),
diff --git a/Zotlabs/Module/Owa.php b/Zotlabs/Module/Owa.php
index e62fc9592..da26748b3 100644
--- a/Zotlabs/Module/Owa.php
+++ b/Zotlabs/Module/Owa.php
@@ -34,6 +34,15 @@ class Owa extends \Zotlabs\Web\Controller {
where hubloc_addr = '%s' ",
dbesc(str_replace('acct:','',$keyId))
);
+ if(! $r) {
+ $found = discover_by_webbie(str_replace('acct:','',$keyId));
+ if($found) {
+ $r = q("select * from hubloc left join xchan on hubloc_hash = xchan_hash
+ where hubloc_addr = '%s' ",
+ dbesc(str_replace('acct:','',$keyId))
+ );
+ }
+ }
if($r) {
foreach($r as $hubloc) {
$verified = \Zotlabs\Web\HTTPSig::verify('',$hubloc['xchan_pubkey']);
diff --git a/Zotlabs/Module/Settings/Channel.php b/Zotlabs/Module/Settings/Channel.php
index e274c9786..3e928ec58 100644
--- a/Zotlabs/Module/Settings/Channel.php
+++ b/Zotlabs/Module/Settings/Channel.php
@@ -536,7 +536,7 @@ class Channel {
'$deny_gid' => acl2json($perm_defaults['deny_gid']),
'$suggestme' => $suggestme,
'$group_select' => $group_select,
- '$role' => array('permissions_role' , t('Channel permissions category:'), $permissions_role, '', $perm_roles),
+ '$role' => array('permissions_role' , t('Channel role and privacy'), $permissions_role, '', $perm_roles),
'$defpermcat' => [ 'defpermcat', t('Default Permissions Group'), $default_permcat, '', $permcats ],
'$permcat_enable' => feature_enabled(local_channel(),'permcats'),
'$profile_in_dir' => $profile_in_dir,
diff --git a/Zotlabs/Module/Webfinger.php b/Zotlabs/Module/Webfinger.php
index c50680de7..0dafae23c 100644
--- a/Zotlabs/Module/Webfinger.php
+++ b/Zotlabs/Module/Webfinger.php
@@ -17,33 +17,15 @@ class Webfinger extends \Zotlabs\Web\Controller {
$o .= '<br /><br />';
- $old = false;
if(x($_GET,'addr')) {
$addr = trim($_GET['addr']);
- // if(strpos($addr,'@') !== false) {
- $res = webfinger_rfc7033($addr,true);
- if(! $res) {
- $res = old_webfinger($addr);
- $old = true;
- }
- // }
- // else {
- // if(function_exists('lrdd'))
- // $res = lrdd($addr);
- // }
-
- if($res && $old) {
- foreach($res as $r) {
- if($r['@attributes']['rel'] === 'http://microformats.org/profile/hcard') {
- $hcard = unamp($r['@attributes']['href']);
- require_once('library/HTML5/Parser.php');
- $res['vcard'] = scrape_vcard($hcard);
- break;
- }
- }
+
+ $res = webfinger_rfc7033($addr,true);
+ if(! $res) {
+ $res = old_webfinger($addr);
}
-
+
$o .= '<pre>';
$o .= str_replace("\n",'<br />',print_r($res,true));
$o .= '</pre>';
diff --git a/Zotlabs/Update/_1212.php b/Zotlabs/Update/_1212.php
new file mode 100644
index 000000000..f15ba8a71
--- /dev/null
+++ b/Zotlabs/Update/_1212.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Zotlabs\Update;
+
+class _1212 {
+
+ function run() {
+
+ $r = q("select channel_id from channel where true");
+ if($r) {
+ foreach($r as $rv) {
+ $role = get_pconfig($rv['channel_id'],'system','permissions_role');
+ if($role !== 'custom') {
+ $role_permissions = \Zotlabs\Access\PermissionRoles::role_perms($role);
+ if(array_key_exists('limits',$role_permissions) && array_key_exists('post_comments',$role_permissions['limits'])) {
+ set_pconfig($rv['channel_id'],'perm_limits','post_comments',$role_permissions['limits']['post_comments']);
+ }
+ }
+ }
+ }
+
+ return UPDATE_SUCCESS;
+
+ }
+
+}
diff --git a/Zotlabs/Web/HTTPSig.php b/Zotlabs/Web/HTTPSig.php
index 255511ede..df66ecf5c 100644
--- a/Zotlabs/Web/HTTPSig.php
+++ b/Zotlabs/Web/HTTPSig.php
@@ -195,7 +195,9 @@ class HTTPSig {
if($x && $x[0]['xchan_pubkey']) {
return ($x[0]['xchan_pubkey']);
}
- $r = as_fetch($id);
+
+ if(function_exists('as_fetch'))
+ $r = as_fetch($id);
if($r) {
$j = json_decode($r,true);
diff --git a/boot.php b/boot.php
index aa6fe7b99..eb2c1ddff 100755
--- a/boot.php
+++ b/boot.php
@@ -54,7 +54,7 @@ define ( 'STD_VERSION', '3.5' );
define ( 'ZOT_REVISION', '6.0a' );
-define ( 'DB_UPDATE_VERSION', 1211 );
+define ( 'DB_UPDATE_VERSION', 1212 );
define ( 'PROJECT_BASE', __DIR__ );
diff --git a/doc/about/project.bb b/doc/about/project.bb
index f9bc920f8..fe90b4d36 100644
--- a/doc/about/project.bb
+++ b/doc/about/project.bb
@@ -116,7 +116,7 @@ even if we have had our occasional disagreements.
[li]Simon[/li]
[li]zottel[/li]
[li]Christian Vogeley[/li]
-[li]Jeroen van Riet Paap (jeroenpraat)[/li]
+[li]jeroenpraat[/li]
[li]Michael Vogel[/li]
[li]erik[/li]
[li]Zach Prezkuta[/li]
diff --git a/doc/member/member_guide.bb b/doc/member/member_guide.bb
index 218f11d26..e36e1c497 100644
--- a/doc/member/member_guide.bb
+++ b/doc/member/member_guide.bb
@@ -22,67 +22,41 @@ Click the link to read the site's [zrl=[baseurl]/help/TermsOfService]Terms of Se
Once you have provided the necessary details, click the 'Register' button. Some sites may require administrator approval before the registration is processed, and you will be alerted if this is the case. Please watch your email (including spam folders) for your registration approval.
-[b]Create a Channel[/b]
-Next, you will be presented with the &quot;Add a channel&quot; screen. Normally, your first channel will be one that represents you - so using your own name (or psuedonym) as the channel name is a good idea. The channel name should be thought of as a title, or brief description of your channel. The &quot;choose a short nickname&quot; box is similar to a &quot;username&quot; field. We will use whatever you enter here to create a channel address, which other people will use to connect to you, and you will use to log in to other sites. This looks like an email address, and takes the form nickname@siteyouregisteredat.xyz
-When your channel is created you will be taken straight to your settings page where you can define permissions, enable features, etc. All these things are covered in the appropriate section of the helpfiles.
-
-See Also
-[zrl=[baseurl]/help/accounts_profiles_channels_basics]The Basics about Identities within $Projectname[/zrl]
-[zrl=[baseurl]/help/accounts]Accounts[/zrl]
-[zrl=[baseurl]/help/profiles]Profiles[/zrl]
-[zrl=[baseurl]/help/permissions]Permissions[/zrl]
-[zrl=[baseurl]/help/remove_account]Remove Account[/zrl]
-
-[b]Profiles[/b]
-
-$Projectname has unlimited profiles. You may use different profiles to show different &quot;sides of yourself&quot; to different audiences. This is different to having different channels. Different channels allow for completely different sets of information. You may have a channel for yourself, a channel for your sports team, a channel for your website, or whatever else. A profile allows for finely graded &quot;sides&quot; of each channel. For example, your default public profile might say &quot;Hello, I'm Fred, and I like laughing&quot;. You may show your close friends a profile that adds &quot;and I also enjoy dwarf tossing&quot;.
-
-You always have a profile known as your &quot;default&quot; or &quot;public&quot; profile. This profile is always available to the general public and cannot be hidden (there may be rare exceptions on privately run or disconnected sites). You may, and probably should restrict the information you make available on your public profile.
-
-That said, if you want other friends to be able to find you, it helps to have the following information in your public profile...
-
-[ul][*]Your real name or at least a nickname everybody knows
-[*]A photo of you
-[*]Your location on the planet, at least to a country level.[/ul]
-
-In addition, if you'd like to meet people that share some general interests with you, please take a moment and add some &quot;Keywords&quot; to your profile. Such as &quot;music, linux, photography&quot; or whatever. You can add as many keywords as you like.
-
-To create an alternate profile, first go to [zrl=[baseurl]/settings/features]Settings &gt; Additional Features[/zrl] and enable &quot;Multiple Profiles&quot; there, otherwise you won't have the ability to use more than just your default profile.
-
-Then select &quot;Edit Profiles&quot; from the menu of your $Projectname site. You may edit an existing profile, change the profile photo, add things to a profile or create a new profile. You may also create a &quot;clone&quot; of an existing profile if you only wish to change a few items but don't wish to enter all the information again. To do that, click on the profile you want to clone and choose &quot;Clone this profile&quot; there.
-
-In the list of your profiles, you can also choose the contacts who can see a specific profile. Just click on &quot;Edit visibility&quot; next to the profile in question (only available for the profiles that are not your default profile) and then click on specific connections to add them to or remove them from the group of people who can see this profile.
+[h3]Channels[/h3]
-Once a profile has been selected, when the person views your profile, they will see the private profile you have assigned. If they are not authenticated, they will see your public profile.
+[h4]What are channels?[/h4]
-There is a setting which allows you to publish your profile to a directory and ensure that it can be found by others. You can change this setting on the &quot;Settings&quot; page.
+Channels are simply collections of content stored in one place. A channel can represent anything. It could represent you, a website, a forum, photo albums, anything. For most people, their first channel with be &quot;Me&quot;.
-If you do not wish to be found be people unless you give them your channel address, you may leave your profile unpublished.
+The most important features for a channel that represents &quot;me&quot; are:
+[ul]
+[*]Secure and private &quot;spam free&quot; communications
-[b]Keywords and Directory Search[/b]
+[*]Identity and &quot;single-signon&quot; across the entire network
-On the directory page, you may search for people with published profiles. Currently, only the name field and the keywords are searched. You may also include such keywords in your default profile - which may be used to search for common interests with other members. Keywords are used in the channel suggestion tool and although they aren't visible in the directory, they are shown if people visit your profile page.
+[*]Privacy controls and permissions which extend to the entire network
-On your Connnections page and in the directory there is a link to &quot;Suggestions&quot; or &quot;Channel Suggestions&quot;, respectively. This will find channels who have matching and/or similar keywords. The more keywords you provide, the more relevant the search results that are returned. These are sorted by relevance.
+[*]Directory services (like a phone book)
+[/ul]
+In short, a channel that represents yourself is &quot;me, on the internet&quot;.
-See Also
-[zrl=[baseurl]/help/AdvancedSearch]Advanced Searching[/zrl]
-[h3]Account Permission Roles[/h3]
+[h3]Channel Permission Roles[/h3]
+When you create a new channel, you will be asked to select a permission role based on how you envision using this channel. The most popular permission roles are the Social Networking roles. You have many other choices, providing options which are analagous to Facebook Groups and Pages, collaborative spaces, newsfeeds, and more. These roles automatically configure several different system variables ranging from what permissions are granted to friends, to your default privacy settings and visibility choices. Advanced configurations are available to let you adjust each of these parameters to your needs, but we've found that most people prefer to "set it and forget it". Thew following describes some of the different roles which are currently available and how they impact your privacy and ability to interact.
[h4]Social[/h4]
-[b]Mostly Public[/b]
+[b]Federation[/b]
-The channel is a typical social networking profile. By default posts and published items are public, but you can over-ride this when creating the item and restrict it. You are listed in the directory. Your online presence and connections are visible to others. Only your immediate connections can comment on your public posts and send you private mail. The permission policies are similar to Facebook.
+The channel is a very permissive social networking profile which is compatible with other federated social networks. The permission policies are similar to Twitter and mostly compatible with Diaspora and Mastodon. Privacy is a lower priority than ease of access and connecting with others. Anybody in the network can comment on your public posts and send you private mail. By default posts and published items are public, but you can over-ride this when creating the item and restrict it. You are listed in the directory. Your online presence and connections are visible to others. This mode [i]may[/i] increase your exposure to undesired communications and spam. This role is not generally recommended [i]unless[/i] you need to interact regularly with members of other networks.
-[b]Party[/b]
+[b]Mostly Public[/b]
-The channel is a permissive social networking profile. The permission policies are similar to Twitter and several free networks such as Diaspora and Mastodon. Anybody in the network can comment on your public posts and send you private mail. By default posts and published items are public, but you can over-ride this when creating the item and restrict it. You are listed in the directory. Your online presence and connections are visible to others. This mode [i]may[/i] increase your exposure to undesired communications and spam.
+The channel is a typical social networking profile. By default posts and published items are public, but you can over-ride this when creating the item and restrict it. You are listed in the directory. Your online presence and connections are visible to others. Only your immediate connections can comment on your public posts and send you private mail. The permission policies are similar to Facebook.
[b]Restricted[/b]
@@ -140,33 +114,59 @@ A public forum which allows members to post files/photos/webpages.
Set all the privacy and permissions manually to suit your specific needs.
-[h3]Channels[/h3]
+[h3]Creating channels[/h3]
-[h4]What are channels?[/h4]
-Channels are simply collections of content stored in one place. A channel can represent anything. It could represent you, a website, a forum, photo albums, anything. For most people, their first channel with be &quot;Me&quot;.
+After creating your account, you will be presented with the &quot;Add a channel&quot; screen. Normally, your first channel will be one that represents you - so using your own name (or psuedonym) as the channel name is a good idea. The channel name should be thought of as a title, or brief description of your channel. The &quot;choose a short nickname&quot; box is similar to a &quot;username&quot; field. We will use whatever you enter here to create a channel address, which other people will use to connect to you, and you will use to log in to other sites. This looks like an email address, and takes the form nickname@siteyouregisteredat.xyz
-The most important features for a channel that represents &quot;me&quot; are:
-[ul]
-[*]Secure and private &quot;spam free&quot; communications
+See Also
+[zrl=[baseurl]/help/accounts_profiles_channels_basics]The Basics about Identities within $Projectname[/zrl]
+[zrl=[baseurl]/help/accounts]Accounts[/zrl]
+[zrl=[baseurl]/help/profiles]Profiles[/zrl]
+[zrl=[baseurl]/help/permissions]Permissions[/zrl]
+[zrl=[baseurl]/help/remove_account]Remove Account[/zrl]
-[*]Identity and &quot;single-signon&quot; across the entire network
-[*]Privacy controls and permissions which extend to the entire network
+You can create additonal channels from the &quot;Channel Manager&quot; link.
-[*]Directory services (like a phone book)
-[/ul]
-In short, a channel that represents yourself is &quot;me, on the internet&quot;.
+Once you have done this, your channel is ready to use. At [observer=1][observer.url][/observer][observer=0][baseurl]/channel/username[/observer] you will find your channel &quot;stream&quot;. This is where your recent activity will appear, in reverse chronological order. If you post in the box marked &quot;share&quot;, the entry will appear at the top of your stream. You will also find links to all the other communication areas for this channel here. The "hamburger" menu in most themes will provide you with navigation to other system components and apps. The Photos page contain photo albums, and the Events page contains events share by both yourself and your contacts.
+
+[b]Profiles[/b]
+
+$Projectname has unlimited profiles. You may use different profiles to show different &quot;sides of yourself&quot; to different audiences. This is different to having different channels. Different channels allow for completely different sets of information. You may have a channel for yourself, a channel for your sports team, a channel for your website, or whatever else. A profile allows for finely graded &quot;sides&quot; of each channel. For example, your default public profile might say &quot;Hello, I'm Fred, and I like laughing&quot;. You may show your close friends a profile that adds &quot;and I also enjoy dwarf tossing&quot;.
+
+You always have a profile known as your &quot;default&quot; or &quot;public&quot; profile. This profile is always available to the general public and cannot be hidden (there may be rare exceptions on privately run or disconnected sites). You may, and probably should restrict the information you make available on your public profile.
+
+That said, if you want other friends to be able to find you, it helps to have the following information in your public profile...
-[h4]Creating channels[/h4]
+[ul][*]Your real name or at least a nickname everybody knows
+[*]A photo of you
+[*]Your location on the planet, at least to a country level.[/ul]
+
+In addition, if you'd like to meet people that share some general interests with you, please take a moment and add some &quot;Keywords&quot; to your profile. Such as &quot;music, linux, photography&quot; or whatever. You can add as many keywords as you like.
+
+To create an alternate profile, first go to [zrl=[baseurl]/settings/features]Settings &gt; Additional Features[/zrl] and enable &quot;Multiple Profiles&quot; there, otherwise you won't have the ability to use more than just your default profile.
+
+Then select &quot;Edit Profiles&quot; from the menu of your $Projectname site. You may edit an existing profile, change the profile photo, add things to a profile or create a new profile. You may also create a &quot;clone&quot; of an existing profile if you only wish to change a few items but don't wish to enter all the information again. To do that, click on the profile you want to clone and choose &quot;Clone this profile&quot; there.
+
+In the list of your profiles, you can also choose the contacts who can see a specific profile. Just click on &quot;Edit visibility&quot; next to the profile in question (only available for the profiles that are not your default profile) and then click on specific connections to add them to or remove them from the group of people who can see this profile.
+
+Once a profile has been selected, when the person views your profile, they will see the private profile you have assigned. If they are not authenticated, they will see your public profile.
+
+There is a setting which allows you to publish your profile to a directory and ensure that it can be found by others. You can change this setting on the &quot;Settings&quot; page.
+
+If you do not wish to be found be people unless you give them your channel address, you may leave your profile unpublished.
+
+[b]Keywords and Directory Search[/b]
+
+On the directory page, you may search for people with published profiles. Currently, only the name field and the keywords are searched. You may also include such keywords in your default profile - which may be used to search for common interests with other members. Keywords are used in the channel suggestion tool and although they aren't visible in the directory, they are shown if people visit your profile page.
-You will be required to create your first channel as part of the sign up process. You can also create additonal channels from the &quot;Select channel&quot; link.
+On your Connnections page and in the directory there is a link to &quot;Suggestions&quot; or &quot;Channel Suggestions&quot;, respectively. This will find channels who have matching and/or similar keywords. The more keywords you provide, the more relevant the search results that are returned. These are sorted by relevance.
-You will be asked to provide a channel name, and a short nick name. For a channel that represents yourself, it is a good idea to use your real name here to ensure your friends can find you, and connect to your channel. The short nickname will be used to generate a &quot;webbie&quot;. This is a bit like a username, and will look like an email address, taking the form nickname@domain. You should put a little thought into what you want to use here. Imagine somebody asking for your webbie and having to tell them it is &quot;llamas-are_kewl.123&quot;. &quot;llamasarecool&quot; would be a much better choice.
+See Also
-Once you have created your channel, you will be taken to the settings page, where you can configure your channel, and set your default permissions.
+[zrl=[baseurl]/help/AdvancedSearch]Advanced Searching[/zrl]
-Once you have done this, your channel is ready to use. At [observer=1][observer.url][/observer][observer=0][baseurl]/channel/username[/observer] you will find your channel &quot;stream&quot;. This is where your recent activity will appear, in reverse chronological order. If you post in the box marked &quot;share&quot;, the entry will appear at the top of your stream. You will also find links to all the other communication areas for this channel here. The &quot;About&quot; tab contains your &quot;profile&quot;, the photos page contain photo albums, and the events page contains events share by both yourself and your contacts.
[h4]The grid, permissions and delegation[/h4]
diff --git a/include/permissions.php b/include/permissions.php
index f97142fab..185d37b6a 100644
--- a/include/permissions.php
+++ b/include/permissions.php
@@ -46,7 +46,7 @@ function get_all_perms($uid, $observer_xchan, $internal_use = true) {
// First find out what the channel owner declared permissions to be.
- $channel_perm = \Zotlabs\Access\PermissionLimits::Get($uid,$perm_name);
+ $channel_perm = intval(\Zotlabs\Access\PermissionLimits::Get($uid,$perm_name));
if(! $channel_checked) {
$r = q("select * from channel where channel_id = %d limit 1",
diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php
index 22d2b776d..2e2f5a758 100644
--- a/include/photo/photo_driver.php
+++ b/include/photo/photo_driver.php
@@ -75,6 +75,7 @@ abstract class photo_driver {
abstract function imageString();
+ abstract function clearexif();
public function __construct($data, $type='') {
$this->types = $this->supportedTypes();
diff --git a/include/photo/photo_gd.php b/include/photo/photo_gd.php
index 24bdc204f..e98ac2827 100644
--- a/include/photo/photo_gd.php
+++ b/include/photo/photo_gd.php
@@ -35,6 +35,11 @@ class photo_gd extends photo_driver {
}
+ public function clearexif() {
+ return;
+ }
+
+
public function destroy() {
if($this->is_valid()) {
imagedestroy($this->image);
diff --git a/include/photo/photo_imagick.php b/include/photo/photo_imagick.php
index 32bb61342..89577e71e 100644
--- a/include/photo/photo_imagick.php
+++ b/include/photo/photo_imagick.php
@@ -96,6 +96,19 @@ class photo_imagick extends photo_driver {
}
+ public function clearexif() {
+
+ $profiles = $this->image->getImageProfiles("icc", true);
+
+ $this->image->stripImage();
+
+ if(!empty($profiles)) {
+ $this->image->profileImage("icc", $profiles['icc']);
+ }
+ }
+
+
+
public function getImage() {
if(!$this->is_valid())
return FALSE;
diff --git a/include/photos.php b/include/photos.php
index 321f7159c..9ae0e6874 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -211,6 +211,10 @@ function photo_upload($channel, $observer, $args) {
$ph->orient($exif);
}
+
+ $ph->clearexif();
+
+
@unlink($src);
$max_length = get_config('system','max_image_length');
diff --git a/include/taxonomy.php b/include/taxonomy.php
index e8d33986f..46d95458c 100644
--- a/include/taxonomy.php
+++ b/include/taxonomy.php
@@ -312,7 +312,8 @@ function article_tagadelic($uid, $count = 0, $authors = '', $owner = '', $flags
function pubtagblock($net,$site,$limit,$recent = 0,$safemode = 1, $type = TERM_HASHTAG) {
$o = '';
- $r = pub_tagadelic($net,$site,$limit,$since,$safemode,$type);
+ $r = pub_tagadelic($net,$site,$limit,$recent,$safemode,$type);
+
$link = z_root() . '/pubstream';
if($r) {
diff --git a/tests/unit/Access/PermissionLimitsTest.php b/tests/unit/Access/PermissionLimitsTest.php
index 58595111a..57ad42a19 100644
--- a/tests/unit/Access/PermissionLimitsTest.php
+++ b/tests/unit/Access/PermissionLimitsTest.php
@@ -66,7 +66,7 @@ class PermissionLimitsTest extends UnitTestCase {
$this->assertEquals(PERMS_SPECIFIC, $stdlimits['write_pages']);
$this->assertEquals(PERMS_SPECIFIC, $stdlimits['write_wiki']);
$this->assertEquals(PERMS_SPECIFIC, $stdlimits['post_wall']);
- $this->assertEquals(PERMS_PUBLIC, $stdlimits['post_comments']);
+ $this->assertEquals(PERMS_SPECIFIC, $stdlimits['post_comments']);
$this->assertEquals(PERMS_SPECIFIC, $stdlimits['post_mail']);
$this->assertEquals(PERMS_SPECIFIC, $stdlimits['post_like']);
$this->assertEquals(PERMS_SPECIFIC, $stdlimits['tag_deliver']);
diff --git a/tests/unit/Access/PermissionRolesTest.php b/tests/unit/Access/PermissionRolesTest.php
index f2636da62..58fd88bb1 100644
--- a/tests/unit/Access/PermissionRolesTest.php
+++ b/tests/unit/Access/PermissionRolesTest.php
@@ -62,7 +62,7 @@ class PermissionRolesTest extends UnitTestCase {
$this->assertEquals($roles, $r->roles());
$socialNetworking = [
- 'social_party' => 'Social - Party',
+ 'social_federation' => 'Social - Federation',
'social' => 'Social - Mostly Public',
'social_restricted' => 'Social - Restricted',
'social_private' => 'Social - Private'
diff --git a/view/fr/hmessages.po b/view/fr/hmessages.po
index 88118c3fa..f13ec864b 100644
--- a/view/fr/hmessages.po
+++ b/view/fr/hmessages.po
@@ -6,15 +6,16 @@
# kris1373 <aktosc@gmail.com>, 2015-2016
# marlo <marlo@mailcatch.com>, 2018
# Philip Wittamore <philip@wittamore.com>, 2018
+# Pierre Boudes <boudes@univ-paris13.fr>, 2018
# rmonret <raymond.monret@retmesagxo.net>, 2016
-# rmonret <raymond.monret@retmesagxo.net>, 2017
+# rmonret <raymond.monret@retmesagxo.net>, 2017-2018
# Seraph Ino, 2016
msgid ""
msgstr ""
"Project-Id-Version: Redmatrix\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-01 08:51+0100\n"
-"PO-Revision-Date: 2018-04-10 15:36+0000\n"
+"POT-Creation-Date: 2018-04-13 21:54+0200\n"
+"PO-Revision-Date: 2018-04-16 12:24+0000\n"
"Last-Translator: Philip Wittamore <philip@wittamore.com>\n"
"Language-Team: French (http://www.transifex.com/Friendica/red-matrix/language/fr/)\n"
"MIME-Version: 1.0\n"
@@ -33,7 +34,7 @@ msgstr "Peuvent m'envoyer leur flux et les publications de leur canal"
#: ../../Zotlabs/Access/Permissions.php:58
msgid "Can view my default channel profile"
-msgstr "Peut voir le profil par défaut du canal."
+msgstr "Peut voir le profil par défaut du canal"
#: ../../Zotlabs/Access/Permissions.php:59
msgid "Can view my connections"
@@ -65,7 +66,7 @@ msgstr "Peut écrire sur mon wiki"
#: ../../Zotlabs/Access/Permissions.php:66
msgid "Can post on my channel (wall) page"
-msgstr "Peut écrire sur le mur de mon canal (mur)"
+msgstr "Peut poster sur mon canal (\"mur\")"
#: ../../Zotlabs/Access/Permissions.php:67
msgid "Can comment on or like my posts"
@@ -77,7 +78,7 @@ msgstr "Peuvent m'envoyer des messages privés"
#: ../../Zotlabs/Access/Permissions.php:69
msgid "Can like/dislike profiles and profile things"
-msgstr "Peut aimer ou détester des profiles"
+msgstr "Peut aimer ou détester des profils"
#: ../../Zotlabs/Access/Permissions.php:70
msgid "Can forward to all my channel connections via @+ mentions in posts"
@@ -95,75 +96,79 @@ msgstr "Peut rediriger mes publications publiques vers des canaux dérivés"
msgid "Can administer my channel"
msgstr "Peut administrer mon canal"
-#: ../../Zotlabs/Access/PermissionRoles.php:265
+#: ../../Zotlabs/Access/PermissionRoles.php:283
msgid "Social Networking"
msgstr "Réseau social"
-#: ../../Zotlabs/Access/PermissionRoles.php:266
+#: ../../Zotlabs/Access/PermissionRoles.php:284
+msgid "Social - Party"
+msgstr "Social - Fête"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:285
msgid "Social - Mostly Public"
msgstr "Social - principalement public"
-#: ../../Zotlabs/Access/PermissionRoles.php:267
+#: ../../Zotlabs/Access/PermissionRoles.php:286
msgid "Social - Restricted"
msgstr "Social - restreint"
-#: ../../Zotlabs/Access/PermissionRoles.php:268
+#: ../../Zotlabs/Access/PermissionRoles.php:287
msgid "Social - Private"
msgstr "Social - privé"
-#: ../../Zotlabs/Access/PermissionRoles.php:271
+#: ../../Zotlabs/Access/PermissionRoles.php:290
msgid "Community Forum"
msgstr "Forum communautaire"
-#: ../../Zotlabs/Access/PermissionRoles.php:272
+#: ../../Zotlabs/Access/PermissionRoles.php:291
msgid "Forum - Mostly Public"
msgstr "Forum - principalement public"
-#: ../../Zotlabs/Access/PermissionRoles.php:273
+#: ../../Zotlabs/Access/PermissionRoles.php:292
msgid "Forum - Restricted"
msgstr "Forum - restreint"
-#: ../../Zotlabs/Access/PermissionRoles.php:274
+#: ../../Zotlabs/Access/PermissionRoles.php:293
msgid "Forum - Private"
msgstr "Forum - privé"
-#: ../../Zotlabs/Access/PermissionRoles.php:277
+#: ../../Zotlabs/Access/PermissionRoles.php:296
msgid "Feed Republish"
msgstr "Republication de flux"
-#: ../../Zotlabs/Access/PermissionRoles.php:278
+#: ../../Zotlabs/Access/PermissionRoles.php:297
msgid "Feed - Mostly Public"
msgstr "Flux - principalement public"
-#: ../../Zotlabs/Access/PermissionRoles.php:279
+#: ../../Zotlabs/Access/PermissionRoles.php:298
msgid "Feed - Restricted"
msgstr "Flux - restreint"
-#: ../../Zotlabs/Access/PermissionRoles.php:282
+#: ../../Zotlabs/Access/PermissionRoles.php:301
msgid "Special Purpose"
msgstr "Utilisation spécifique"
-#: ../../Zotlabs/Access/PermissionRoles.php:283
+#: ../../Zotlabs/Access/PermissionRoles.php:302
msgid "Special - Celebrity/Soapbox"
msgstr "Spécial - célébrité/vitrine"
-#: ../../Zotlabs/Access/PermissionRoles.php:284
+#: ../../Zotlabs/Access/PermissionRoles.php:303
msgid "Special - Group Repository"
msgstr "Spécial - dépôt partagé"
-#: ../../Zotlabs/Access/PermissionRoles.php:287
-#: ../../Zotlabs/Module/Cdav.php:1182 ../../Zotlabs/Module/New_channel.php:130
-#: ../../Zotlabs/Module/Settings/Channel.php:473
-#: ../../Zotlabs/Module/Connedit.php:918 ../../Zotlabs/Module/Profiles.php:798
+#: ../../Zotlabs/Access/PermissionRoles.php:306
+#: ../../Zotlabs/Module/Cdav.php:1182 ../../Zotlabs/Module/New_channel.php:144
+#: ../../Zotlabs/Module/Settings/Channel.php:479
+#: ../../Zotlabs/Module/Connedit.php:918 ../../Zotlabs/Module/Profiles.php:795
#: ../../Zotlabs/Module/Register.php:224 ../../include/selectors.php:49
#: ../../include/selectors.php:66 ../../include/selectors.php:104
#: ../../include/selectors.php:140 ../../include/event.php:1315
-#: ../../include/event.php:1322 ../../include/connections.php:689
-#: ../../include/connections.php:696
+#: ../../include/event.php:1322 ../../include/connections.php:697
+#: ../../include/connections.php:704
msgid "Other"
msgstr "Autre"
-#: ../../Zotlabs/Access/PermissionRoles.php:288
+#: ../../Zotlabs/Access/PermissionRoles.php:307
msgid "Custom/Expert Mode"
msgstr "Mode expert/spécifique"
@@ -173,7 +178,7 @@ msgstr "Mode expert/spécifique"
#: ../../Zotlabs/Module/Editblock.php:31 ../../Zotlabs/Module/Profile.php:20
#: ../../Zotlabs/Module/Layouts.php:31 ../../Zotlabs/Module/Editwebpage.php:32
#: ../../Zotlabs/Module/Cards.php:33 ../../Zotlabs/Module/Webpages.php:33
-#: ../../Zotlabs/Module/Filestorage.php:51 ../../include/channel.php:1198
+#: ../../Zotlabs/Module/Filestorage.php:51 ../../include/channel.php:1197
msgid "Requested profile is not available."
msgstr "Profil demandé non disponible."
@@ -184,26 +189,27 @@ msgstr "Profil demandé non disponible."
#: ../../Zotlabs/Module/Channel.php:248 ../../Zotlabs/Module/Channel.php:288
#: ../../Zotlabs/Module/Settings.php:59 ../../Zotlabs/Module/Locs.php:87
#: ../../Zotlabs/Module/Mitem.php:115 ../../Zotlabs/Module/Events.php:271
-#: ../../Zotlabs/Module/Appman.php:86 ../../Zotlabs/Module/Regmod.php:21
+#: ../../Zotlabs/Module/Appman.php:87 ../../Zotlabs/Module/Regmod.php:21
#: ../../Zotlabs/Module/Article_edit.php:51
-#: ../../Zotlabs/Module/New_channel.php:77
-#: ../../Zotlabs/Module/New_channel.php:102
+#: ../../Zotlabs/Module/New_channel.php:91
+#: ../../Zotlabs/Module/New_channel.php:116
#: ../../Zotlabs/Module/Sharedwithme.php:16 ../../Zotlabs/Module/Setup.php:209
#: ../../Zotlabs/Module/Moderate.php:13
-#: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Thing.php:275
-#: ../../Zotlabs/Module/Thing.php:295 ../../Zotlabs/Module/Thing.php:336
+#: ../../Zotlabs/Module/Settings/Features.php:38
+#: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Thing.php:280
+#: ../../Zotlabs/Module/Thing.php:300 ../../Zotlabs/Module/Thing.php:341
#: ../../Zotlabs/Module/Api.php:24 ../../Zotlabs/Module/Editblock.php:67
#: ../../Zotlabs/Module/Profile.php:85 ../../Zotlabs/Module/Profile.php:101
#: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Connections.php:29
#: ../../Zotlabs/Module/Viewsrc.php:19 ../../Zotlabs/Module/Bookmarks.php:64
#: ../../Zotlabs/Module/Photos.php:69 ../../Zotlabs/Module/Wiki.php:50
-#: ../../Zotlabs/Module/Wiki.php:273 ../../Zotlabs/Module/Wiki.php:400
+#: ../../Zotlabs/Module/Wiki.php:273 ../../Zotlabs/Module/Wiki.php:404
#: ../../Zotlabs/Module/Pdledit.php:29 ../../Zotlabs/Module/Poke.php:149
#: ../../Zotlabs/Module/Profile_photo.php:302
#: ../../Zotlabs/Module/Profile_photo.php:315
#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Item.php:229
#: ../../Zotlabs/Module/Item.php:246 ../../Zotlabs/Module/Item.php:256
-#: ../../Zotlabs/Module/Item.php:1099 ../../Zotlabs/Module/Page.php:34
+#: ../../Zotlabs/Module/Item.php:1106 ../../Zotlabs/Module/Page.php:34
#: ../../Zotlabs/Module/Page.php:133 ../../Zotlabs/Module/Connedit.php:389
#: ../../Zotlabs/Module/Chat.php:100 ../../Zotlabs/Module/Chat.php:105
#: ../../Zotlabs/Module/Menu.php:78 ../../Zotlabs/Module/Layouts.php:71
@@ -222,7 +228,7 @@ msgstr "Profil demandé non disponible."
#: ../../Zotlabs/Module/Register.php:77
#: ../../Zotlabs/Module/Cover_photo.php:281
#: ../../Zotlabs/Module/Cover_photo.php:294
-#: ../../Zotlabs/Module/Display.php:406 ../../Zotlabs/Module/Network.php:15
+#: ../../Zotlabs/Module/Display.php:449 ../../Zotlabs/Module/Network.php:15
#: ../../Zotlabs/Module/Filestorage.php:15
#: ../../Zotlabs/Module/Filestorage.php:70
#: ../../Zotlabs/Module/Filestorage.php:85
@@ -234,15 +240,14 @@ msgstr "Profil demandé non disponible."
#: ../../Zotlabs/Module/Notifications.php:11
#: ../../Zotlabs/Lib/Chatroom.php:133 ../../Zotlabs/Web/WebServer.php:123
#: ../../addon/keepout/keepout.php:36 ../../addon/openid/Mod_Id.php:53
-#: ../../addon/gitwiki/Mod_Gitwiki.php:196
-#: ../../addon/gitwiki/Mod_Gitwiki.php:292 ../../addon/pumpio/pumpio.php:40
-#: ../../include/attach.php:150 ../../include/attach.php:197
-#: ../../include/attach.php:270 ../../include/attach.php:284
-#: ../../include/attach.php:293 ../../include/attach.php:366
-#: ../../include/attach.php:380 ../../include/attach.php:387
-#: ../../include/attach.php:469 ../../include/attach.php:1019
-#: ../../include/attach.php:1093 ../../include/attach.php:1258
-#: ../../include/items.php:3656 ../../include/photos.php:27
+#: ../../addon/pumpio/pumpio.php:40 ../../include/attach.php:150
+#: ../../include/attach.php:197 ../../include/attach.php:270
+#: ../../include/attach.php:284 ../../include/attach.php:293
+#: ../../include/attach.php:366 ../../include/attach.php:380
+#: ../../include/attach.php:387 ../../include/attach.php:469
+#: ../../include/attach.php:1029 ../../include/attach.php:1103
+#: ../../include/attach.php:1268 ../../include/items.php:3706
+#: ../../include/photos.php:27
msgid "Permission denied."
msgstr "Accès refusé."
@@ -251,7 +256,7 @@ msgstr "Accès refusé."
msgid "Block Name"
msgstr "Nom du Bloc"
-#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2402
+#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2405
msgid "Blocks"
msgstr "Blocs"
@@ -270,9 +275,9 @@ msgid "Edited"
msgstr "Modifié(e)"
#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Articles.php:96
-#: ../../Zotlabs/Module/Cdav.php:1185 ../../Zotlabs/Module/New_channel.php:146
+#: ../../Zotlabs/Module/Cdav.php:1185 ../../Zotlabs/Module/New_channel.php:160
#: ../../Zotlabs/Module/Connedit.php:921 ../../Zotlabs/Module/Menu.php:118
-#: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Module/Profiles.php:801
+#: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Module/Profiles.php:798
#: ../../Zotlabs/Module/Cards.php:100 ../../Zotlabs/Module/Webpages.php:239
#: ../../Zotlabs/Storage/Browser.php:276 ../../Zotlabs/Storage/Browser.php:382
#: ../../Zotlabs/Widget/Cdav.php:128 ../../Zotlabs/Widget/Cdav.php:165
@@ -281,43 +286,44 @@ msgstr "Créer"
#: ../../Zotlabs/Module/Blocks.php:160 ../../Zotlabs/Module/Editlayout.php:114
#: ../../Zotlabs/Module/Article_edit.php:99
-#: ../../Zotlabs/Module/Admin/Profs.php:154
-#: ../../Zotlabs/Module/Settings/Oauth.php:149
-#: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Module/Editblock.php:114
-#: ../../Zotlabs/Module/Connections.php:265
-#: ../../Zotlabs/Module/Connections.php:303
-#: ../../Zotlabs/Module/Connections.php:323 ../../Zotlabs/Module/Wiki.php:202
-#: ../../Zotlabs/Module/Wiki.php:358 ../../Zotlabs/Module/Menu.php:112
+#: ../../Zotlabs/Module/Admin/Profs.php:175
+#: ../../Zotlabs/Module/Settings/Oauth2.php:149
+#: ../../Zotlabs/Module/Settings/Oauth.php:150
+#: ../../Zotlabs/Module/Thing.php:266 ../../Zotlabs/Module/Editblock.php:114
+#: ../../Zotlabs/Module/Connections.php:281
+#: ../../Zotlabs/Module/Connections.php:319
+#: ../../Zotlabs/Module/Connections.php:339 ../../Zotlabs/Module/Wiki.php:202
+#: ../../Zotlabs/Module/Wiki.php:362 ../../Zotlabs/Module/Menu.php:112
#: ../../Zotlabs/Module/Layouts.php:193
#: ../../Zotlabs/Module/Editwebpage.php:142
-#: ../../Zotlabs/Module/Webpages.php:240 ../../Zotlabs/Module/Editpost.php:85
-#: ../../Zotlabs/Module/Card_edit.php:99 ../../Zotlabs/Lib/Apps.php:409
-#: ../../Zotlabs/Lib/ThreadItem.php:121 ../../Zotlabs/Storage/Browser.php:288
-#: ../../Zotlabs/Widget/Cdav.php:126 ../../Zotlabs/Widget/Cdav.php:162
-#: ../../addon/gitwiki/Mod_Gitwiki.php:151
-#: ../../addon/gitwiki/Mod_Gitwiki.php:252 ../../include/channel.php:1297
-#: ../../include/channel.php:1301 ../../include/menu.php:113
+#: ../../Zotlabs/Module/Webpages.php:240 ../../Zotlabs/Module/Card_edit.php:99
+#: ../../Zotlabs/Lib/Apps.php:409 ../../Zotlabs/Lib/ThreadItem.php:121
+#: ../../Zotlabs/Storage/Browser.php:288 ../../Zotlabs/Widget/Cdav.php:126
+#: ../../Zotlabs/Widget/Cdav.php:162 ../../include/channel.php:1296
+#: ../../include/channel.php:1300 ../../include/menu.php:113
msgid "Edit"
msgstr "Modifier"
#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1102
-#: ../../Zotlabs/Module/Layouts.php:194 ../../Zotlabs/Module/Webpages.php:241
-#: ../../Zotlabs/Widget/Cdav.php:124 ../../include/conversation.php:1363
+#: ../../Zotlabs/Module/Wiki.php:287 ../../Zotlabs/Module/Layouts.php:194
+#: ../../Zotlabs/Module/Webpages.php:241 ../../Zotlabs/Widget/Cdav.php:124
+#: ../../include/conversation.php:1366
msgid "Share"
msgstr "Partager"
#: ../../Zotlabs/Module/Blocks.php:162 ../../Zotlabs/Module/Editlayout.php:138
#: ../../Zotlabs/Module/Cdav.php:897 ../../Zotlabs/Module/Cdav.php:1187
#: ../../Zotlabs/Module/Article_edit.php:129
-#: ../../Zotlabs/Module/Admin/Accounts.php:174
+#: ../../Zotlabs/Module/Admin/Accounts.php:175
#: ../../Zotlabs/Module/Admin/Channels.php:149
-#: ../../Zotlabs/Module/Admin/Profs.php:155
-#: ../../Zotlabs/Module/Settings/Oauth.php:150
-#: ../../Zotlabs/Module/Thing.php:262 ../../Zotlabs/Module/Editblock.php:139
-#: ../../Zotlabs/Module/Connections.php:273
+#: ../../Zotlabs/Module/Admin/Profs.php:176
+#: ../../Zotlabs/Module/Settings/Oauth2.php:150
+#: ../../Zotlabs/Module/Settings/Oauth.php:151
+#: ../../Zotlabs/Module/Thing.php:267 ../../Zotlabs/Module/Editblock.php:139
+#: ../../Zotlabs/Module/Connections.php:289
#: ../../Zotlabs/Module/Photos.php:1203 ../../Zotlabs/Module/Connedit.php:654
#: ../../Zotlabs/Module/Connedit.php:923 ../../Zotlabs/Module/Group.php:179
-#: ../../Zotlabs/Module/Profiles.php:803
+#: ../../Zotlabs/Module/Profiles.php:800
#: ../../Zotlabs/Module/Editwebpage.php:167
#: ../../Zotlabs/Module/Webpages.php:242
#: ../../Zotlabs/Module/Card_edit.php:129 ../../Zotlabs/Lib/Apps.php:410
@@ -329,7 +335,6 @@ msgstr "Supprimer"
#: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Events.php:694
#: ../../Zotlabs/Module/Wiki.php:204 ../../Zotlabs/Module/Layouts.php:198
#: ../../Zotlabs/Module/Webpages.php:246 ../../Zotlabs/Module/Pubsites.php:60
-#: ../../addon/gitwiki/Mod_Gitwiki.php:153
msgid "View"
msgstr "Voir"
@@ -406,30 +411,31 @@ msgstr "3. Cliquez sur [Ajouter]"
#: ../../Zotlabs/Module/Invite.php:151 ../../Zotlabs/Module/Locs.php:121
#: ../../Zotlabs/Module/Mitem.php:243 ../../Zotlabs/Module/Events.php:493
-#: ../../Zotlabs/Module/Appman.php:152
+#: ../../Zotlabs/Module/Appman.php:153
#: ../../Zotlabs/Module/Import_items.php:129
#: ../../Zotlabs/Module/Setup.php:308 ../../Zotlabs/Module/Setup.php:349
#: ../../Zotlabs/Module/Connect.php:98
#: ../../Zotlabs/Module/Admin/Features.php:66
#: ../../Zotlabs/Module/Admin/Plugins.php:438
-#: ../../Zotlabs/Module/Admin/Accounts.php:167
+#: ../../Zotlabs/Module/Admin/Accounts.php:168
#: ../../Zotlabs/Module/Admin/Logs.php:84
#: ../../Zotlabs/Module/Admin/Channels.php:147
#: ../../Zotlabs/Module/Admin/Themes.php:158
-#: ../../Zotlabs/Module/Admin/Site.php:289
-#: ../../Zotlabs/Module/Admin/Profs.php:157
+#: ../../Zotlabs/Module/Admin/Site.php:296
+#: ../../Zotlabs/Module/Admin/Profs.php:178
#: ../../Zotlabs/Module/Admin/Account_edit.php:74
#: ../../Zotlabs/Module/Admin/Security.php:104
#: ../../Zotlabs/Module/Settings/Permcats.php:110
-#: ../../Zotlabs/Module/Settings/Channel.php:488
-#: ../../Zotlabs/Module/Settings/Features.php:47
+#: ../../Zotlabs/Module/Settings/Channel.php:495
+#: ../../Zotlabs/Module/Settings/Features.php:79
#: ../../Zotlabs/Module/Settings/Tokens.php:168
+#: ../../Zotlabs/Module/Settings/Oauth2.php:84
#: ../../Zotlabs/Module/Settings/Account.php:118
#: ../../Zotlabs/Module/Settings/Featured.php:54
#: ../../Zotlabs/Module/Settings/Display.php:192
-#: ../../Zotlabs/Module/Settings/Oauth.php:87
-#: ../../Zotlabs/Module/Thing.php:321 ../../Zotlabs/Module/Thing.php:374
-#: ../../Zotlabs/Module/Import.php:529 ../../Zotlabs/Module/Cal.php:345
+#: ../../Zotlabs/Module/Settings/Oauth.php:88
+#: ../../Zotlabs/Module/Thing.php:326 ../../Zotlabs/Module/Thing.php:379
+#: ../../Zotlabs/Module/Import.php:530 ../../Zotlabs/Module/Cal.php:345
#: ../../Zotlabs/Module/Mood.php:139 ../../Zotlabs/Module/Photos.php:1082
#: ../../Zotlabs/Module/Photos.php:1122 ../../Zotlabs/Module/Photos.php:1240
#: ../../Zotlabs/Module/Wiki.php:206 ../../Zotlabs/Module/Pdledit.php:98
@@ -437,17 +443,17 @@ msgstr "3. Cliquez sur [Ajouter]"
#: ../../Zotlabs/Module/Chat.php:196 ../../Zotlabs/Module/Chat.php:242
#: ../../Zotlabs/Module/Email_validation.php:40
#: ../../Zotlabs/Module/Pconfig.php:107 ../../Zotlabs/Module/Defperms.php:249
-#: ../../Zotlabs/Module/Group.php:87 ../../Zotlabs/Module/Profiles.php:726
-#: ../../Zotlabs/Module/Sources.php:114 ../../Zotlabs/Module/Sources.php:149
-#: ../../Zotlabs/Module/Xchan.php:15 ../../Zotlabs/Module/Mail.php:431
-#: ../../Zotlabs/Module/Filestorage.php:160 ../../Zotlabs/Module/Rate.php:166
-#: ../../Zotlabs/Lib/ThreadItem.php:750
+#: ../../Zotlabs/Module/Group.php:87 ../../Zotlabs/Module/Profiles.php:723
+#: ../../Zotlabs/Module/Editpost.php:85 ../../Zotlabs/Module/Sources.php:114
+#: ../../Zotlabs/Module/Sources.php:149 ../../Zotlabs/Module/Xchan.php:15
+#: ../../Zotlabs/Module/Mail.php:431 ../../Zotlabs/Module/Filestorage.php:160
+#: ../../Zotlabs/Module/Rate.php:166 ../../Zotlabs/Lib/ThreadItem.php:752
#: ../../Zotlabs/Widget/Eventstools.php:16
#: ../../Zotlabs/Widget/Wiki_pages.php:40
#: ../../Zotlabs/Widget/Wiki_pages.php:97
#: ../../view/theme/redbasic_c/php/config.php:95
#: ../../view/theme/redbasic/php/config.php:93
-#: ../../addon/skeleton/skeleton.php:65 ../../addon/gnusoc/gnusoc.php:273
+#: ../../addon/skeleton/skeleton.php:65 ../../addon/gnusoc/gnusoc.php:275
#: ../../addon/planets/planets.php:153
#: ../../addon/openclipatar/openclipatar.php:53
#: ../../addon/wppost/wppost.php:113 ../../addon/nsfw/nsfw.php:92
@@ -455,8 +461,7 @@ msgstr "3. Cliquez sur [Ajouter]"
#: ../../addon/likebanner/likebanner.php:57
#: ../../addon/redphotos/redphotos.php:136 ../../addon/irc/irc.php:53
#: ../../addon/ljpost/ljpost.php:86 ../../addon/startpage/startpage.php:113
-#: ../../addon/diaspora/diaspora.php:822
-#: ../../addon/gitwiki/Mod_Gitwiki.php:155
+#: ../../addon/diaspora/diaspora.php:823
#: ../../addon/rainbowtag/rainbowtag.php:85 ../../addon/hzfiles/hzfiles.php:84
#: ../../addon/visage/visage.php:170 ../../addon/nsabait/nsabait.php:161
#: ../../addon/mailtest/mailtest.php:100
@@ -464,7 +469,7 @@ msgstr "3. Cliquez sur [Ajouter]"
#: ../../addon/rtof/rtof.php:101 ../../addon/jappixmini/jappixmini.php:371
#: ../../addon/superblock/superblock.php:120 ../../addon/nofed/nofed.php:80
#: ../../addon/redred/redred.php:119 ../../addon/logrot/logrot.php:35
-#: ../../addon/frphotos/frphotos.php:96 ../../addon/pubcrawl/pubcrawl.php:1053
+#: ../../addon/frphotos/frphotos.php:97 ../../addon/pubcrawl/pubcrawl.php:1069
#: ../../addon/chords/Mod_Chords.php:60 ../../addon/libertree/libertree.php:85
#: ../../addon/flattrwidget/flattrwidget.php:124
#: ../../addon/statusnet/statusnet.php:322
@@ -473,15 +478,16 @@ msgstr "3. Cliquez sur [Ajouter]"
#: ../../addon/statusnet/statusnet.php:900 ../../addon/twitter/twitter.php:218
#: ../../addon/twitter/twitter.php:265
#: ../../addon/smileybutton/smileybutton.php:219
-#: ../../addon/piwik/piwik.php:95 ../../addon/pageheader/pageheader.php:48
+#: ../../addon/cart/cart.php:1104 ../../addon/piwik/piwik.php:95
+#: ../../addon/pageheader/pageheader.php:48
#: ../../addon/authchoose/authchoose.php:71 ../../addon/xmpp/xmpp.php:69
#: ../../addon/pumpio/pumpio.php:237 ../../addon/redfiles/redfiles.php:124
#: ../../addon/hubwall/hubwall.php:95 ../../include/js_strings.php:22
msgid "Submit"
msgstr "Envoyer"
-#: ../../Zotlabs/Module/Articles.php:38 ../../Zotlabs/Module/Articles.php:179
-#: ../../Zotlabs/Lib/Apps.php:229 ../../include/features.php:124
+#: ../../Zotlabs/Module/Articles.php:38 ../../Zotlabs/Module/Articles.php:191
+#: ../../Zotlabs/Lib/Apps.php:229 ../../include/features.php:133
#: ../../include/nav.php:469
msgid "Articles"
msgstr "Articles"
@@ -516,11 +522,11 @@ msgstr "Modifier la mise en page"
#: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:86
#: ../../Zotlabs/Module/Import_items.php:120
-#: ../../Zotlabs/Module/Cloud.php:111 ../../Zotlabs/Module/Group.php:74
+#: ../../Zotlabs/Module/Cloud.php:117 ../../Zotlabs/Module/Group.php:74
#: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:68
#: ../../Zotlabs/Module/Like.php:296 ../../Zotlabs/Web/WebServer.php:122
#: ../../addon/redphotos/redphotos.php:119 ../../addon/hzfiles/hzfiles.php:73
-#: ../../addon/frphotos/frphotos.php:81 ../../addon/redfiles/redfiles.php:109
+#: ../../addon/frphotos/frphotos.php:82 ../../addon/redfiles/redfiles.php:109
#: ../../include/items.php:358
msgid "Permission denied"
msgstr "Accès refusé"
@@ -533,7 +539,7 @@ msgstr "Identifiant de profil invalide."
msgid "Profile Visibility Editor"
msgstr "Éditeur de visibilité de profil"
-#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1634
+#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1644
msgid "Profile"
msgstr "Profil"
@@ -546,7 +552,7 @@ msgid "Visible To"
msgstr "Visible par"
#: ../../Zotlabs/Module/Profperm.php:140
-#: ../../Zotlabs/Module/Connections.php:140
+#: ../../Zotlabs/Module/Connections.php:200
msgid "All Connections"
msgstr "Tous les contacts"
@@ -561,9 +567,9 @@ msgstr "Sommaire :"
#: ../../Zotlabs/Module/Cdav.php:786 ../../Zotlabs/Module/Cdav.php:787
#: ../../Zotlabs/Module/Cdav.php:794 ../../Zotlabs/Module/Embedphotos.php:146
#: ../../Zotlabs/Module/Photos.php:817 ../../Zotlabs/Module/Photos.php:1273
-#: ../../Zotlabs/Lib/Apps.php:754 ../../Zotlabs/Lib/Apps.php:832
+#: ../../Zotlabs/Lib/Apps.php:754 ../../Zotlabs/Lib/Apps.php:833
#: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Widget/Portfolio.php:95
-#: ../../Zotlabs/Widget/Album.php:84 ../../addon/pubcrawl/as.php:853
+#: ../../Zotlabs/Widget/Album.php:84 ../../addon/pubcrawl/as.php:878
#: ../../include/conversation.php:1160
msgid "Unknown"
msgstr "Inconnu"
@@ -601,14 +607,14 @@ msgid "End date and time"
msgstr "Date et heure de fin"
#: ../../Zotlabs/Module/Cdav.php:871 ../../Zotlabs/Module/Events.php:473
-#: ../../Zotlabs/Module/Appman.php:142 ../../Zotlabs/Module/Rbmark.php:101
+#: ../../Zotlabs/Module/Appman.php:143 ../../Zotlabs/Module/Rbmark.php:101
#: ../../addon/rendezvous/rendezvous.php:173
msgid "Description"
msgstr "Description"
#: ../../Zotlabs/Module/Cdav.php:872 ../../Zotlabs/Module/Locs.php:117
#: ../../Zotlabs/Module/Events.php:475 ../../Zotlabs/Module/Profiles.php:509
-#: ../../Zotlabs/Module/Profiles.php:737 ../../Zotlabs/Module/Pubsites.php:52
+#: ../../Zotlabs/Module/Profiles.php:734 ../../Zotlabs/Module/Pubsites.php:52
#: ../../include/js_strings.php:25
msgid "Location"
msgstr "Emplacement"
@@ -673,17 +679,17 @@ msgstr "Tout supprimer"
#: ../../Zotlabs/Module/Cdav.php:899 ../../Zotlabs/Module/Cdav.php:1188
#: ../../Zotlabs/Module/Admin/Plugins.php:423
-#: ../../Zotlabs/Module/Settings/Oauth.php:88
-#: ../../Zotlabs/Module/Settings/Oauth.php:114
-#: ../../Zotlabs/Module/Wiki.php:345 ../../Zotlabs/Module/Wiki.php:375
+#: ../../Zotlabs/Module/Settings/Oauth2.php:85
+#: ../../Zotlabs/Module/Settings/Oauth2.php:113
+#: ../../Zotlabs/Module/Settings/Oauth.php:89
+#: ../../Zotlabs/Module/Settings/Oauth.php:115
+#: ../../Zotlabs/Module/Wiki.php:347 ../../Zotlabs/Module/Wiki.php:379
#: ../../Zotlabs/Module/Profile_photo.php:464
#: ../../Zotlabs/Module/Connedit.php:924 ../../Zotlabs/Module/Fbrowser.php:66
-#: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Profiles.php:804
+#: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Profiles.php:801
#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Module/Cover_photo.php:365
#: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138
-#: ../../addon/gitwiki/Mod_Gitwiki.php:244
-#: ../../addon/gitwiki/Mod_Gitwiki.php:267 ../../include/conversation.php:1386
-#: ../../include/conversation.php:1435
+#: ../../include/conversation.php:1389 ../../include/conversation.php:1438
msgid "Cancel"
msgstr "Annuler"
@@ -694,14 +700,15 @@ msgstr "Désolé ! L'édition d'événements récurrents n'est pas encore implé
#: ../../Zotlabs/Module/Cdav.php:1170
#: ../../Zotlabs/Module/Sharedwithme.php:105
#: ../../Zotlabs/Module/Admin/Channels.php:159
-#: ../../Zotlabs/Module/Settings/Oauth.php:89
-#: ../../Zotlabs/Module/Settings/Oauth.php:115
+#: ../../Zotlabs/Module/Settings/Oauth2.php:86
+#: ../../Zotlabs/Module/Settings/Oauth2.php:114
+#: ../../Zotlabs/Module/Settings/Oauth.php:90
+#: ../../Zotlabs/Module/Settings/Oauth.php:116
#: ../../Zotlabs/Module/Wiki.php:209 ../../Zotlabs/Module/Connedit.php:906
#: ../../Zotlabs/Module/Chat.php:251 ../../Zotlabs/Lib/NativeWikiPage.php:558
#: ../../Zotlabs/Storage/Browser.php:283
#: ../../Zotlabs/Widget/Wiki_page_history.php:22
#: ../../addon/rendezvous/rendezvous.php:172
-#: ../../addon/gitwiki/Mod_Gitwiki.php:158
msgid "Name"
msgstr "Nom"
@@ -714,76 +721,78 @@ msgid "Title"
msgstr "Titre"
#: ../../Zotlabs/Module/Cdav.php:1173 ../../Zotlabs/Module/Connedit.php:909
-#: ../../Zotlabs/Module/Profiles.php:789
+#: ../../Zotlabs/Module/Profiles.php:786
msgid "Phone"
msgstr "Téléphone"
#: ../../Zotlabs/Module/Cdav.php:1174
-#: ../../Zotlabs/Module/Admin/Accounts.php:170
-#: ../../Zotlabs/Module/Admin/Accounts.php:182
-#: ../../Zotlabs/Module/Connedit.php:910 ../../Zotlabs/Module/Profiles.php:790
+#: ../../Zotlabs/Module/Admin/Accounts.php:171
+#: ../../Zotlabs/Module/Admin/Accounts.php:183
+#: ../../Zotlabs/Module/Connedit.php:910 ../../Zotlabs/Module/Profiles.php:787
#: ../../addon/openid/MysqlProvider.php:56
#: ../../addon/openid/MysqlProvider.php:57 ../../addon/rtof/rtof.php:93
-#: ../../addon/redred/redred.php:107 ../../include/network.php:1775
+#: ../../addon/redred/redred.php:107 ../../include/network.php:1776
msgid "Email"
msgstr "Courriel"
#: ../../Zotlabs/Module/Cdav.php:1175 ../../Zotlabs/Module/Connedit.php:911
-#: ../../Zotlabs/Module/Profiles.php:791
+#: ../../Zotlabs/Module/Profiles.php:788
msgid "Instant messenger"
msgstr "Instant messenger"
#: ../../Zotlabs/Module/Cdav.php:1176 ../../Zotlabs/Module/Connedit.php:912
-#: ../../Zotlabs/Module/Profiles.php:792
+#: ../../Zotlabs/Module/Profiles.php:789
msgid "Website"
msgstr "Site web"
#: ../../Zotlabs/Module/Cdav.php:1177 ../../Zotlabs/Module/Locs.php:118
#: ../../Zotlabs/Module/Admin/Channels.php:160
#: ../../Zotlabs/Module/Connedit.php:913 ../../Zotlabs/Module/Profiles.php:502
-#: ../../Zotlabs/Module/Profiles.php:793
+#: ../../Zotlabs/Module/Profiles.php:790
msgid "Address"
msgstr "Adresse"
#: ../../Zotlabs/Module/Cdav.php:1178 ../../Zotlabs/Module/Connedit.php:914
-#: ../../Zotlabs/Module/Profiles.php:794
+#: ../../Zotlabs/Module/Profiles.php:791
msgid "Note"
msgstr "Note"
#: ../../Zotlabs/Module/Cdav.php:1179 ../../Zotlabs/Module/Connedit.php:915
-#: ../../Zotlabs/Module/Profiles.php:795 ../../include/event.php:1308
-#: ../../include/connections.php:682
+#: ../../Zotlabs/Module/Profiles.php:792 ../../include/event.php:1308
+#: ../../include/connections.php:690
msgid "Mobile"
msgstr "Mobile"
#: ../../Zotlabs/Module/Cdav.php:1180 ../../Zotlabs/Module/Connedit.php:916
-#: ../../Zotlabs/Module/Profiles.php:796 ../../include/event.php:1309
-#: ../../include/connections.php:683
+#: ../../Zotlabs/Module/Profiles.php:793 ../../include/event.php:1309
+#: ../../include/connections.php:691
msgid "Home"
msgstr "Mon canal"
#: ../../Zotlabs/Module/Cdav.php:1181 ../../Zotlabs/Module/Connedit.php:917
-#: ../../Zotlabs/Module/Profiles.php:797 ../../include/event.php:1312
-#: ../../include/connections.php:686
+#: ../../Zotlabs/Module/Profiles.php:794 ../../include/event.php:1312
+#: ../../include/connections.php:694
msgid "Work"
msgstr "Travail"
#: ../../Zotlabs/Module/Cdav.php:1183 ../../Zotlabs/Module/Connedit.php:919
-#: ../../Zotlabs/Module/Profiles.php:799
+#: ../../Zotlabs/Module/Profiles.php:796
#: ../../addon/jappixmini/jappixmini.php:368
msgid "Add Contact"
msgstr "Ajouter un contact"
#: ../../Zotlabs/Module/Cdav.php:1184 ../../Zotlabs/Module/Connedit.php:920
-#: ../../Zotlabs/Module/Profiles.php:800
+#: ../../Zotlabs/Module/Profiles.php:797
msgid "Add Field"
msgstr "Ajouter un champ"
#: ../../Zotlabs/Module/Cdav.php:1186
#: ../../Zotlabs/Module/Admin/Plugins.php:453
-#: ../../Zotlabs/Module/Settings/Oauth.php:42
-#: ../../Zotlabs/Module/Settings/Oauth.php:113
-#: ../../Zotlabs/Module/Connedit.php:922 ../../Zotlabs/Module/Profiles.php:802
+#: ../../Zotlabs/Module/Settings/Oauth2.php:39
+#: ../../Zotlabs/Module/Settings/Oauth2.php:112
+#: ../../Zotlabs/Module/Settings/Oauth.php:43
+#: ../../Zotlabs/Module/Settings/Oauth.php:114
+#: ../../Zotlabs/Module/Connedit.php:922 ../../Zotlabs/Module/Profiles.php:799
#: ../../Zotlabs/Lib/Apps.php:393
msgid "Update"
msgstr "Mise à jour"
@@ -813,7 +822,7 @@ msgid "ZIP Code"
msgstr "ZIP code"
#: ../../Zotlabs/Module/Cdav.php:1195 ../../Zotlabs/Module/Connedit.php:931
-#: ../../Zotlabs/Module/Profiles.php:760
+#: ../../Zotlabs/Module/Profiles.php:757
msgid "Country"
msgstr "Pays"
@@ -829,8 +838,8 @@ msgstr "Carnet d'adresses par défaut"
msgid "This site is not a directory server"
msgstr "Ce site n'est pas un serveur d'annuaire"
-#: ../../Zotlabs/Module/Channel.php:32 ../../Zotlabs/Module/Chat.php:25
-#: ../../addon/gitwiki/Mod_Gitwiki.php:28 ../../addon/chess/chess.php:508
+#: ../../Zotlabs/Module/Channel.php:32 ../../Zotlabs/Module/Ochannel.php:32
+#: ../../Zotlabs/Module/Chat.php:25 ../../addon/chess/chess.php:508
msgid "You must be logged in to see this page."
msgstr "Vous devez vous connecter pour voir cette page."
@@ -921,19 +930,19 @@ msgstr "Vous n'avez aucune publication non-vue..."
msgid "Public access denied."
msgstr "Accès public refusé."
-#: ../../Zotlabs/Module/Search.php:44 ../../Zotlabs/Module/Connections.php:319
+#: ../../Zotlabs/Module/Search.php:44 ../../Zotlabs/Module/Connections.php:335
#: ../../Zotlabs/Lib/Apps.php:256 ../../Zotlabs/Widget/Sitesearch.php:31
#: ../../include/text.php:1051 ../../include/text.php:1063
#: ../../include/acl_selectors.php:118 ../../include/nav.php:179
msgid "Search"
msgstr "Recherche"
-#: ../../Zotlabs/Module/Search.php:226
+#: ../../Zotlabs/Module/Search.php:230
#, php-format
msgid "Items tagged with: %s"
msgstr "Eléments étiquetés avec&nbsp;: %s"
-#: ../../Zotlabs/Module/Search.php:228
+#: ../../Zotlabs/Module/Search.php:232
#, php-format
msgid "Search results for: %s"
msgstr "Résultats de recherche pour&nbsp;: %s"
@@ -1039,7 +1048,7 @@ msgid "Menu Item Permissions"
msgstr "Droits d'accès de l'entrée de menu"
#: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:231
-#: ../../Zotlabs/Module/Settings/Channel.php:521
+#: ../../Zotlabs/Module/Settings/Channel.php:528
msgid "(click to open/close)"
msgstr "(cliquer pour ouvrir/fermer)"
@@ -1063,8 +1072,8 @@ msgstr "Utiliser l'authentification distante, quand disponible"
#: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241
#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471
#: ../../Zotlabs/Module/Removeme.php:63
-#: ../../Zotlabs/Module/Admin/Site.php:252
-#: ../../Zotlabs/Module/Settings/Channel.php:305
+#: ../../Zotlabs/Module/Admin/Site.php:259
+#: ../../Zotlabs/Module/Settings/Channel.php:307
#: ../../Zotlabs/Module/Settings/Display.php:100
#: ../../Zotlabs/Module/Api.php:99 ../../Zotlabs/Module/Photos.php:697
#: ../../Zotlabs/Module/Wiki.php:218 ../../Zotlabs/Module/Wiki.php:219
@@ -1073,7 +1082,7 @@ msgstr "Utiliser l'authentification distante, quand disponible"
#: ../../Zotlabs/Module/Defperms.php:180 ../../Zotlabs/Module/Profiles.php:681
#: ../../Zotlabs/Module/Filestorage.php:155
#: ../../Zotlabs/Module/Filestorage.php:163
-#: ../../Zotlabs/Storage/Browser.php:397 ../../boot.php:1587
+#: ../../Zotlabs/Storage/Browser.php:397 ../../boot.php:1594
#: ../../view/theme/redbasic_c/php/config.php:100
#: ../../view/theme/redbasic_c/php/config.php:115
#: ../../view/theme/redbasic/php/config.php:98
@@ -1082,10 +1091,10 @@ msgstr "Utiliser l'authentification distante, quand disponible"
#: ../../addon/nsfw/nsfw.php:84 ../../addon/ijpost/ijpost.php:73
#: ../../addon/ijpost/ijpost.php:85 ../../addon/dwpost/dwpost.php:73
#: ../../addon/dwpost/dwpost.php:85 ../../addon/ljpost/ljpost.php:70
-#: ../../addon/ljpost/ljpost.php:82 ../../addon/gitwiki/Mod_Gitwiki.php:166
-#: ../../addon/rainbowtag/rainbowtag.php:81 ../../addon/visage/visage.php:166
-#: ../../addon/nsabait/nsabait.php:157 ../../addon/rtof/rtof.php:81
-#: ../../addon/rtof/rtof.php:85 ../../addon/jappixmini/jappixmini.php:309
+#: ../../addon/ljpost/ljpost.php:82 ../../addon/rainbowtag/rainbowtag.php:81
+#: ../../addon/visage/visage.php:166 ../../addon/nsabait/nsabait.php:157
+#: ../../addon/rtof/rtof.php:81 ../../addon/rtof/rtof.php:85
+#: ../../addon/jappixmini/jappixmini.php:309
#: ../../addon/jappixmini/jappixmini.php:313
#: ../../addon/jappixmini/jappixmini.php:343
#: ../../addon/jappixmini/jappixmini.php:351
@@ -1102,11 +1111,12 @@ msgstr "Utiliser l'authentification distante, quand disponible"
#: ../../addon/twitter/twitter.php:252 ../../addon/twitter/twitter.php:261
#: ../../addon/smileybutton/smileybutton.php:211
#: ../../addon/smileybutton/smileybutton.php:215
-#: ../../addon/authchoose/authchoose.php:67 ../../addon/xmpp/xmpp.php:53
-#: ../../addon/pumpio/pumpio.php:219 ../../addon/pumpio/pumpio.php:223
-#: ../../addon/pumpio/pumpio.php:227 ../../addon/pumpio/pumpio.php:231
-#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
-#: ../../include/dir_fns.php:145
+#: ../../addon/cart/cart.php:1075 ../../addon/cart/cart.php:1082
+#: ../../addon/cart/cart.php:1090 ../../addon/authchoose/authchoose.php:67
+#: ../../addon/xmpp/xmpp.php:53 ../../addon/pumpio/pumpio.php:219
+#: ../../addon/pumpio/pumpio.php:223 ../../addon/pumpio/pumpio.php:227
+#: ../../addon/pumpio/pumpio.php:231 ../../include/dir_fns.php:143
+#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145
msgid "No"
msgstr "Non"
@@ -1114,8 +1124,8 @@ msgstr "Non"
#: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241
#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471
#: ../../Zotlabs/Module/Removeme.php:63
-#: ../../Zotlabs/Module/Admin/Site.php:254
-#: ../../Zotlabs/Module/Settings/Channel.php:305
+#: ../../Zotlabs/Module/Admin/Site.php:261
+#: ../../Zotlabs/Module/Settings/Channel.php:307
#: ../../Zotlabs/Module/Settings/Display.php:100
#: ../../Zotlabs/Module/Api.php:98 ../../Zotlabs/Module/Photos.php:697
#: ../../Zotlabs/Module/Wiki.php:218 ../../Zotlabs/Module/Wiki.php:219
@@ -1124,7 +1134,7 @@ msgstr "Non"
#: ../../Zotlabs/Module/Profiles.php:681
#: ../../Zotlabs/Module/Filestorage.php:155
#: ../../Zotlabs/Module/Filestorage.php:163
-#: ../../Zotlabs/Storage/Browser.php:397 ../../boot.php:1587
+#: ../../Zotlabs/Storage/Browser.php:397 ../../boot.php:1594
#: ../../view/theme/redbasic_c/php/config.php:100
#: ../../view/theme/redbasic_c/php/config.php:115
#: ../../view/theme/redbasic/php/config.php:98
@@ -1133,10 +1143,10 @@ msgstr "Non"
#: ../../addon/nsfw/nsfw.php:84 ../../addon/ijpost/ijpost.php:73
#: ../../addon/ijpost/ijpost.php:85 ../../addon/dwpost/dwpost.php:73
#: ../../addon/dwpost/dwpost.php:85 ../../addon/ljpost/ljpost.php:70
-#: ../../addon/ljpost/ljpost.php:82 ../../addon/gitwiki/Mod_Gitwiki.php:166
-#: ../../addon/rainbowtag/rainbowtag.php:81 ../../addon/visage/visage.php:166
-#: ../../addon/nsabait/nsabait.php:157 ../../addon/rtof/rtof.php:81
-#: ../../addon/rtof/rtof.php:85 ../../addon/jappixmini/jappixmini.php:309
+#: ../../addon/ljpost/ljpost.php:82 ../../addon/rainbowtag/rainbowtag.php:81
+#: ../../addon/visage/visage.php:166 ../../addon/nsabait/nsabait.php:157
+#: ../../addon/rtof/rtof.php:81 ../../addon/rtof/rtof.php:85
+#: ../../addon/jappixmini/jappixmini.php:309
#: ../../addon/jappixmini/jappixmini.php:313
#: ../../addon/jappixmini/jappixmini.php:343
#: ../../addon/jappixmini/jappixmini.php:351
@@ -1153,11 +1163,12 @@ msgstr "Non"
#: ../../addon/twitter/twitter.php:252 ../../addon/twitter/twitter.php:261
#: ../../addon/smileybutton/smileybutton.php:211
#: ../../addon/smileybutton/smileybutton.php:215
-#: ../../addon/authchoose/authchoose.php:67 ../../addon/xmpp/xmpp.php:53
-#: ../../addon/pumpio/pumpio.php:219 ../../addon/pumpio/pumpio.php:223
-#: ../../addon/pumpio/pumpio.php:227 ../../addon/pumpio/pumpio.php:231
-#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
-#: ../../include/dir_fns.php:145
+#: ../../addon/cart/cart.php:1075 ../../addon/cart/cart.php:1082
+#: ../../addon/cart/cart.php:1090 ../../addon/authchoose/authchoose.php:67
+#: ../../addon/xmpp/xmpp.php:53 ../../addon/pumpio/pumpio.php:219
+#: ../../addon/pumpio/pumpio.php:223 ../../addon/pumpio/pumpio.php:227
+#: ../../addon/pumpio/pumpio.php:231 ../../include/dir_fns.php:143
+#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145
msgid "Yes"
msgstr "Oui"
@@ -1267,8 +1278,8 @@ msgid "Event not found."
msgstr "Événement introuvable."
#: ../../Zotlabs/Module/Events.php:260 ../../Zotlabs/Module/Tagger.php:73
-#: ../../Zotlabs/Module/Like.php:385 ../../include/conversation.php:119
-#: ../../include/text.php:2007 ../../include/event.php:1153
+#: ../../Zotlabs/Module/Like.php:386 ../../include/conversation.php:119
+#: ../../include/text.php:2008 ../../include/event.php:1153
msgid "event"
msgstr "événement"
@@ -1277,9 +1288,9 @@ msgid "Edit event title"
msgstr "Modifier le titre de l'événement"
#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:465
-#: ../../Zotlabs/Module/Appman.php:140 ../../Zotlabs/Module/Appman.php:141
-#: ../../Zotlabs/Module/Profiles.php:748 ../../Zotlabs/Module/Profiles.php:752
-#: ../../include/datetime.php:205
+#: ../../Zotlabs/Module/Appman.php:141 ../../Zotlabs/Module/Appman.php:142
+#: ../../Zotlabs/Module/Profiles.php:745 ../../Zotlabs/Module/Profiles.php:749
+#: ../../include/datetime.php:211
msgid "Required"
msgstr "Requis"
@@ -1330,12 +1341,12 @@ msgid "Edit Location"
msgstr "Modifier l'emplacement"
#: ../../Zotlabs/Module/Events.php:478 ../../Zotlabs/Module/Photos.php:1123
-#: ../../Zotlabs/Module/Webpages.php:247 ../../Zotlabs/Lib/ThreadItem.php:760
-#: ../../include/conversation.php:1330
+#: ../../Zotlabs/Module/Webpages.php:247 ../../Zotlabs/Lib/ThreadItem.php:762
+#: ../../include/conversation.php:1333
msgid "Preview"
msgstr "Aperçu"
-#: ../../Zotlabs/Module/Events.php:479 ../../include/conversation.php:1402
+#: ../../Zotlabs/Module/Events.php:479 ../../include/conversation.php:1405
msgid "Permission settings"
msgstr "Gérer les droits d'accès"
@@ -1360,7 +1371,7 @@ msgid "Delete event"
msgstr "Supprimer l'événement"
#: ../../Zotlabs/Module/Events.php:660 ../../Zotlabs/Module/Cal.php:315
-#: ../../include/text.php:1826
+#: ../../include/text.php:1827
msgid "Link to Source"
msgstr "Lien vers la Source"
@@ -1377,7 +1388,7 @@ msgid "Create Event"
msgstr "Créer un événement"
#: ../../Zotlabs/Module/Events.php:691 ../../Zotlabs/Module/Cal.php:341
-#: ../../include/channel.php:1637
+#: ../../include/channel.php:1647
msgid "Export"
msgstr "Export"
@@ -1389,55 +1400,55 @@ msgstr "Événement supprimé"
msgid "Failed to remove event"
msgstr "Impossible de supprimer l'événement"
-#: ../../Zotlabs/Module/Appman.php:38 ../../Zotlabs/Module/Appman.php:55
+#: ../../Zotlabs/Module/Appman.php:39 ../../Zotlabs/Module/Appman.php:56
msgid "App installed."
msgstr "Application installée."
-#: ../../Zotlabs/Module/Appman.php:48
+#: ../../Zotlabs/Module/Appman.php:49
msgid "Malformed app."
msgstr "Application mal formée."
-#: ../../Zotlabs/Module/Appman.php:129
+#: ../../Zotlabs/Module/Appman.php:130
msgid "Embed code"
msgstr "Imbriquer le code"
-#: ../../Zotlabs/Module/Appman.php:135
+#: ../../Zotlabs/Module/Appman.php:136
msgid "Edit App"
msgstr "Modifier l'application"
-#: ../../Zotlabs/Module/Appman.php:135
+#: ../../Zotlabs/Module/Appman.php:136
msgid "Create App"
msgstr "Créer une application"
-#: ../../Zotlabs/Module/Appman.php:140
+#: ../../Zotlabs/Module/Appman.php:141
msgid "Name of app"
msgstr "Nom de l'application"
-#: ../../Zotlabs/Module/Appman.php:141
+#: ../../Zotlabs/Module/Appman.php:142
msgid "Location (URL) of app"
msgstr "Emplacement (URL) de l'application"
-#: ../../Zotlabs/Module/Appman.php:143
+#: ../../Zotlabs/Module/Appman.php:144
msgid "Photo icon URL"
msgstr "URL de l'icône à utiliser pour cette photo"
-#: ../../Zotlabs/Module/Appman.php:143
+#: ../../Zotlabs/Module/Appman.php:144
msgid "80 x 80 pixels - optional"
msgstr "80 x 80 pixels - facultatif"
-#: ../../Zotlabs/Module/Appman.php:144
+#: ../../Zotlabs/Module/Appman.php:145
msgid "Categories (optional, comma separated list)"
msgstr "Catégories (séparées par des virgules)"
-#: ../../Zotlabs/Module/Appman.php:145
+#: ../../Zotlabs/Module/Appman.php:146
msgid "Version ID"
msgstr "Identifiant de version"
-#: ../../Zotlabs/Module/Appman.php:146
+#: ../../Zotlabs/Module/Appman.php:147
msgid "Price of app"
msgstr "Prix de l'application"
-#: ../../Zotlabs/Module/Appman.php:147
+#: ../../Zotlabs/Module/Appman.php:148
msgid "Location (URL) to purchase app"
msgstr "Emplacement (URL) pour l'achat de l'application"
@@ -1450,16 +1461,16 @@ msgid "Hub not found."
msgstr "Hub introuvable."
#: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Tagger.php:69
-#: ../../Zotlabs/Module/Like.php:383
+#: ../../Zotlabs/Module/Like.php:384
#: ../../addon/redphotos/redphotohelper.php:71
-#: ../../addon/diaspora/Receiver.php:1518 ../../addon/pubcrawl/as.php:1359
-#: ../../include/conversation.php:116 ../../include/text.php:2004
+#: ../../addon/diaspora/Receiver.php:1500 ../../addon/pubcrawl/as.php:1388
+#: ../../include/conversation.php:116 ../../include/text.php:2005
msgid "photo"
msgstr "photo"
-#: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Like.php:383
-#: ../../addon/diaspora/Receiver.php:1518 ../../addon/pubcrawl/as.php:1359
-#: ../../include/conversation.php:144 ../../include/text.php:2010
+#: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Like.php:384
+#: ../../addon/diaspora/Receiver.php:1500 ../../addon/pubcrawl/as.php:1388
+#: ../../include/conversation.php:144 ../../include/text.php:2011
msgid "status"
msgstr "état"
@@ -1489,8 +1500,9 @@ msgid "Insert web link"
msgstr "Insérer lien web"
#: ../../Zotlabs/Module/Article_edit.php:117
-#: ../../Zotlabs/Module/Editblock.php:129
-#: ../../Zotlabs/Module/Card_edit.php:117 ../../include/conversation.php:1398
+#: ../../Zotlabs/Module/Editblock.php:129 ../../Zotlabs/Module/Photos.php:698
+#: ../../Zotlabs/Module/Photos.php:1068 ../../Zotlabs/Module/Card_edit.php:117
+#: ../../include/conversation.php:1401
msgid "Title (optional)"
msgstr "Titre (facultatif)"
@@ -1513,7 +1525,6 @@ msgid "Imported file is empty."
msgstr "Le fichier importé est vide."
#: ../../Zotlabs/Module/Import_items.php:93
-#: ../../Zotlabs/Module/Import.php:121
#, php-format
msgid "Warning: Database versions differ by %1$d updates."
msgstr "Attention&nbsp;: les versions de bases de données diffèrent de %1$d mises à jour."
@@ -1532,32 +1543,32 @@ msgid ""
msgstr "Utiliser ce formulaire pour importer des publications et du contenu existant d'un fichier d'export."
#: ../../Zotlabs/Module/Import_items.php:127
-#: ../../Zotlabs/Module/Import.php:516
+#: ../../Zotlabs/Module/Import.php:517
msgid "File to Upload"
msgstr "Fichier à envoyer"
-#: ../../Zotlabs/Module/New_channel.php:119
+#: ../../Zotlabs/Module/New_channel.php:133
#: ../../Zotlabs/Module/Manage.php:138
#, php-format
msgid "You have created %1$.0f of %2$.0f allowed channels."
msgstr "Vous avez créé %1$.0f des %2$.0f canaux autorisés."
-#: ../../Zotlabs/Module/New_channel.php:132
+#: ../../Zotlabs/Module/New_channel.php:146
#: ../../Zotlabs/Module/Register.php:254
msgid "Name or caption"
msgstr "Nom ou libellé"
-#: ../../Zotlabs/Module/New_channel.php:132
+#: ../../Zotlabs/Module/New_channel.php:146
#: ../../Zotlabs/Module/Register.php:254
msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""
msgstr "Exemples&nbsp;: \"Jérôme Dutilleul\", \"Louise et ses chevaux\", \"Football\", \"Club d'aéromodélisme\""
-#: ../../Zotlabs/Module/New_channel.php:134
+#: ../../Zotlabs/Module/New_channel.php:148
#: ../../Zotlabs/Module/Register.php:256
msgid "Choose a short nickname"
msgstr "Choisissez un alias"
-#: ../../Zotlabs/Module/New_channel.php:134
+#: ../../Zotlabs/Module/New_channel.php:148
#: ../../Zotlabs/Module/Register.php:256
#, php-format
msgid ""
@@ -1565,38 +1576,38 @@ msgid ""
"e.g. nickname%s"
msgstr "Votre pseudo sera utilisé pour créer une adresse de canal facile à mémoriser, par ex. pseudo%s"
-#: ../../Zotlabs/Module/New_channel.php:135
+#: ../../Zotlabs/Module/New_channel.php:149
#: ../../Zotlabs/Module/Register.php:257
msgid "Channel role and privacy"
msgstr "Rôle et confidentialité du canal"
-#: ../../Zotlabs/Module/New_channel.php:135
+#: ../../Zotlabs/Module/New_channel.php:149
#: ../../Zotlabs/Module/Register.php:257
msgid "Select a channel role with your privacy requirements."
msgstr "Sélectionner un rôle de canal adapté à vos besoins de confidentialité."
-#: ../../Zotlabs/Module/New_channel.php:135
+#: ../../Zotlabs/Module/New_channel.php:149
#: ../../Zotlabs/Module/Register.php:257
msgid "Read more about roles"
msgstr "En savoir plus sur les rôles"
-#: ../../Zotlabs/Module/New_channel.php:138
+#: ../../Zotlabs/Module/New_channel.php:152
msgid "Create Channel"
msgstr "Créer le canal"
-#: ../../Zotlabs/Module/New_channel.php:139
+#: ../../Zotlabs/Module/New_channel.php:153
msgid ""
"A channel is your identity on this network. It can represent a person, a "
"blog, or a forum to name a few. Channels can make connections with other "
"channels to share information with highly detailed permissions."
msgstr "Un canal est votre identité sur ce réseau. Il peut représenter une personne, un blog, ou un forum par exemple. Les canaux peuvent entrer en contact les uns avec les autres pour partager des informations avec des droits d'accès très fins."
-#: ../../Zotlabs/Module/New_channel.php:140
+#: ../../Zotlabs/Module/New_channel.php:154
msgid ""
"or <a href=\"import\">import an existing channel</a> from another location."
msgstr "ou <a href=\"import\">importer un canal existant</a> d'un autre serveur."
-#: ../../Zotlabs/Module/New_channel.php:145
+#: ../../Zotlabs/Module/New_channel.php:159
msgid "Validate"
msgstr "Valider"
@@ -1642,7 +1653,7 @@ msgid ""
msgstr "Par défaut, seule l'instance du canal présente sur ce hub sera supprimée du réseau"
#: ../../Zotlabs/Module/Removeme.php:64
-#: ../../Zotlabs/Module/Settings/Channel.php:592
+#: ../../Zotlabs/Module/Settings/Channel.php:600
msgid "Remove Channel"
msgstr "Supprimer le canal"
@@ -1701,7 +1712,7 @@ msgid ""
msgstr "Vous pourriez avoir besoin d'importer le fichier \"install/schema_xxx.sql\" manuellement via un client de base de données (ex: phpmyadmin)."
#: ../../Zotlabs/Module/Setup.php:198 ../../Zotlabs/Module/Setup.php:262
-#: ../../Zotlabs/Module/Setup.php:745
+#: ../../Zotlabs/Module/Setup.php:749
msgid "Please see the file \"install/INSTALL.txt\"."
msgstr "Merci de consulter le fichier \"install/INSTALL.txt\"."
@@ -1962,115 +1973,107 @@ msgstr "Erreur&nbsp;: le module xml de PHP est requis pour le DAV, mais pas inst
msgid "Error: zip PHP module required but not installed."
msgstr "Erreur&nbsp;: le module zip de PHP est requis, mais pas installé."
-#: ../../Zotlabs/Module/Setup.php:569
+#: ../../Zotlabs/Module/Setup.php:570 ../../Zotlabs/Module/Setup.php:579
+msgid ".htconfig.php is writable"
+msgstr "Le fichier .htconfig.php est accessible en écriture"
+
+#: ../../Zotlabs/Module/Setup.php:575
msgid ""
"The web installer needs to be able to create a file called \".htconfig.php\""
" in the top folder of your web server and it is unable to do so."
msgstr "L'installeur web a besoin de créer un fichier \".htconfig.php\" à la racine de votre serveur web, mais en est incapable."
-#: ../../Zotlabs/Module/Setup.php:570
+#: ../../Zotlabs/Module/Setup.php:576
msgid ""
"This is most often a permission setting, as the web server may not be able "
"to write files in your folder - even if you can."
msgstr "C'est généralement lié à un problème de droits d'accès, à cause duquel le serveur web est interdit d'écriture dans le répertoire concerné - alors que votre propre utilisateur a le droit."
-#: ../../Zotlabs/Module/Setup.php:571
-msgid ""
-"At the end of this procedure, we will give you a text to save in a file "
-"named .htconfig.php in your Red top folder."
-msgstr "Au terme de cette procédure, nous vous transmettrons un texte à sauvegarder dans un fichier nommé .htconfig.php, à la racine de votre installation de $Projectname."
-
-#: ../../Zotlabs/Module/Setup.php:572
-msgid ""
-"You can alternatively skip this procedure and perform a manual installation."
-" Please see the file \"install/INSTALL.txt\" for instructions."
-msgstr "Autrement, vous pouvez contourner toute cette procédure et réaliser l'installation manuellement. Merci de consulter le fichier \"install/INSTALL.txt\" pour les instructions détaillées."
-
-#: ../../Zotlabs/Module/Setup.php:575
-msgid ".htconfig.php is writable"
-msgstr "Le fichier .htconfig.php est accessible en écriture"
+#: ../../Zotlabs/Module/Setup.php:577
+msgid "Please see install/INSTALL.txt for additional information."
+msgstr "Merci de vous reporter à install/INSTALL.txt pour des informations supplémentaires."
-#: ../../Zotlabs/Module/Setup.php:589
+#: ../../Zotlabs/Module/Setup.php:593
msgid ""
"This software uses the Smarty3 template engine to render its web views. "
"Smarty3 compiles templates to PHP to speed up rendering."
msgstr "Ce logiciel utilise Smarty3 comme moteur de modèles pour afficher ses vues Web. Smarty3 compile ses modèles en PHP pour accélérer le rendu."
-#: ../../Zotlabs/Module/Setup.php:590
+#: ../../Zotlabs/Module/Setup.php:594
#, php-format
msgid ""
"In order to store these compiled templates, the web server needs to have "
"write access to the directory %s under the top level web folder."
msgstr "Afin de stocker ces modèles compilés, le serveur Web doit disposer d'un accès en écriture au répertoire %s selon le dossier Web racine."
-#: ../../Zotlabs/Module/Setup.php:591 ../../Zotlabs/Module/Setup.php:612
+#: ../../Zotlabs/Module/Setup.php:595 ../../Zotlabs/Module/Setup.php:616
msgid ""
"Please ensure that the user that your web server runs as (e.g. www-data) has"
" write access to this folder."
msgstr "Merci de vous assurer que l'utilisateur sous lequel le serveur web tourne (le plus souvent, www-data) a bien l'autorisation d'écrire dans ce répertoire."
-#: ../../Zotlabs/Module/Setup.php:592
+#: ../../Zotlabs/Module/Setup.php:596
#, php-format
msgid ""
"Note: as a security measure, you should give the web server write access to "
"%s only--not the template files (.tpl) that it contains."
msgstr "Note: Comme mesure de sécurité, assurez vous de donner les droits d'écriture au serveur web sur %s uniquement, pas sur les fichiers individuels (.tpl) qu'il contient."
-#: ../../Zotlabs/Module/Setup.php:595
+#: ../../Zotlabs/Module/Setup.php:599
#, php-format
msgid "%s is writable"
msgstr "Permission d'écriture sur %s activée"
-#: ../../Zotlabs/Module/Setup.php:611
+#: ../../Zotlabs/Module/Setup.php:615
msgid ""
"This software uses the store directory to save uploaded files. The web "
"server needs to have write access to the store directory under the top level"
" web folder"
msgstr "Ce logiciel utilise le répertoire de stockage pour enregistrer les fichiers téléversés. Le serveur Web doit disposer d'un accès en écriture au répertoire de stockage selon le dossier web racine."
-#: ../../Zotlabs/Module/Setup.php:615
+#: ../../Zotlabs/Module/Setup.php:619
msgid "store is writable"
msgstr "'store' est accessible en écriture"
-#: ../../Zotlabs/Module/Setup.php:647
+#: ../../Zotlabs/Module/Setup.php:651
msgid ""
"SSL certificate cannot be validated. Fix certificate or disable https access"
" to this site."
msgstr "Le certificat SSL/TLS n'a pas pu être validé. Merci de le corriger, ou de désactiver l'accès https à ce site (non recommandé)."
-#: ../../Zotlabs/Module/Setup.php:648
+#: ../../Zotlabs/Module/Setup.php:652
msgid ""
"If you have https access to your website or allow connections to TCP port "
"443 (the https: port), you MUST use a browser-valid certificate. You MUST "
"NOT use self-signed certificates!"
msgstr "Si votre serveur accepte les connexions https ou s'il permet les connexions sur le port TCP 443 (le port utilisé par le protocole https), vous DEVEZ utiliser un certificat valide. Vous ne DEVEZ PAS utiliser un certificat que vous avez vous-mêmes signé&nbsp;!"
-#: ../../Zotlabs/Module/Setup.php:649
+#: ../../Zotlabs/Module/Setup.php:653
msgid ""
"This restriction is incorporated because public posts from you may for "
"example contain references to images on your own hub."
msgstr "Nous avons ajouté cette contrainte pour éviter que vos publications publiques ne fassent référence par exemple à des images sur votre propre hub."
-#: ../../Zotlabs/Module/Setup.php:650
+#: ../../Zotlabs/Module/Setup.php:654
msgid ""
"If your certificate is not recognized, members of other sites (who may "
"themselves have valid certificates) will get a warning message on their own "
"site complaining about security issues."
msgstr "Si votre certificat n'est pas reconnu, les membres des autres sites (qui eux peuvent avoir des certificats valides) recevront des messages d'avertissement sur leur propre site se plaignant de problèmes de sécurité."
-#: ../../Zotlabs/Module/Setup.php:651
+#: ../../Zotlabs/Module/Setup.php:655
msgid ""
"This can cause usability issues elsewhere (not just on your own site) so we "
"must insist on this requirement."
msgstr "Ceci peut causer des problèmes d'ergonomie ailleurs (pas seulement sur votre site), nous devons donc insister sur ce prérequis."
-#: ../../Zotlabs/Module/Setup.php:652
+#: ../../Zotlabs/Module/Setup.php:656
msgid ""
"Providers are available that issue free certificates which are browser-"
"valid."
msgstr "Il existe des autorités de certification qui vous fourniront gratuitement un certificat valide."
-#: ../../Zotlabs/Module/Setup.php:654
+#: ../../Zotlabs/Module/Setup.php:658
msgid ""
"If you are confident that the certificate is valid and signed by a trusted "
"authority, check to see if you have failed to install an intermediate cert. "
@@ -2078,37 +2081,37 @@ msgid ""
"server communications."
msgstr "Si vous êtes certain que le certificat est valide et signé par une autorité de confiance, vérifiez si l'installation d'un certificat intermédiaire aurait échoué. Ceux-ci ne sont normalement pas requis par les navigateurs, mais ils sont requis pour les communications entre serveurs."
-#: ../../Zotlabs/Module/Setup.php:656
+#: ../../Zotlabs/Module/Setup.php:660
msgid "SSL certificate validation"
msgstr "Validation du certificat SSL/TLS"
-#: ../../Zotlabs/Module/Setup.php:662
+#: ../../Zotlabs/Module/Setup.php:666
msgid ""
"Url rewrite in .htaccess is not working. Check your server "
"configuration.Test: "
msgstr "La réécriture d'URL définie dans le .htaccess ne fonctionne pas. Vérifiez votre configuration serveur. Test&nbsp;:"
-#: ../../Zotlabs/Module/Setup.php:665
+#: ../../Zotlabs/Module/Setup.php:669
msgid "Url rewrite is working"
msgstr "La réécriture d'URL fonctionne"
-#: ../../Zotlabs/Module/Setup.php:679
+#: ../../Zotlabs/Module/Setup.php:683
msgid ""
"The database configuration file \".htconfig.php\" could not be written. "
"Please use the enclosed text to create a configuration file in your web "
"server root."
msgstr "Le fichier de configuration de la base de données - \".htconfig.php\" - ne peut être écrit. Merci de copier le texte généré dans un fichier à ce nom, à la racine de votre serveur web."
-#: ../../Zotlabs/Module/Setup.php:703
+#: ../../Zotlabs/Module/Setup.php:707
#: ../../addon/rendezvous/rendezvous.php:401
msgid "Errors encountered creating database tables."
msgstr "Erreurs rencontrées pendant la création de tables de BDD."
-#: ../../Zotlabs/Module/Setup.php:743
+#: ../../Zotlabs/Module/Setup.php:747
msgid "<h1>What next?</h1>"
msgstr "<h1>Et maintenant&nbsp;?</h1>"
-#: ../../Zotlabs/Module/Setup.php:744
+#: ../../Zotlabs/Module/Setup.php:748
msgid ""
"IMPORTANT: You will need to [manually] setup a scheduled task for the "
"poller."
@@ -2187,13 +2190,13 @@ msgstr "Dernier contact connu"
#: ../../Zotlabs/Module/Admin/Features.php:55
#: ../../Zotlabs/Module/Admin/Features.php:56
-#: ../../Zotlabs/Module/Settings/Features.php:38
+#: ../../Zotlabs/Module/Settings/Features.php:65
msgid "Off"
msgstr "Inactif"
#: ../../Zotlabs/Module/Admin/Features.php:55
#: ../../Zotlabs/Module/Admin/Features.php:56
-#: ../../Zotlabs/Module/Settings/Features.php:38
+#: ../../Zotlabs/Module/Settings/Features.php:65
msgid "On"
msgstr "Actif"
@@ -2247,11 +2250,11 @@ msgid "No failed updates."
msgstr "Aucune mise à jour défaillante."
#: ../../Zotlabs/Module/Admin/Plugins.php:259
-#: ../../Zotlabs/Module/Admin/Themes.php:72 ../../Zotlabs/Module/Thing.php:89
+#: ../../Zotlabs/Module/Admin/Themes.php:72 ../../Zotlabs/Module/Thing.php:94
#: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:46
-#: ../../Zotlabs/Module/Display.php:410
+#: ../../Zotlabs/Module/Display.php:453
#: ../../Zotlabs/Module/Filestorage.php:24 ../../Zotlabs/Module/Admin.php:62
-#: ../../include/items.php:3569
+#: ../../include/items.php:3619
msgid "Item not found."
msgstr "Élément introuvable"
@@ -2277,12 +2280,12 @@ msgstr "Activer"
#: ../../Zotlabs/Module/Admin/Plugins.php:341
#: ../../Zotlabs/Module/Admin/Plugins.php:436
-#: ../../Zotlabs/Module/Admin/Accounts.php:165
+#: ../../Zotlabs/Module/Admin/Accounts.php:166
#: ../../Zotlabs/Module/Admin/Logs.php:82
#: ../../Zotlabs/Module/Admin/Channels.php:145
#: ../../Zotlabs/Module/Admin/Themes.php:122
#: ../../Zotlabs/Module/Admin/Themes.php:156
-#: ../../Zotlabs/Module/Admin/Site.php:287
+#: ../../Zotlabs/Module/Admin/Site.php:294
#: ../../Zotlabs/Module/Admin/Security.php:86
#: ../../Zotlabs/Module/Admin.php:136
msgid "Administration"
@@ -2301,8 +2304,8 @@ msgstr "(Dés)activer"
#: ../../Zotlabs/Module/Admin/Plugins.php:344
#: ../../Zotlabs/Module/Admin/Themes.php:125 ../../Zotlabs/Lib/Apps.php:242
-#: ../../Zotlabs/Widget/Newmember.php:55
-#: ../../Zotlabs/Widget/Settings_menu.php:133 ../../include/nav.php:105
+#: ../../Zotlabs/Widget/Newmember.php:46
+#: ../../Zotlabs/Widget/Settings_menu.php:141 ../../include/nav.php:105
#: ../../include/nav.php:192
msgid "Settings"
msgstr "Paramètres"
@@ -2410,7 +2413,7 @@ msgstr[1] "%s comptes supprimés"
msgid "Account not found"
msgstr "Compte introuvable"
-#: ../../Zotlabs/Module/Admin/Accounts.php:91 ../../include/channel.php:2462
+#: ../../Zotlabs/Module/Admin/Accounts.php:91 ../../include/channel.php:2473
#, php-format
msgid "Account '%s' deleted"
msgstr "Compte '%s' supprimé"
@@ -2425,79 +2428,80 @@ msgstr "Compte '%s' bloqué"
msgid "Account '%s' unblocked"
msgstr "Compte '%s' débloqué"
-#: ../../Zotlabs/Module/Admin/Accounts.php:166
-#: ../../Zotlabs/Module/Admin/Accounts.php:179
+#: ../../Zotlabs/Module/Admin/Accounts.php:167
+#: ../../Zotlabs/Module/Admin/Accounts.php:180
#: ../../Zotlabs/Module/Admin.php:96 ../../Zotlabs/Widget/Admin.php:23
msgid "Accounts"
msgstr "Comptes"
-#: ../../Zotlabs/Module/Admin/Accounts.php:168
+#: ../../Zotlabs/Module/Admin/Accounts.php:169
#: ../../Zotlabs/Module/Admin/Channels.php:148
msgid "select all"
msgstr "tout sélectionner"
-#: ../../Zotlabs/Module/Admin/Accounts.php:169
+#: ../../Zotlabs/Module/Admin/Accounts.php:170
msgid "Registrations waiting for confirm"
msgstr "Inscriptions en attente d'approbation"
-#: ../../Zotlabs/Module/Admin/Accounts.php:170
+#: ../../Zotlabs/Module/Admin/Accounts.php:171
msgid "Request date"
msgstr "Date de la demande"
-#: ../../Zotlabs/Module/Admin/Accounts.php:171
+#: ../../Zotlabs/Module/Admin/Accounts.php:172
msgid "No registrations."
msgstr "Pas d'inscriptions."
-#: ../../Zotlabs/Module/Admin/Accounts.php:172
-#: ../../Zotlabs/Module/Connections.php:287 ../../include/conversation.php:732
+#: ../../Zotlabs/Module/Admin/Accounts.php:173
+#: ../../Zotlabs/Module/Connections.php:303 ../../include/conversation.php:732
msgid "Approve"
msgstr "Approuver"
-#: ../../Zotlabs/Module/Admin/Accounts.php:173
+#: ../../Zotlabs/Module/Admin/Accounts.php:174
+#: ../../Zotlabs/Module/Authorize.php:26
msgid "Deny"
msgstr "Refuser"
-#: ../../Zotlabs/Module/Admin/Accounts.php:175
+#: ../../Zotlabs/Module/Admin/Accounts.php:176
#: ../../Zotlabs/Module/Connedit.php:622
msgid "Block"
msgstr "Bloquer"
-#: ../../Zotlabs/Module/Admin/Accounts.php:176
+#: ../../Zotlabs/Module/Admin/Accounts.php:177
#: ../../Zotlabs/Module/Connedit.php:622
msgid "Unblock"
msgstr "Débloquer"
-#: ../../Zotlabs/Module/Admin/Accounts.php:181
+#: ../../Zotlabs/Module/Admin/Accounts.php:182
msgid "ID"
msgstr "Identifiant"
-#: ../../Zotlabs/Module/Admin/Accounts.php:183 ../../include/group.php:284
+#: ../../Zotlabs/Module/Admin/Accounts.php:184 ../../include/group.php:284
msgid "All Channels"
msgstr "Tous les canaux"
-#: ../../Zotlabs/Module/Admin/Accounts.php:184
+#: ../../Zotlabs/Module/Admin/Accounts.php:185
msgid "Register date"
msgstr "Date d'inscription"
-#: ../../Zotlabs/Module/Admin/Accounts.php:185
+#: ../../Zotlabs/Module/Admin/Accounts.php:186
msgid "Last login"
msgstr "Dernière connexion"
-#: ../../Zotlabs/Module/Admin/Accounts.php:186
+#: ../../Zotlabs/Module/Admin/Accounts.php:187
msgid "Expires"
msgstr "Expire le"
-#: ../../Zotlabs/Module/Admin/Accounts.php:187
+#: ../../Zotlabs/Module/Admin/Accounts.php:188
msgid "Service Class"
msgstr "Classe de service"
-#: ../../Zotlabs/Module/Admin/Accounts.php:189
+#: ../../Zotlabs/Module/Admin/Accounts.php:190
msgid ""
"Selected accounts will be deleted!\\n\\nEverything these accounts had posted"
" on this site will be permanently deleted!\\n\\nAre you sure?"
msgstr "Les comptes sélectionnés seront supprimés&nbsp;!\\n\\nTout ce que ces utilisateurs ont publié sur ce site sera détruit de manière définitive&nbsp;!\\n\\nÊtes-vous sûr&nbsp;?"
-#: ../../Zotlabs/Module/Admin/Accounts.php:190
+#: ../../Zotlabs/Module/Admin/Accounts.php:191
msgid ""
"The account {0} will be deleted!\\n\\nEverything this account has posted on "
"this site will be permanently deleted!\\n\\nAre you sure?"
@@ -2606,7 +2610,7 @@ msgid "Disallow Code"
msgstr "Interdire le code"
#: ../../Zotlabs/Module/Admin/Channels.php:154
-#: ../../include/conversation.php:1808 ../../include/nav.php:378
+#: ../../include/conversation.php:1811 ../../include/nav.php:378
msgid "Channel"
msgstr "Canal"
@@ -2651,552 +2655,549 @@ msgstr "[Expérimental]"
msgid "[Unsupported]"
msgstr "[Non maintenu]"
-#: ../../Zotlabs/Module/Admin/Site.php:158
+#: ../../Zotlabs/Module/Admin/Site.php:165
msgid "Site settings updated."
msgstr "Paramètres du site sauvegardés."
-#: ../../Zotlabs/Module/Admin/Site.php:184
+#: ../../Zotlabs/Module/Admin/Site.php:191
#: ../../view/theme/redbasic_c/php/config.php:15
-#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3082
+#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3089
msgid "Default"
msgstr "Défaut"
-#: ../../Zotlabs/Module/Admin/Site.php:195
+#: ../../Zotlabs/Module/Admin/Site.php:202
#: ../../Zotlabs/Module/Settings/Display.php:130
#, php-format
msgid "%s - (Incompatible)"
msgstr "%s - (Incompatible)"
-#: ../../Zotlabs/Module/Admin/Site.php:202
+#: ../../Zotlabs/Module/Admin/Site.php:209
msgid "mobile"
msgstr "mobile"
-#: ../../Zotlabs/Module/Admin/Site.php:204
+#: ../../Zotlabs/Module/Admin/Site.php:211
msgid "experimental"
msgstr "expérimental"
-#: ../../Zotlabs/Module/Admin/Site.php:206
+#: ../../Zotlabs/Module/Admin/Site.php:213
msgid "unsupported"
msgstr "non maintenu"
-#: ../../Zotlabs/Module/Admin/Site.php:253
+#: ../../Zotlabs/Module/Admin/Site.php:260
msgid "Yes - with approval"
msgstr "Oui - avec approbation"
-#: ../../Zotlabs/Module/Admin/Site.php:259
+#: ../../Zotlabs/Module/Admin/Site.php:266
msgid "My site is not a public server"
msgstr "Mon site n'est pas un serveur public"
-#: ../../Zotlabs/Module/Admin/Site.php:260
+#: ../../Zotlabs/Module/Admin/Site.php:267
msgid "My site has paid access only"
msgstr "Mon site est à accès payant uniquement"
-#: ../../Zotlabs/Module/Admin/Site.php:261
+#: ../../Zotlabs/Module/Admin/Site.php:268
msgid "My site has free access only"
msgstr "Mon site est gratuit uniquement"
-#: ../../Zotlabs/Module/Admin/Site.php:262
+#: ../../Zotlabs/Module/Admin/Site.php:269
msgid "My site offers free accounts with optional paid upgrades"
msgstr "Mon site offre des comptes gratuits avec des améliorations payantes facultatives"
-#: ../../Zotlabs/Module/Admin/Site.php:274
+#: ../../Zotlabs/Module/Admin/Site.php:281
msgid "Beginner/Basic"
msgstr "Pour débutant/ de base"
-#: ../../Zotlabs/Module/Admin/Site.php:275
+#: ../../Zotlabs/Module/Admin/Site.php:282
msgid "Novice - not skilled but willing to learn"
msgstr "Novice - pas qualifiés, mais prêt à apprendre"
-#: ../../Zotlabs/Module/Admin/Site.php:276
+#: ../../Zotlabs/Module/Admin/Site.php:283
msgid "Intermediate - somewhat comfortable"
msgstr "Intermédiaire - assez confortable"
-#: ../../Zotlabs/Module/Admin/Site.php:277
+#: ../../Zotlabs/Module/Admin/Site.php:284
msgid "Advanced - very comfortable"
msgstr "Niveau avancé - trés confortable"
-#: ../../Zotlabs/Module/Admin/Site.php:278
+#: ../../Zotlabs/Module/Admin/Site.php:285
msgid "Expert - I can write computer code"
msgstr "Niveau expert - Je peux programmer"
-#: ../../Zotlabs/Module/Admin/Site.php:279
+#: ../../Zotlabs/Module/Admin/Site.php:286
msgid "Wizard - I probably know more than you do"
msgstr "Crack - J'en sais probablement plus que beaucoup"
-#: ../../Zotlabs/Module/Admin/Site.php:288 ../../Zotlabs/Widget/Admin.php:22
+#: ../../Zotlabs/Module/Admin/Site.php:295 ../../Zotlabs/Widget/Admin.php:22
msgid "Site"
msgstr "Site"
-#: ../../Zotlabs/Module/Admin/Site.php:290
+#: ../../Zotlabs/Module/Admin/Site.php:297
#: ../../Zotlabs/Module/Register.php:269
msgid "Registration"
msgstr "Inscription"
-#: ../../Zotlabs/Module/Admin/Site.php:291
+#: ../../Zotlabs/Module/Admin/Site.php:298
msgid "File upload"
msgstr "Envoi de fichier"
-#: ../../Zotlabs/Module/Admin/Site.php:292
+#: ../../Zotlabs/Module/Admin/Site.php:299
msgid "Policies"
msgstr "Stratégies"
-#: ../../Zotlabs/Module/Admin/Site.php:293
+#: ../../Zotlabs/Module/Admin/Site.php:300
#: ../../include/contact_widgets.php:16
msgid "Advanced"
msgstr "Avancé"
-#: ../../Zotlabs/Module/Admin/Site.php:297
+#: ../../Zotlabs/Module/Admin/Site.php:304
#: ../../addon/statusnet/statusnet.php:891
msgid "Site name"
msgstr "Nom du site"
-#: ../../Zotlabs/Module/Admin/Site.php:299
+#: ../../Zotlabs/Module/Admin/Site.php:306
msgid "Site default technical skill level"
msgstr "Niveau technique par défaut pour le site"
-#: ../../Zotlabs/Module/Admin/Site.php:299
+#: ../../Zotlabs/Module/Admin/Site.php:306
msgid "Used to provide a member experience matched to technical comfort level"
msgstr "Utilisé pour fournir une expérience utilisateur correspondant au niveau de confort technique"
-#: ../../Zotlabs/Module/Admin/Site.php:301
+#: ../../Zotlabs/Module/Admin/Site.php:308
msgid "Lock the technical skill level setting"
msgstr "Bloque le niveau technique du paramétrage"
-#: ../../Zotlabs/Module/Admin/Site.php:301
+#: ../../Zotlabs/Module/Admin/Site.php:308
msgid "Members can set their own technical comfort level by default"
msgstr "Les utilisateurs peuvent paramétrer leur propre niveau technique."
-#: ../../Zotlabs/Module/Admin/Site.php:303
+#: ../../Zotlabs/Module/Admin/Site.php:310
msgid "Banner/Logo"
msgstr "Bannière/logo"
-#: ../../Zotlabs/Module/Admin/Site.php:303
+#: ../../Zotlabs/Module/Admin/Site.php:310
msgid "Unfiltered HTML/CSS/JS is allowed"
msgstr "Autoriser le HTML/CSS/JS non filtré"
-#: ../../Zotlabs/Module/Admin/Site.php:304
+#: ../../Zotlabs/Module/Admin/Site.php:311
msgid "Administrator Information"
msgstr "Informations de l'administrateur"
-#: ../../Zotlabs/Module/Admin/Site.php:304
+#: ../../Zotlabs/Module/Admin/Site.php:311
msgid ""
"Contact information for site administrators. Displayed on siteinfo page. "
"BBCode can be used here"
msgstr "Coordonnées de l'administrateur du site. Affichées sur la page 'siteinfo'. Vous pouvez utiliser du BBCode ici"
-#: ../../Zotlabs/Module/Admin/Site.php:305
+#: ../../Zotlabs/Module/Admin/Site.php:312
#: ../../Zotlabs/Module/Siteinfo.php:21
msgid "Site Information"
msgstr "Site information"
-#: ../../Zotlabs/Module/Admin/Site.php:305
+#: ../../Zotlabs/Module/Admin/Site.php:312
msgid ""
"Publicly visible description of this site. Displayed on siteinfo page. "
"BBCode can be used here"
msgstr "Description du site visible publiquement. Affiché sur la page d'information du site. BBCode peut être utilisé ici."
-#: ../../Zotlabs/Module/Admin/Site.php:306
+#: ../../Zotlabs/Module/Admin/Site.php:313
msgid "System language"
msgstr "Langue du système"
-#: ../../Zotlabs/Module/Admin/Site.php:307
+#: ../../Zotlabs/Module/Admin/Site.php:314
msgid "System theme"
msgstr "Thème du système"
-#: ../../Zotlabs/Module/Admin/Site.php:307
+#: ../../Zotlabs/Module/Admin/Site.php:314
msgid ""
"Default system theme - may be over-ridden by user profiles - <a href='#' "
"id='cnftheme'>change theme settings</a>"
msgstr "Thème par défaut - il peut être changé pour chaque profil utilisateur - <a href='#' id='cnftheme'>modifier le thème</a>"
-#: ../../Zotlabs/Module/Admin/Site.php:308
-msgid "Mobile system theme"
-msgstr "Thème par défaut pour les mobiles"
-
-#: ../../Zotlabs/Module/Admin/Site.php:308
-msgid "Theme for mobile devices"
-msgstr "Thème pour les mobiles"
-
-#: ../../Zotlabs/Module/Admin/Site.php:310
+#: ../../Zotlabs/Module/Admin/Site.php:317
msgid "Allow Feeds as Connections"
msgstr "Autoriser les Flux (RSS) comme contacts"
-#: ../../Zotlabs/Module/Admin/Site.php:310
+#: ../../Zotlabs/Module/Admin/Site.php:317
msgid "(Heavy system resource usage)"
msgstr "(Impact important sur les ressources)"
-#: ../../Zotlabs/Module/Admin/Site.php:311
+#: ../../Zotlabs/Module/Admin/Site.php:318
msgid "Maximum image size"
msgstr "Taille maximale des images"
-#: ../../Zotlabs/Module/Admin/Site.php:311
+#: ../../Zotlabs/Module/Admin/Site.php:318
msgid ""
"Maximum size in bytes of uploaded images. Default is 0, which means no "
"limits."
msgstr "Taille maximum, en octets, des images envoyées. Par défaut 0, soit sans limite."
-#: ../../Zotlabs/Module/Admin/Site.php:312
+#: ../../Zotlabs/Module/Admin/Site.php:319
msgid "Does this site allow new member registration?"
msgstr "Est-ce que l'enregistrement de nouveaux membres est autorisé sur ce site&nbsp;?"
-#: ../../Zotlabs/Module/Admin/Site.php:313
+#: ../../Zotlabs/Module/Admin/Site.php:320
msgid "Invitation only"
msgstr "Sur invitation seulement"
-#: ../../Zotlabs/Module/Admin/Site.php:313
+#: ../../Zotlabs/Module/Admin/Site.php:320
msgid ""
"Only allow new member registrations with an invitation code. Above register "
"policy must be set to Yes."
msgstr "N'autoriser que les nouvelles inscriptions avec code d'invitation. La stratégie d'inscription ci-dessus doit être mise sur \"Oui\"."
-#: ../../Zotlabs/Module/Admin/Site.php:314
+#: ../../Zotlabs/Module/Admin/Site.php:321
msgid "Minimum age"
msgstr "Âge minimum"
-#: ../../Zotlabs/Module/Admin/Site.php:314
+#: ../../Zotlabs/Module/Admin/Site.php:321
msgid "Minimum age (in years) for who may register on this site."
msgstr "Âge minimum (en années) pour les personnes pouvant s'inscrire sur ce site."
-#: ../../Zotlabs/Module/Admin/Site.php:315
+#: ../../Zotlabs/Module/Admin/Site.php:322
msgid "Which best describes the types of account offered by this hub?"
msgstr "Quelle est la meilleure description des types de comptes proposés sur ce hub&nbsp;?"
-#: ../../Zotlabs/Module/Admin/Site.php:316
+#: ../../Zotlabs/Module/Admin/Site.php:323
msgid "Register text"
msgstr "Texte d'inscription"
-#: ../../Zotlabs/Module/Admin/Site.php:316
+#: ../../Zotlabs/Module/Admin/Site.php:323
msgid "Will be displayed prominently on the registration page."
msgstr "Sera affiché de manière bien visible sur le formulaire d'inscription."
-#: ../../Zotlabs/Module/Admin/Site.php:317
+#: ../../Zotlabs/Module/Admin/Site.php:324
msgid "Site homepage to show visitors (default: login box)"
msgstr "Page d'accueil du site à montrer aux visiteurs (par défaut&nbsp;: boîte de dialogue de connexion)"
-#: ../../Zotlabs/Module/Admin/Site.php:317
+#: ../../Zotlabs/Module/Admin/Site.php:324
msgid ""
"example: 'public' to show public stream, 'page/sys/home' to show a system "
"webpage called 'home' or 'include:home.html' to include a file."
msgstr "exemple&nbsp;:'public' pour montrer le flux public, 'page/sys/home' pour montrer une page système appelée 'home' ou 'include:home.html' pour inclure un fichier."
-#: ../../Zotlabs/Module/Admin/Site.php:318
+#: ../../Zotlabs/Module/Admin/Site.php:325
msgid "Preserve site homepage URL"
msgstr "Préserver l'adresse d'accueil du site"
-#: ../../Zotlabs/Module/Admin/Site.php:318
+#: ../../Zotlabs/Module/Admin/Site.php:325
msgid ""
"Present the site homepage in a frame at the original location instead of "
"redirecting"
msgstr "Présenter la page d'accueil du site dans un cadre à l'adresse d'origine, plutôt que de rediriger"
-#: ../../Zotlabs/Module/Admin/Site.php:319
+#: ../../Zotlabs/Module/Admin/Site.php:326
msgid "Accounts abandoned after x days"
msgstr "Les comptes sont abandonnés après x jours"
-#: ../../Zotlabs/Module/Admin/Site.php:319
+#: ../../Zotlabs/Module/Admin/Site.php:326
msgid ""
"Will not waste system resources polling external sites for abandonded "
"accounts. Enter 0 for no time limit."
msgstr "Eviter de gaspiller les ressources du système en interrogeant des hubs distants pour des canaux abandonnés. Mettez 0 pour ne pas avoir de limite de temps."
-#: ../../Zotlabs/Module/Admin/Site.php:320
+#: ../../Zotlabs/Module/Admin/Site.php:327
msgid "Allowed friend domains"
msgstr "Domaines amicaux autorisés"
-#: ../../Zotlabs/Module/Admin/Site.php:320
+#: ../../Zotlabs/Module/Admin/Site.php:327
msgid ""
"Comma separated list of domains which are allowed to establish friendships "
"with this site. Wildcards are accepted. Empty to allow any domains"
msgstr "Liste de noms de domaines séparés par des virgules pour lesquels ce site acceptera les demandes d'amitié. Les caractères génériques (*) sont acceptés. Laissez vide pour accepter tous les domaines."
-#: ../../Zotlabs/Module/Admin/Site.php:321
+#: ../../Zotlabs/Module/Admin/Site.php:328
msgid "Verify Email Addresses"
msgstr "Demander vérification des adresses de courriel"
-#: ../../Zotlabs/Module/Admin/Site.php:321
+#: ../../Zotlabs/Module/Admin/Site.php:328
msgid ""
"Check to verify email addresses used in account registration (recommended)."
msgstr "Cocher pour que les adresses utilisées à l'inscription soient vérifiées (recommandé)."
-#: ../../Zotlabs/Module/Admin/Site.php:322
+#: ../../Zotlabs/Module/Admin/Site.php:329
msgid "Force publish"
msgstr "Publicité forcée"
-#: ../../Zotlabs/Module/Admin/Site.php:322
+#: ../../Zotlabs/Module/Admin/Site.php:329
msgid ""
"Check to force all profiles on this site to be listed in the site directory."
msgstr "Cocher pour forcer la publication de tous les profils du site dans l'annuaire."
-#: ../../Zotlabs/Module/Admin/Site.php:323
+#: ../../Zotlabs/Module/Admin/Site.php:330
msgid "Import Public Streams"
msgstr "Flux publics importés"
-#: ../../Zotlabs/Module/Admin/Site.php:323
+#: ../../Zotlabs/Module/Admin/Site.php:330
msgid ""
"Import and allow access to public content pulled from other sites. Warning: "
"this content is unmoderated."
msgstr "Importer du contenu public à partir d'autres sites et autoriser l'accès à ce contenu. Attention&nbsp;: ce contenu n'est pas modéré."
-#: ../../Zotlabs/Module/Admin/Site.php:324
+#: ../../Zotlabs/Module/Admin/Site.php:331
msgid "Site only Public Streams"
msgstr "Flux publics du site seulement"
-#: ../../Zotlabs/Module/Admin/Site.php:324
+#: ../../Zotlabs/Module/Admin/Site.php:331
msgid ""
"Allow access to public content originating only from this site if Imported "
"Public Streams are disabled."
msgstr "Autoriser l'accès au contenu public provenant uniquement de ce site si les flux publics importés sont désactivés."
-#: ../../Zotlabs/Module/Admin/Site.php:325
+#: ../../Zotlabs/Module/Admin/Site.php:332
msgid "Allow anybody on the internet to access the Public streams"
msgstr "Permettre à n'importe qui sur Internet d'accéder aux flux publics."
-#: ../../Zotlabs/Module/Admin/Site.php:325
+#: ../../Zotlabs/Module/Admin/Site.php:332
msgid ""
"Disable to require authentication before viewing. Warning: this content is "
"unmoderated."
msgstr "Désactiver l'authentification avant l'affichage. Attention : ce contenu n'est pas modéré."
-#: ../../Zotlabs/Module/Admin/Site.php:326
+#: ../../Zotlabs/Module/Admin/Site.php:333
msgid "Login on Homepage"
msgstr "Connexion sur la page d'accueil"
-#: ../../Zotlabs/Module/Admin/Site.php:326
+#: ../../Zotlabs/Module/Admin/Site.php:333
msgid ""
"Present a login box to visitors on the home page if no other content has "
"been configured."
msgstr "Présenter une boîte de dialogue de connexion aux visiteurs sur la page d'accueil si aucun autre contenu n'a été configuré."
-#: ../../Zotlabs/Module/Admin/Site.php:327
+#: ../../Zotlabs/Module/Admin/Site.php:334
msgid "Enable context help"
msgstr "Permettre l'aide contextuelle"
-#: ../../Zotlabs/Module/Admin/Site.php:327
+#: ../../Zotlabs/Module/Admin/Site.php:334
msgid ""
"Display contextual help for the current page when the help button is "
"pressed."
msgstr "Afficher l'aide contextuel en cliquant sur le bouton aide."
-#: ../../Zotlabs/Module/Admin/Site.php:329
+#: ../../Zotlabs/Module/Admin/Site.php:336
msgid "Reply-to email address for system generated email."
msgstr "Adresse courriel de retour pour les courriels générés par l'application."
-#: ../../Zotlabs/Module/Admin/Site.php:330
+#: ../../Zotlabs/Module/Admin/Site.php:337
msgid "Sender (From) email address for system generated email."
msgstr "Adresse courriel de l'expéditeur (champ \"De\") pour les courriels générés par l'application."
-#: ../../Zotlabs/Module/Admin/Site.php:331
+#: ../../Zotlabs/Module/Admin/Site.php:338
msgid "Name of email sender for system generated email."
msgstr "Nom ou courriel de l'expéditeur pour les courriels générés par l'application."
-#: ../../Zotlabs/Module/Admin/Site.php:333
+#: ../../Zotlabs/Module/Admin/Site.php:340
msgid "Directory Server URL"
msgstr "URL du serveur d'annuaire"
-#: ../../Zotlabs/Module/Admin/Site.php:333
+#: ../../Zotlabs/Module/Admin/Site.php:340
msgid "Default directory server"
msgstr "Serveur d'annuaire par défaut"
-#: ../../Zotlabs/Module/Admin/Site.php:335
+#: ../../Zotlabs/Module/Admin/Site.php:342
msgid "Proxy user"
msgstr "Utilisateur du proxy"
-#: ../../Zotlabs/Module/Admin/Site.php:336
+#: ../../Zotlabs/Module/Admin/Site.php:343
msgid "Proxy URL"
msgstr "URL du proxy"
-#: ../../Zotlabs/Module/Admin/Site.php:337
+#: ../../Zotlabs/Module/Admin/Site.php:344
msgid "Network timeout"
msgstr "Délai maximal du réseau"
-#: ../../Zotlabs/Module/Admin/Site.php:337
+#: ../../Zotlabs/Module/Admin/Site.php:344
msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
msgstr "En secondes. Mettre à 0 pour ne pas avoir de délai maximal (non recommandé)."
-#: ../../Zotlabs/Module/Admin/Site.php:338
+#: ../../Zotlabs/Module/Admin/Site.php:345
msgid "Delivery interval"
msgstr "Intervalle de distribution"
-#: ../../Zotlabs/Module/Admin/Site.php:338
+#: ../../Zotlabs/Module/Admin/Site.php:345
msgid ""
"Delay background delivery processes by this many seconds to reduce system "
"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
"for large dedicated servers."
msgstr "Temporise le processus de distribution de tant de secondes pour réduire la charge sur le système. Valeurs recommandées&nbsp;: 4-5 pour les serveurs mutualisés, 2-3 pour les VPS. 0-1 pour les gros serveurs dédiés."
-#: ../../Zotlabs/Module/Admin/Site.php:339
+#: ../../Zotlabs/Module/Admin/Site.php:346
msgid "Deliveries per process"
msgstr "Distributions par processus"
-#: ../../Zotlabs/Module/Admin/Site.php:339
+#: ../../Zotlabs/Module/Admin/Site.php:346
msgid ""
"Number of deliveries to attempt in a single operating system process. Adjust"
" if necessary to tune system performance. Recommend: 1-5."
msgstr "Nombre de distributions à tenter au sein d'un seul processus système. Ajuster si nécessaire pour affiner la performance du système. Recommandé&nbsp;:1-5."
-#: ../../Zotlabs/Module/Admin/Site.php:340
+#: ../../Zotlabs/Module/Admin/Site.php:347
msgid "Queue Threshold"
msgstr "Seuil de file d'attente"
-#: ../../Zotlabs/Module/Admin/Site.php:340
+#: ../../Zotlabs/Module/Admin/Site.php:347
msgid ""
"Always defer immediate delivery if queue contains more than this number of "
"entries."
msgstr "Reportez toujours la livraison immédiate si la file d'attente contient plus que ce nombre d'entrées."
-#: ../../Zotlabs/Module/Admin/Site.php:341
+#: ../../Zotlabs/Module/Admin/Site.php:348
msgid "Poll interval"
msgstr "Intervalle de scrutation"
-#: ../../Zotlabs/Module/Admin/Site.php:341
+#: ../../Zotlabs/Module/Admin/Site.php:348
msgid ""
"Delay background polling processes by this many seconds to reduce system "
"load. If 0, use delivery interval."
msgstr "Temporise le processus de scrutation en tâche de fond de tant de secondes, pour réduire la charge. Si 0, utilise l'intervalle de distribution."
-#: ../../Zotlabs/Module/Admin/Site.php:342
+#: ../../Zotlabs/Module/Admin/Site.php:349
msgid "Path to ImageMagick convert program"
msgstr "Chemin d'accès au programme \"convert\" de ImageMagick"
-#: ../../Zotlabs/Module/Admin/Site.php:342
+#: ../../Zotlabs/Module/Admin/Site.php:349
msgid ""
"If set, use this program to generate photo thumbnails for huge images ( > "
"4000 pixels in either dimension), otherwise memory exhaustion may occur. "
"Example: /usr/bin/convert"
msgstr "Si cette option est activée, utilisez ce programme pour générer des vignettes de photos pour des images géantes ( > 4000 pixels dans l'une ou l'autre dimension), sinon la mémoire risque de s'épuiser. Exemple : /usr/bin/convert"
-#: ../../Zotlabs/Module/Admin/Site.php:343
+#: ../../Zotlabs/Module/Admin/Site.php:350
msgid "Allow SVG thumbnails in file browser"
msgstr "Autoriser les vignettes SVG dans le navigateur de fichiers"
-#: ../../Zotlabs/Module/Admin/Site.php:343
+#: ../../Zotlabs/Module/Admin/Site.php:350
msgid "WARNING: SVG images may contain malicious code."
msgstr "ATTENTION : les images SVG peuvent contenir du code malveillant."
-#: ../../Zotlabs/Module/Admin/Site.php:344
+#: ../../Zotlabs/Module/Admin/Site.php:351
msgid "Maximum Load Average"
msgstr "Charge maximale moyenne"
-#: ../../Zotlabs/Module/Admin/Site.php:344
+#: ../../Zotlabs/Module/Admin/Site.php:351
msgid ""
"Maximum system load before delivery and poll processes are deferred - "
"default 50."
msgstr "Charge système maximale au-delà de laquelle distribution et scrutation sont reportées - par défaut 50."
-#: ../../Zotlabs/Module/Admin/Site.php:345
+#: ../../Zotlabs/Module/Admin/Site.php:352
msgid "Expiration period in days for imported (grid/network) content"
msgstr "Délai d'expiration pour le contenu importé (réseau)"
-#: ../../Zotlabs/Module/Admin/Site.php:345
+#: ../../Zotlabs/Module/Admin/Site.php:352
msgid "0 for no expiration of imported content"
msgstr "0 pour ne pas expirer le contenu importé"
-#: ../../Zotlabs/Module/Admin/Site.php:347
+#: ../../Zotlabs/Module/Admin/Site.php:353
+msgid ""
+"Do not expire any posts which have comments less than this many days ago"
+msgstr "Ne pas considérer comme expirés les messages qui ont reçu des commentaires depuis moins de ce nombre de jours"
+
+#: ../../Zotlabs/Module/Admin/Site.php:355
msgid ""
"Public servers: Optional landing (marketing) webpage for new registrants"
msgstr "Serveurs publics : page Web facultative d'atterrissage (marketing) pour les nouveaux inscrits."
-#: ../../Zotlabs/Module/Admin/Site.php:347
+#: ../../Zotlabs/Module/Admin/Site.php:355
#, php-format
msgid "Create this page first. Default is %s/register"
msgstr "Créez d'abord cette page. La valeur par défaut est %s /register"
-#: ../../Zotlabs/Module/Admin/Site.php:348
+#: ../../Zotlabs/Module/Admin/Site.php:356
msgid "Page to display after creating a new channel"
msgstr "Page à afficher après la création d'un nouveau canal"
-#: ../../Zotlabs/Module/Admin/Site.php:348
+#: ../../Zotlabs/Module/Admin/Site.php:356
msgid "Recommend: profiles, go, or settings"
msgstr "Recommander : profils, go, ou paramètres"
-#: ../../Zotlabs/Module/Admin/Site.php:350
+#: ../../Zotlabs/Module/Admin/Site.php:358
msgid "Optional: site location"
msgstr "Option : emplacement du site"
-#: ../../Zotlabs/Module/Admin/Site.php:350
+#: ../../Zotlabs/Module/Admin/Site.php:358
msgid "Region or country"
msgstr "Région ou pays"
-#: ../../Zotlabs/Module/Admin/Profs.php:69
+#: ../../Zotlabs/Module/Admin/Profs.php:89
msgid "New Profile Field"
msgstr "Nouveau champ de profil"
-#: ../../Zotlabs/Module/Admin/Profs.php:70
#: ../../Zotlabs/Module/Admin/Profs.php:90
+#: ../../Zotlabs/Module/Admin/Profs.php:110
msgid "Field nickname"
msgstr "Nom court du champ"
-#: ../../Zotlabs/Module/Admin/Profs.php:70
#: ../../Zotlabs/Module/Admin/Profs.php:90
+#: ../../Zotlabs/Module/Admin/Profs.php:110
msgid "System name of field"
msgstr "Nom système du champ"
-#: ../../Zotlabs/Module/Admin/Profs.php:71
#: ../../Zotlabs/Module/Admin/Profs.php:91
+#: ../../Zotlabs/Module/Admin/Profs.php:111
msgid "Input type"
msgstr "Type de champ"
-#: ../../Zotlabs/Module/Admin/Profs.php:72
#: ../../Zotlabs/Module/Admin/Profs.php:92
+#: ../../Zotlabs/Module/Admin/Profs.php:112
msgid "Field Name"
msgstr "Nom du champ"
-#: ../../Zotlabs/Module/Admin/Profs.php:72
#: ../../Zotlabs/Module/Admin/Profs.php:92
+#: ../../Zotlabs/Module/Admin/Profs.php:112
msgid "Label on profile pages"
msgstr "Étiquette sur les pages de profil"
-#: ../../Zotlabs/Module/Admin/Profs.php:73
#: ../../Zotlabs/Module/Admin/Profs.php:93
+#: ../../Zotlabs/Module/Admin/Profs.php:113
msgid "Help text"
msgstr "Aide à la saisie"
-#: ../../Zotlabs/Module/Admin/Profs.php:73
#: ../../Zotlabs/Module/Admin/Profs.php:93
+#: ../../Zotlabs/Module/Admin/Profs.php:113
msgid "Additional info (optional)"
msgstr "Informations additionnelles (facultatif)"
-#: ../../Zotlabs/Module/Admin/Profs.php:74
-#: ../../Zotlabs/Module/Admin/Profs.php:94 ../../Zotlabs/Module/Rbmark.php:32
+#: ../../Zotlabs/Module/Admin/Profs.php:94
+#: ../../Zotlabs/Module/Admin/Profs.php:114 ../../Zotlabs/Module/Rbmark.php:32
#: ../../Zotlabs/Module/Rbmark.php:104 ../../Zotlabs/Module/Filer.php:53
#: ../../Zotlabs/Widget/Notes.php:18 ../../include/text.php:1052
#: ../../include/text.php:1064
msgid "Save"
msgstr "Enregistrer"
-#: ../../Zotlabs/Module/Admin/Profs.php:83
+#: ../../Zotlabs/Module/Admin/Profs.php:103
msgid "Field definition not found"
msgstr "Définition du champ introuvable"
-#: ../../Zotlabs/Module/Admin/Profs.php:89
+#: ../../Zotlabs/Module/Admin/Profs.php:109
msgid "Edit Profile Field"
msgstr "Modifier le champ de profil"
-#: ../../Zotlabs/Module/Admin/Profs.php:147 ../../Zotlabs/Widget/Admin.php:30
+#: ../../Zotlabs/Module/Admin/Profs.php:168 ../../Zotlabs/Widget/Admin.php:30
msgid "Profile Fields"
msgstr "Champs de profil"
-#: ../../Zotlabs/Module/Admin/Profs.php:148
+#: ../../Zotlabs/Module/Admin/Profs.php:169
msgid "Basic Profile Fields"
msgstr "Champs de profil de base"
-#: ../../Zotlabs/Module/Admin/Profs.php:149
+#: ../../Zotlabs/Module/Admin/Profs.php:170
msgid "Advanced Profile Fields"
msgstr "Champs de profil avancés"
-#: ../../Zotlabs/Module/Admin/Profs.php:149
+#: ../../Zotlabs/Module/Admin/Profs.php:170
msgid "(In addition to basic fields)"
msgstr "(en plus des champs de base)"
-#: ../../Zotlabs/Module/Admin/Profs.php:151
+#: ../../Zotlabs/Module/Admin/Profs.php:172
msgid "All available fields"
msgstr "Tous les champs disponibles"
-#: ../../Zotlabs/Module/Admin/Profs.php:152
+#: ../../Zotlabs/Module/Admin/Profs.php:173
msgid "Custom Fields"
msgstr "Champs personnalisés"
-#: ../../Zotlabs/Module/Admin/Profs.php:156
+#: ../../Zotlabs/Module/Admin/Profs.php:177
msgid "Create Custom Field"
msgstr "Créer un champ personnalisé"
@@ -3364,11 +3365,11 @@ msgctxt "acl"
msgid "Profile"
msgstr "Profil"
-#: ../../Zotlabs/Module/Moderate.php:55
+#: ../../Zotlabs/Module/Moderate.php:62
msgid "Comment approved"
msgstr "Commentaire validé"
-#: ../../Zotlabs/Module/Moderate.php:59
+#: ../../Zotlabs/Module/Moderate.php:66
msgid "Comment deleted"
msgstr "Commentaire supprimé"
@@ -3429,7 +3430,7 @@ msgstr "Certains droits d'accès peuvent être hérités de vos <a href=\"settin
msgid "Friends"
msgstr "Amis"
-#: ../../Zotlabs/Module/Settings/Channel.php:262
+#: ../../Zotlabs/Module/Settings/Channel.php:264
#: ../../Zotlabs/Module/Defperms.php:103
#: ../../addon/rendezvous/rendezvous.php:82
#: ../../addon/openstreetmap/openstreetmap.php:184
@@ -3439,409 +3440,424 @@ msgstr "Amis"
msgid "Settings updated."
msgstr "Paramètres mis à jour."
-#: ../../Zotlabs/Module/Settings/Channel.php:323
+#: ../../Zotlabs/Module/Settings/Channel.php:325
msgid "Nobody except yourself"
msgstr "Personne sauf vous"
-#: ../../Zotlabs/Module/Settings/Channel.php:324
+#: ../../Zotlabs/Module/Settings/Channel.php:326
msgid "Only those you specifically allow"
msgstr "Seulement ceux que vous autorisez spécifiquement"
-#: ../../Zotlabs/Module/Settings/Channel.php:325
+#: ../../Zotlabs/Module/Settings/Channel.php:327
msgid "Approved connections"
msgstr "Contacts validés"
-#: ../../Zotlabs/Module/Settings/Channel.php:326
+#: ../../Zotlabs/Module/Settings/Channel.php:328
msgid "Any connections"
msgstr "Tous les contacts"
-#: ../../Zotlabs/Module/Settings/Channel.php:327
+#: ../../Zotlabs/Module/Settings/Channel.php:329
msgid "Anybody on this website"
msgstr "Tous les utilisateurs du hub"
-#: ../../Zotlabs/Module/Settings/Channel.php:328
+#: ../../Zotlabs/Module/Settings/Channel.php:330
msgid "Anybody in this network"
msgstr "Tous les utilisateurs sur ce réseau"
-#: ../../Zotlabs/Module/Settings/Channel.php:329
+#: ../../Zotlabs/Module/Settings/Channel.php:331
msgid "Anybody authenticated"
msgstr "Tous les utilisateurs authentifiés"
-#: ../../Zotlabs/Module/Settings/Channel.php:330
+#: ../../Zotlabs/Module/Settings/Channel.php:332
msgid "Anybody on the internet"
msgstr "Tous les utilisateurs d'Internet"
-#: ../../Zotlabs/Module/Settings/Channel.php:405
+#: ../../Zotlabs/Module/Settings/Channel.php:407
msgid "Publish your default profile in the network directory"
msgstr "Publier votre profil par défaut dans l'annuaire du réseau"
-#: ../../Zotlabs/Module/Settings/Channel.php:410
+#: ../../Zotlabs/Module/Settings/Channel.php:412
msgid "Allow us to suggest you as a potential friend to new members?"
msgstr "Nous autoriser à vous suggérer comme ami(e) potentiel(le) aux nouveaux membres?"
-#: ../../Zotlabs/Module/Settings/Channel.php:414
+#: ../../Zotlabs/Module/Settings/Channel.php:416
msgid "or"
msgstr "ou"
-#: ../../Zotlabs/Module/Settings/Channel.php:419
+#: ../../Zotlabs/Module/Settings/Channel.php:425
msgid "Your channel address is"
msgstr "L'adresse de votre canal est"
-#: ../../Zotlabs/Module/Settings/Channel.php:422
+#: ../../Zotlabs/Module/Settings/Channel.php:428
msgid "Your files/photos are accessible via WebDAV at"
msgstr "Vos fichiers/photos sont accessibles via WebDAV à"
-#: ../../Zotlabs/Module/Settings/Channel.php:486
+#: ../../Zotlabs/Module/Settings/Channel.php:493
msgid "Channel Settings"
msgstr "Paramètres du canal"
-#: ../../Zotlabs/Module/Settings/Channel.php:493
+#: ../../Zotlabs/Module/Settings/Channel.php:500
msgid "Basic Settings"
msgstr "Paramètres standard"
-#: ../../Zotlabs/Module/Settings/Channel.php:494
-#: ../../include/channel.php:1522
+#: ../../Zotlabs/Module/Settings/Channel.php:501
+#: ../../include/channel.php:1521
msgid "Full Name:"
msgstr "Nom complet&nbsp;:"
-#: ../../Zotlabs/Module/Settings/Channel.php:495
+#: ../../Zotlabs/Module/Settings/Channel.php:502
#: ../../Zotlabs/Module/Settings/Account.php:119
msgid "Email Address:"
msgstr "Adresse de courriel&nbsp;:"
-#: ../../Zotlabs/Module/Settings/Channel.php:496
+#: ../../Zotlabs/Module/Settings/Channel.php:503
msgid "Your Timezone:"
msgstr "Votre fureau horaire&nbsp;:"
-#: ../../Zotlabs/Module/Settings/Channel.php:497
+#: ../../Zotlabs/Module/Settings/Channel.php:504
msgid "Default Post Location:"
msgstr "Emplacement de publication par défaut&nbsp;:"
-#: ../../Zotlabs/Module/Settings/Channel.php:497
+#: ../../Zotlabs/Module/Settings/Channel.php:504
msgid "Geographical location to display on your posts"
msgstr "Emplacement géographique à afficher sur vos publications"
-#: ../../Zotlabs/Module/Settings/Channel.php:498
+#: ../../Zotlabs/Module/Settings/Channel.php:505
msgid "Use Browser Location:"
msgstr "Utiliser la géolocalisation du navigateur&nbsp;:"
-#: ../../Zotlabs/Module/Settings/Channel.php:500
+#: ../../Zotlabs/Module/Settings/Channel.php:507
msgid "Adult Content"
msgstr "Contenu \"adulte\""
-#: ../../Zotlabs/Module/Settings/Channel.php:500
+#: ../../Zotlabs/Module/Settings/Channel.php:507
msgid ""
"This channel frequently or regularly publishes adult content. (Please tag "
"any adult material and/or nudity with #NSFW)"
msgstr "Ce canal publie plus ou moins fréquemment du contenu pour adultes. (Merci d'indiquer tout contenu pour adulte ou potentiellement choquant avec l'étiquette <em>#NSFW</em> - Not Safe For Work)"
-#: ../../Zotlabs/Module/Settings/Channel.php:502
+#: ../../Zotlabs/Module/Settings/Channel.php:509
msgid "Security and Privacy Settings"
msgstr "Paramètres de sécurité et de confidentialité"
-#: ../../Zotlabs/Module/Settings/Channel.php:504
+#: ../../Zotlabs/Module/Settings/Channel.php:511
msgid "Your permissions are already configured. Click to view/adjust"
msgstr "Vous droits d'accès sont déjà paramétrés. Cliquer pour voir/modifier"
-#: ../../Zotlabs/Module/Settings/Channel.php:506
+#: ../../Zotlabs/Module/Settings/Channel.php:513
msgid "Hide my online presence"
msgstr "Cacher ma présence en ligne"
-#: ../../Zotlabs/Module/Settings/Channel.php:506
+#: ../../Zotlabs/Module/Settings/Channel.php:513
msgid "Prevents displaying in your profile that you are online"
msgstr "Cacher votre statut (en ligne/hors ligne) sur votre profil"
-#: ../../Zotlabs/Module/Settings/Channel.php:508
+#: ../../Zotlabs/Module/Settings/Channel.php:515
msgid "Simple Privacy Settings:"
msgstr "Paramètres de confidentialité simplifiés&nbsp;:"
-#: ../../Zotlabs/Module/Settings/Channel.php:509
+#: ../../Zotlabs/Module/Settings/Channel.php:516
msgid ""
"Very Public - <em>extremely permissive (should be used with caution)</em>"
msgstr "Très public - <em>extrèmement permissif (à n'utiliser qu'en connaissance de cause)</em>"
-#: ../../Zotlabs/Module/Settings/Channel.php:510
+#: ../../Zotlabs/Module/Settings/Channel.php:517
msgid ""
"Typical - <em>default public, privacy when desired (similar to social "
"network permissions but with improved privacy)</em>"
msgstr "Classique - <em>public par défaut, privé en cas de besoin (comparable aux droits d'accès type réseau social, avec une confidentialité améliorée)</em>"
-#: ../../Zotlabs/Module/Settings/Channel.php:511
+#: ../../Zotlabs/Module/Settings/Channel.php:518
msgid "Private - <em>default private, never open or public</em>"
msgstr "Privé - <em>privé par défaut, jamais ouvert ni public</em>"
-#: ../../Zotlabs/Module/Settings/Channel.php:512
+#: ../../Zotlabs/Module/Settings/Channel.php:519
msgid "Blocked - <em>default blocked to/from everybody</em>"
msgstr "Bloqué - <em>par défaut, bloqué de/vers tout le monde</em>"
-#: ../../Zotlabs/Module/Settings/Channel.php:514
+#: ../../Zotlabs/Module/Settings/Channel.php:521
msgid "Allow others to tag your posts"
msgstr "Autoriser les autres à \"étiqueter\" vos publications"
-#: ../../Zotlabs/Module/Settings/Channel.php:514
+#: ../../Zotlabs/Module/Settings/Channel.php:521
msgid ""
"Often used by the community to retro-actively flag inappropriate content"
msgstr "Souvent utilisé par la communauté pour identifier un contenu inapproprié a posteriori "
-#: ../../Zotlabs/Module/Settings/Channel.php:516
+#: ../../Zotlabs/Module/Settings/Channel.php:523
msgid "Channel Permission Limits"
msgstr "Limites des droits d'accès du canal"
-#: ../../Zotlabs/Module/Settings/Channel.php:518
+#: ../../Zotlabs/Module/Settings/Channel.php:525
msgid "Expire other channel content after this many days"
msgstr "Faire expirer le contenu des autres canaux après n jours"
-#: ../../Zotlabs/Module/Settings/Channel.php:518
+#: ../../Zotlabs/Module/Settings/Channel.php:525
msgid "0 or blank to use the website limit."
msgstr "0 ou vide pour utiliser la limite du site web"
-#: ../../Zotlabs/Module/Settings/Channel.php:518
+#: ../../Zotlabs/Module/Settings/Channel.php:525
#, php-format
msgid "This website expires after %d days."
msgstr "Ce site web expirera après %d jours."
-#: ../../Zotlabs/Module/Settings/Channel.php:518
+#: ../../Zotlabs/Module/Settings/Channel.php:525
msgid "This website does not expire imported content."
msgstr "Ce site web ne périme pas le contenu importé."
-#: ../../Zotlabs/Module/Settings/Channel.php:518
+#: ../../Zotlabs/Module/Settings/Channel.php:525
msgid "The website limit takes precedence if lower than your limit."
msgstr "La limite du site Web a priorité si elle est inférieure à votre limite."
-#: ../../Zotlabs/Module/Settings/Channel.php:519
+#: ../../Zotlabs/Module/Settings/Channel.php:526
msgid "Maximum Friend Requests/Day:"
msgstr "Nombre maximum de demandes de contact par jour&nbsp;:"
-#: ../../Zotlabs/Module/Settings/Channel.php:519
+#: ../../Zotlabs/Module/Settings/Channel.php:526
msgid "May reduce spam activity"
msgstr "Contribue à réduire l'impact des indésirables"
-#: ../../Zotlabs/Module/Settings/Channel.php:520
+#: ../../Zotlabs/Module/Settings/Channel.php:527
msgid "Default Privacy Group"
msgstr "Groupe de contacts par défaut&nbsp;:"
-#: ../../Zotlabs/Module/Settings/Channel.php:522
+#: ../../Zotlabs/Module/Settings/Channel.php:529
msgid "Use my default audience setting for the type of object published"
msgstr "Utiliser mon paramètre de publication par défaut pour le type d'objet publié"
-#: ../../Zotlabs/Module/Settings/Channel.php:523
+#: ../../Zotlabs/Module/Settings/Channel.php:530
msgid "Profile to assign new connections"
msgstr "Profil pour assigner de nouvelles connexions"
-#: ../../Zotlabs/Module/Settings/Channel.php:532
+#: ../../Zotlabs/Module/Settings/Channel.php:539
msgid "Channel permissions category:"
msgstr "Profils d'accès du canal&nbsp;:"
-#: ../../Zotlabs/Module/Settings/Channel.php:533
+#: ../../Zotlabs/Module/Settings/Channel.php:540
msgid "Default Permissions Group"
msgstr "Groupe d'accès par défaut"
-#: ../../Zotlabs/Module/Settings/Channel.php:539
+#: ../../Zotlabs/Module/Settings/Channel.php:546
msgid "Maximum private messages per day from unknown people:"
msgstr "Nombre maximum de messages privés émanant d'inconnus, par jour&nbsp;:"
-#: ../../Zotlabs/Module/Settings/Channel.php:539
+#: ../../Zotlabs/Module/Settings/Channel.php:546
msgid "Useful to reduce spamming"
msgstr "Utile pour réduire les indésirables"
-#: ../../Zotlabs/Module/Settings/Channel.php:542
+#: ../../Zotlabs/Module/Settings/Channel.php:549
#: ../../Zotlabs/Lib/Enotify.php:68
msgid "Notification Settings"
msgstr "Paramètres de notification"
-#: ../../Zotlabs/Module/Settings/Channel.php:543
+#: ../../Zotlabs/Module/Settings/Channel.php:550
msgid "By default post a status message when:"
msgstr "Par défaut, publier un statut quand&nbsp;:"
-#: ../../Zotlabs/Module/Settings/Channel.php:544
+#: ../../Zotlabs/Module/Settings/Channel.php:551
msgid "accepting a friend request"
msgstr "vous acceptez une demande de contact"
-#: ../../Zotlabs/Module/Settings/Channel.php:545
+#: ../../Zotlabs/Module/Settings/Channel.php:552
msgid "joining a forum/community"
msgstr "vous rejoignez un forum ou une communauté"
-#: ../../Zotlabs/Module/Settings/Channel.php:546
+#: ../../Zotlabs/Module/Settings/Channel.php:553
msgid "making an <em>interesting</em> profile change"
msgstr "vous faîtes une modification <em>intéressante</em> de votre profil"
-#: ../../Zotlabs/Module/Settings/Channel.php:547
+#: ../../Zotlabs/Module/Settings/Channel.php:554
msgid "Send a notification email when:"
msgstr "Envoyer un courriel de notification quand&nbsp;:"
-#: ../../Zotlabs/Module/Settings/Channel.php:548
+#: ../../Zotlabs/Module/Settings/Channel.php:555
msgid "You receive a connection request"
msgstr "Vous recevez une demande de contact"
-#: ../../Zotlabs/Module/Settings/Channel.php:549
+#: ../../Zotlabs/Module/Settings/Channel.php:556
msgid "Your connections are confirmed"
msgstr "Vos contacts sont confirmés"
-#: ../../Zotlabs/Module/Settings/Channel.php:550
+#: ../../Zotlabs/Module/Settings/Channel.php:557
msgid "Someone writes on your profile wall"
msgstr "Quelqu'un a écrit sur votre mur"
-#: ../../Zotlabs/Module/Settings/Channel.php:551
+#: ../../Zotlabs/Module/Settings/Channel.php:558
msgid "Someone writes a followup comment"
msgstr "Quelqu'un a commenté vos publications"
-#: ../../Zotlabs/Module/Settings/Channel.php:552
+#: ../../Zotlabs/Module/Settings/Channel.php:559
msgid "You receive a private message"
msgstr "Vous recevez un message privé"
-#: ../../Zotlabs/Module/Settings/Channel.php:553
+#: ../../Zotlabs/Module/Settings/Channel.php:560
msgid "You receive a friend suggestion"
msgstr "Vous recevez une suggestion d'amitié/contact"
-#: ../../Zotlabs/Module/Settings/Channel.php:554
+#: ../../Zotlabs/Module/Settings/Channel.php:561
msgid "You are tagged in a post"
msgstr "Vous êtes étiqueté dans une publication"
-#: ../../Zotlabs/Module/Settings/Channel.php:555
+#: ../../Zotlabs/Module/Settings/Channel.php:562
msgid "You are poked/prodded/etc. in a post"
msgstr "Vous êtes tapoté/encouragé/etc. dans une publication"
-#: ../../Zotlabs/Module/Settings/Channel.php:557
+#: ../../Zotlabs/Module/Settings/Channel.php:564
msgid "Someone likes your post/comment"
msgstr "Quelqu'un aime votre publication/commentaire"
-#: ../../Zotlabs/Module/Settings/Channel.php:560
+#: ../../Zotlabs/Module/Settings/Channel.php:567
msgid "Show visual notifications including:"
msgstr "Afficher des notifications visuelles y compris&nbsp;:"
-#: ../../Zotlabs/Module/Settings/Channel.php:562
+#: ../../Zotlabs/Module/Settings/Channel.php:569
msgid "Unseen grid activity"
msgstr "Activité du réseau pas encore consultée"
-#: ../../Zotlabs/Module/Settings/Channel.php:563
+#: ../../Zotlabs/Module/Settings/Channel.php:570
msgid "Unseen channel activity"
msgstr "Activité non vue sur le canal"
-#: ../../Zotlabs/Module/Settings/Channel.php:564
+#: ../../Zotlabs/Module/Settings/Channel.php:571
msgid "Unseen private messages"
msgstr "Messages privés non lus"
-#: ../../Zotlabs/Module/Settings/Channel.php:564
-#: ../../Zotlabs/Module/Settings/Channel.php:569
-#: ../../Zotlabs/Module/Settings/Channel.php:570
#: ../../Zotlabs/Module/Settings/Channel.php:571
+#: ../../Zotlabs/Module/Settings/Channel.php:576
+#: ../../Zotlabs/Module/Settings/Channel.php:577
+#: ../../Zotlabs/Module/Settings/Channel.php:578
#: ../../addon/jappixmini/jappixmini.php:343
msgid "Recommended"
msgstr "Recommandé"
-#: ../../Zotlabs/Module/Settings/Channel.php:565
+#: ../../Zotlabs/Module/Settings/Channel.php:572
msgid "Upcoming events"
msgstr "Événements à venir"
-#: ../../Zotlabs/Module/Settings/Channel.php:566
+#: ../../Zotlabs/Module/Settings/Channel.php:573
msgid "Events today"
msgstr "Événements aujourd'hui"
-#: ../../Zotlabs/Module/Settings/Channel.php:567
+#: ../../Zotlabs/Module/Settings/Channel.php:574
msgid "Upcoming birthdays"
msgstr "Anniversaires à venir"
-#: ../../Zotlabs/Module/Settings/Channel.php:567
+#: ../../Zotlabs/Module/Settings/Channel.php:574
msgid "Not available in all themes"
msgstr "Pas disponible dans tous les thèmes"
-#: ../../Zotlabs/Module/Settings/Channel.php:568
+#: ../../Zotlabs/Module/Settings/Channel.php:575
msgid "System (personal) notifications"
msgstr "Notifications système (personnelles)"
-#: ../../Zotlabs/Module/Settings/Channel.php:569
+#: ../../Zotlabs/Module/Settings/Channel.php:576
msgid "System info messages"
msgstr "Messages d'info système"
-#: ../../Zotlabs/Module/Settings/Channel.php:570
+#: ../../Zotlabs/Module/Settings/Channel.php:577
msgid "System critical alerts"
msgstr "Alertes critiques système"
-#: ../../Zotlabs/Module/Settings/Channel.php:571
+#: ../../Zotlabs/Module/Settings/Channel.php:578
msgid "New connections"
msgstr "Nouveaux contacts"
-#: ../../Zotlabs/Module/Settings/Channel.php:572
+#: ../../Zotlabs/Module/Settings/Channel.php:579
msgid "System Registrations"
msgstr "Inscriptions système"
-#: ../../Zotlabs/Module/Settings/Channel.php:573
+#: ../../Zotlabs/Module/Settings/Channel.php:580
msgid "Unseen shared files"
msgstr "Fichiers partagés non vus"
-#: ../../Zotlabs/Module/Settings/Channel.php:574
+#: ../../Zotlabs/Module/Settings/Channel.php:581
msgid "Unseen public activity"
msgstr "Activité publique non vue"
-#: ../../Zotlabs/Module/Settings/Channel.php:575
+#: ../../Zotlabs/Module/Settings/Channel.php:582
+msgid "Unseen likes and dislikes"
+msgstr "Aime et n'aime pas non consultés"
+
+#: ../../Zotlabs/Module/Settings/Channel.php:583
msgid "Email notification hub (hostname)"
msgstr "Concentrateur de notification par courriel (nom d'hôte)"
-#: ../../Zotlabs/Module/Settings/Channel.php:575
+#: ../../Zotlabs/Module/Settings/Channel.php:583
#, php-format
msgid ""
"If your channel is mirrored to multiple hubs, set this to your preferred "
"location. This will prevent duplicate email notifications. Example: %s"
msgstr "Si votre canal est dupliqué sur plusieurs hubs, définissez cet emplacement comme votre emplacement préféré. Cela empêchera les notifications par courriel en double. Exemple : %s"
-#: ../../Zotlabs/Module/Settings/Channel.php:576
-msgid ""
-"Also show new wall posts, private messages and connections under Notices"
-msgstr "Afficher également les nouvelles publications sur le mur, les messages privés et les contacts dans Notifications"
+#: ../../Zotlabs/Module/Settings/Channel.php:584
+msgid "Show new wall posts, private messages and connections under Notices"
+msgstr "Montrer les nouveaux envois, messages privés et les nouvelles connexions dans Notifications"
-#: ../../Zotlabs/Module/Settings/Channel.php:578
+#: ../../Zotlabs/Module/Settings/Channel.php:586
msgid "Notify me of events this many days in advance"
msgstr "Me prévenir d’événements à venir tant de jours en avance"
-#: ../../Zotlabs/Module/Settings/Channel.php:578
+#: ../../Zotlabs/Module/Settings/Channel.php:586
msgid "Must be greater than 0"
msgstr "Doit être supérieur à 0"
-#: ../../Zotlabs/Module/Settings/Channel.php:584
+#: ../../Zotlabs/Module/Settings/Channel.php:592
msgid "Advanced Account/Page Type Settings"
msgstr "Paramètres avancés de compte/type de page"
-#: ../../Zotlabs/Module/Settings/Channel.php:585
+#: ../../Zotlabs/Module/Settings/Channel.php:593
msgid "Change the behaviour of this account for special situations"
msgstr "Modifie le comportement de ce compte pour des situations particulières"
-#: ../../Zotlabs/Module/Settings/Channel.php:587
+#: ../../Zotlabs/Module/Settings/Channel.php:595
msgid "Miscellaneous Settings"
msgstr "Paramètres divers"
-#: ../../Zotlabs/Module/Settings/Channel.php:588
+#: ../../Zotlabs/Module/Settings/Channel.php:596
msgid "Default photo upload folder"
msgstr "Répertoire par défaut pour les photos téléversées"
-#: ../../Zotlabs/Module/Settings/Channel.php:588
-#: ../../Zotlabs/Module/Settings/Channel.php:589
+#: ../../Zotlabs/Module/Settings/Channel.php:596
+#: ../../Zotlabs/Module/Settings/Channel.php:597
msgid "%Y - current year, %m - current month"
msgstr "%Y - année en cours, %m - mois en cours"
-#: ../../Zotlabs/Module/Settings/Channel.php:589
+#: ../../Zotlabs/Module/Settings/Channel.php:597
msgid "Default file upload folder"
msgstr "Répertoire par défaut pour les fichiers téléversés"
-#: ../../Zotlabs/Module/Settings/Channel.php:591
+#: ../../Zotlabs/Module/Settings/Channel.php:599
msgid "Personal menu to display in your channel pages"
msgstr "Menu personnel à afficher sur les pages de votre canal"
-#: ../../Zotlabs/Module/Settings/Channel.php:593
+#: ../../Zotlabs/Module/Settings/Channel.php:601
msgid "Remove this channel."
msgstr "Supprimer ce canal"
-#: ../../Zotlabs/Module/Settings/Channel.php:594
+#: ../../Zotlabs/Module/Settings/Channel.php:602
msgid "Firefox Share $Projectname provider"
msgstr "Connecteur $Projectname pour Firefox Share"
-#: ../../Zotlabs/Module/Settings/Channel.php:595
+#: ../../Zotlabs/Module/Settings/Channel.php:603
msgid "Start calendar week on Monday"
msgstr "Commencer la semaine du calendrier le lundi"
-#: ../../Zotlabs/Module/Settings/Features.php:45
+#: ../../Zotlabs/Module/Settings/Features.php:73
msgid "Additional Features"
msgstr "Fonctionnalités additionnelles"
+#: ../../Zotlabs/Module/Settings/Features.php:74
+#: ../../Zotlabs/Module/Settings/Account.php:116
+msgid "Your technical skill level"
+msgstr "Votre niveau technique"
+
+#: ../../Zotlabs/Module/Settings/Features.php:74
+#: ../../Zotlabs/Module/Settings/Account.php:116
+msgid ""
+"Used to provide a member experience and additional features consistent with "
+"your comfort level"
+msgstr "Utilisé pour offrir une expérience de membre et des fonctions supplémentaires compatibles avec votre niveau de confort."
+
#: ../../Zotlabs/Module/Settings/Tokens.php:31
#, php-format
msgid "This channel is limited to %d tokens"
@@ -3870,7 +3886,7 @@ msgid ""
msgstr "Vous pouvez également fournir des liens d'accès, style <em>dropbox</em>, aux amis et aux associés en ajoutant le mot de passe de connexion à l'URL d'un site spécifique, comme indiqué. Exemples:"
#: ../../Zotlabs/Module/Settings/Tokens.php:150
-#: ../../Zotlabs/Widget/Settings_menu.php:92
+#: ../../Zotlabs/Widget/Settings_menu.php:100
msgid "Guest Access Tokens"
msgstr "Jeton d'accès pour un invité"
@@ -3891,6 +3907,98 @@ msgstr "Date d'expiration sous la forme année mois jour (AAAA-MM-JJ)"
msgid "Their Settings"
msgstr "Leurs paramètres"
+#: ../../Zotlabs/Module/Settings/Oauth2.php:35
+msgid "Name and Secret are required"
+msgstr "Un nom et un secret sont requis"
+
+#: ../../Zotlabs/Module/Settings/Oauth2.php:83
+msgid "Add OAuth2 application"
+msgstr "Ajouter une application OAuth2"
+
+#: ../../Zotlabs/Module/Settings/Oauth2.php:86
+#: ../../Zotlabs/Module/Settings/Oauth2.php:114
+#: ../../Zotlabs/Module/Settings/Oauth.php:90
+msgid "Name of application"
+msgstr "Nom de l'application"
+
+#: ../../Zotlabs/Module/Settings/Oauth2.php:87
+#: ../../Zotlabs/Module/Settings/Oauth2.php:115
+#: ../../Zotlabs/Module/Settings/Oauth.php:92
+#: ../../Zotlabs/Module/Settings/Oauth.php:118
+#: ../../addon/statusnet/statusnet.php:893 ../../addon/twitter/twitter.php:782
+msgid "Consumer Secret"
+msgstr "Secret client"
+
+#: ../../Zotlabs/Module/Settings/Oauth2.php:87
+#: ../../Zotlabs/Module/Settings/Oauth2.php:115
+#: ../../Zotlabs/Module/Settings/Oauth.php:91
+#: ../../Zotlabs/Module/Settings/Oauth.php:92
+msgid "Automatically generated - change if desired. Max length 20"
+msgstr "Généré automatiquement - à changer si besoin. Longueur maximale 20 caractères."
+
+#: ../../Zotlabs/Module/Settings/Oauth2.php:88
+#: ../../Zotlabs/Module/Settings/Oauth2.php:116
+#: ../../Zotlabs/Module/Settings/Oauth.php:93
+#: ../../Zotlabs/Module/Settings/Oauth.php:119
+msgid "Redirect"
+msgstr "Redirection"
+
+#: ../../Zotlabs/Module/Settings/Oauth2.php:88
+#: ../../Zotlabs/Module/Settings/Oauth2.php:116
+#: ../../Zotlabs/Module/Settings/Oauth.php:93
+msgid ""
+"Redirect URI - leave blank unless your application specifically requires "
+"this"
+msgstr "URI de redirection - laissez vide, sauf si votre application le requiert spécifiquement"
+
+#: ../../Zotlabs/Module/Settings/Oauth2.php:89
+#: ../../Zotlabs/Module/Settings/Oauth2.php:117
+msgid "Grant Types"
+msgstr "Types de bourses"
+
+#: ../../Zotlabs/Module/Settings/Oauth2.php:89
+#: ../../Zotlabs/Module/Settings/Oauth2.php:90
+#: ../../Zotlabs/Module/Settings/Oauth2.php:117
+#: ../../Zotlabs/Module/Settings/Oauth2.php:118
+msgid "leave blank unless your application sepcifically requires this"
+msgstr "Laisser vide, sauf si votre application le requiert spécifiquement"
+
+#: ../../Zotlabs/Module/Settings/Oauth2.php:90
+#: ../../Zotlabs/Module/Settings/Oauth2.php:118
+msgid "Authorization scope"
+msgstr "Portée de l'autorisation"
+
+#: ../../Zotlabs/Module/Settings/Oauth2.php:102
+msgid "OAuth2 Application not found."
+msgstr "Application OAuth2 introuvable"
+
+#: ../../Zotlabs/Module/Settings/Oauth2.php:111
+#: ../../Zotlabs/Module/Settings/Oauth2.php:148
+#: ../../Zotlabs/Module/Settings/Oauth.php:87
+#: ../../Zotlabs/Module/Settings/Oauth.php:113
+#: ../../Zotlabs/Module/Settings/Oauth.php:149
+msgid "Add application"
+msgstr "Ajouter une application"
+
+#: ../../Zotlabs/Module/Settings/Oauth2.php:147
+msgid "Connected OAuth2 Apps"
+msgstr "Applications OAuth2 connectées"
+
+#: ../../Zotlabs/Module/Settings/Oauth2.php:151
+#: ../../Zotlabs/Module/Settings/Oauth.php:152
+msgid "Client key starts with"
+msgstr "La clef partagée commence par"
+
+#: ../../Zotlabs/Module/Settings/Oauth2.php:152
+#: ../../Zotlabs/Module/Settings/Oauth.php:153
+msgid "No name"
+msgstr "Sans nom"
+
+#: ../../Zotlabs/Module/Settings/Oauth2.php:153
+#: ../../Zotlabs/Module/Settings/Oauth.php:154
+msgid "Remove authorization"
+msgstr "Révoquer l'autorisation"
+
#: ../../Zotlabs/Module/Settings/Account.php:20
msgid "Not valid email."
msgstr "Adresse de courriel non valide."
@@ -3947,16 +4055,6 @@ msgstr "Confirmez le nouveau mot de passe"
msgid "Leave password fields blank unless changing"
msgstr "Laissez les mots de passe vides si vous ne voulez pas les modifier"
-#: ../../Zotlabs/Module/Settings/Account.php:116
-msgid "Your technical skill level"
-msgstr "Votre niveau technique"
-
-#: ../../Zotlabs/Module/Settings/Account.php:116
-msgid ""
-"Used to provide a member experience and additional features consistent with "
-"your comfort level"
-msgstr "Utilisé pour offrir une expérience de membre et des fonctions supplémentaires compatibles avec votre niveau de confort."
-
#: ../../Zotlabs/Module/Settings/Account.php:120
#: ../../Zotlabs/Module/Removeaccount.php:61
msgid "Remove Account"
@@ -3994,11 +4092,11 @@ msgstr "0-99 par défaut 0"
msgid "Affinity Slider Settings"
msgstr "Paramètres de la réglette d'affinité"
-#: ../../Zotlabs/Module/Settings/Featured.php:64
+#: ../../Zotlabs/Module/Settings/Featured.php:67
msgid "Addon Settings"
msgstr "Paramètres du greffon"
-#: ../../Zotlabs/Module/Settings/Featured.php:65
+#: ../../Zotlabs/Module/Settings/Featured.php:68
msgid "Please save/submit changes to any panel before opening another."
msgstr "Veuillez enregistrer/soumettre les changements à n'importe quel panneau avant d'en ouvrir un autre."
@@ -4115,82 +4213,38 @@ msgstr "cliquer pour dérouler le contenu dépassant cette limite"
msgid "Grid page max height of content (in pixels)"
msgstr "Hauteur maximale du contenu sur la page du réseau (en pixels)"
-#: ../../Zotlabs/Module/Settings/Oauth.php:34
+#: ../../Zotlabs/Module/Settings/Oauth.php:35
msgid "Name is required"
msgstr "Le nom est requis"
-#: ../../Zotlabs/Module/Settings/Oauth.php:38
+#: ../../Zotlabs/Module/Settings/Oauth.php:39
msgid "Key and Secret are required"
msgstr "Clef et secret sont requis"
-#: ../../Zotlabs/Module/Settings/Oauth.php:86
-#: ../../Zotlabs/Module/Settings/Oauth.php:112
-#: ../../Zotlabs/Module/Settings/Oauth.php:148
-msgid "Add application"
-msgstr "Ajouter une application"
-
-#: ../../Zotlabs/Module/Settings/Oauth.php:89
-msgid "Name of application"
-msgstr "Nom de l'application"
-
-#: ../../Zotlabs/Module/Settings/Oauth.php:90
-#: ../../Zotlabs/Module/Settings/Oauth.php:116
+#: ../../Zotlabs/Module/Settings/Oauth.php:91
+#: ../../Zotlabs/Module/Settings/Oauth.php:117
#: ../../addon/statusnet/statusnet.php:894 ../../addon/twitter/twitter.php:781
msgid "Consumer Key"
msgstr "Clef client"
-#: ../../Zotlabs/Module/Settings/Oauth.php:90
-#: ../../Zotlabs/Module/Settings/Oauth.php:91
-msgid "Automatically generated - change if desired. Max length 20"
-msgstr "Généré automatiquement - à changer si besoin. Longueur maximale 20 caractères."
-
-#: ../../Zotlabs/Module/Settings/Oauth.php:91
-#: ../../Zotlabs/Module/Settings/Oauth.php:117
-#: ../../addon/statusnet/statusnet.php:893 ../../addon/twitter/twitter.php:782
-msgid "Consumer Secret"
-msgstr "Secret client"
-
-#: ../../Zotlabs/Module/Settings/Oauth.php:92
-#: ../../Zotlabs/Module/Settings/Oauth.php:118
-msgid "Redirect"
-msgstr "Redirection"
-
-#: ../../Zotlabs/Module/Settings/Oauth.php:92
-msgid ""
-"Redirect URI - leave blank unless your application specifically requires "
-"this"
-msgstr "URI de redirection - laissez vide, sauf si votre application le requiert spécifiquement"
-
-#: ../../Zotlabs/Module/Settings/Oauth.php:93
-#: ../../Zotlabs/Module/Settings/Oauth.php:119
+#: ../../Zotlabs/Module/Settings/Oauth.php:94
+#: ../../Zotlabs/Module/Settings/Oauth.php:120
msgid "Icon url"
msgstr "URL de l'icône"
-#: ../../Zotlabs/Module/Settings/Oauth.php:93
+#: ../../Zotlabs/Module/Settings/Oauth.php:94
#: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:147
msgid "Optional"
msgstr "Facultatif"
-#: ../../Zotlabs/Module/Settings/Oauth.php:104
+#: ../../Zotlabs/Module/Settings/Oauth.php:105
msgid "Application not found."
msgstr "Application introuvable."
-#: ../../Zotlabs/Module/Settings/Oauth.php:147
+#: ../../Zotlabs/Module/Settings/Oauth.php:148
msgid "Connected Apps"
msgstr "Applications connectées"
-#: ../../Zotlabs/Module/Settings/Oauth.php:151
-msgid "Client key starts with"
-msgstr "La clef partagée commence par"
-
-#: ../../Zotlabs/Module/Settings/Oauth.php:152
-msgid "No name"
-msgstr "Sans nom"
-
-#: ../../Zotlabs/Module/Settings/Oauth.php:153
-msgid "Remove authorization"
-msgstr "Révoquer l'autorisation"
-
#: ../../Zotlabs/Module/Embedphotos.php:140
#: ../../Zotlabs/Module/Photos.php:811 ../../Zotlabs/Module/Photos.php:1350
#: ../../Zotlabs/Widget/Portfolio.php:87 ../../Zotlabs/Widget/Album.php:78
@@ -4204,13 +4258,12 @@ msgid "Edit Album"
msgstr "Modifier l'album"
#: ../../Zotlabs/Module/Embedphotos.php:158
-#: ../../Zotlabs/Module/Photos.php:712 ../../Zotlabs/Module/Photos.php:844
-#: ../../Zotlabs/Module/Photos.php:1381
+#: ../../Zotlabs/Module/Photos.php:712
#: ../../Zotlabs/Module/Profile_photo.php:458
#: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Storage/Browser.php:277 ../../Zotlabs/Storage/Browser.php:384
-#: ../../Zotlabs/Widget/Cdav.php:133 ../../Zotlabs/Widget/Cdav.php:169
-#: ../../Zotlabs/Widget/Portfolio.php:110 ../../Zotlabs/Widget/Album.php:97
+#: ../../Zotlabs/Storage/Browser.php:384 ../../Zotlabs/Widget/Cdav.php:133
+#: ../../Zotlabs/Widget/Cdav.php:169 ../../Zotlabs/Widget/Portfolio.php:110
+#: ../../Zotlabs/Widget/Album.php:97
msgid "Upload"
msgstr "Envoyer"
@@ -4218,60 +4271,60 @@ msgstr "Envoyer"
msgid "Some blurb about what to do when you're new here"
msgstr "Quelques mots sur quoi faire quand on est nouveau ici"
-#: ../../Zotlabs/Module/Thing.php:115
+#: ../../Zotlabs/Module/Thing.php:120
msgid "Thing updated"
msgstr "Elément mis à jour"
-#: ../../Zotlabs/Module/Thing.php:167
+#: ../../Zotlabs/Module/Thing.php:172
msgid "Object store: failed"
msgstr "Stockage de l'objet&nbsp;: échec"
-#: ../../Zotlabs/Module/Thing.php:171
+#: ../../Zotlabs/Module/Thing.php:176
msgid "Thing added"
msgstr "Elément ajouté"
-#: ../../Zotlabs/Module/Thing.php:197
+#: ../../Zotlabs/Module/Thing.php:202
#, php-format
msgid "OBJ: %1$s %2$s %3$s"
msgstr "OBJ: %1$s %2$s %3$s"
-#: ../../Zotlabs/Module/Thing.php:260
+#: ../../Zotlabs/Module/Thing.php:265
msgid "Show Thing"
msgstr "Montrer élément"
-#: ../../Zotlabs/Module/Thing.php:267
+#: ../../Zotlabs/Module/Thing.php:272
msgid "item not found."
msgstr "élément introuvable."
-#: ../../Zotlabs/Module/Thing.php:300
+#: ../../Zotlabs/Module/Thing.php:305
msgid "Edit Thing"
msgstr "Modifier élément"
-#: ../../Zotlabs/Module/Thing.php:302 ../../Zotlabs/Module/Thing.php:359
+#: ../../Zotlabs/Module/Thing.php:307 ../../Zotlabs/Module/Thing.php:364
msgid "Select a profile"
msgstr "Choisissez un profil"
-#: ../../Zotlabs/Module/Thing.php:306 ../../Zotlabs/Module/Thing.php:362
+#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:367
msgid "Post an activity"
msgstr "Publier une activité"
-#: ../../Zotlabs/Module/Thing.php:306 ../../Zotlabs/Module/Thing.php:362
+#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:367
msgid "Only sends to viewers of the applicable profile"
msgstr "Envoie exclusivement aux visiteurs du profil concerné"
-#: ../../Zotlabs/Module/Thing.php:308 ../../Zotlabs/Module/Thing.php:364
+#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:369
msgid "Name of thing e.g. something"
msgstr "Nom de l'élément, p.ex. quelque-chose"
-#: ../../Zotlabs/Module/Thing.php:310 ../../Zotlabs/Module/Thing.php:365
+#: ../../Zotlabs/Module/Thing.php:315 ../../Zotlabs/Module/Thing.php:370
msgid "URL of thing (optional)"
msgstr "URL de l'élément (facultatif)"
-#: ../../Zotlabs/Module/Thing.php:312 ../../Zotlabs/Module/Thing.php:366
+#: ../../Zotlabs/Module/Thing.php:317 ../../Zotlabs/Module/Thing.php:371
msgid "URL for photo of thing (optional)"
msgstr "URL d'une photo de l'élément (facultatif)"
-#: ../../Zotlabs/Module/Thing.php:314 ../../Zotlabs/Module/Thing.php:367
+#: ../../Zotlabs/Module/Thing.php:319 ../../Zotlabs/Module/Thing.php:372
#: ../../Zotlabs/Module/Photos.php:702 ../../Zotlabs/Module/Photos.php:1071
#: ../../Zotlabs/Module/Connedit.php:676 ../../Zotlabs/Module/Chat.php:235
#: ../../Zotlabs/Module/Filestorage.php:147
@@ -4279,7 +4332,7 @@ msgstr "URL d'une photo de l'élément (facultatif)"
msgid "Permissions"
msgstr "Droits d'accès"
-#: ../../Zotlabs/Module/Thing.php:357
+#: ../../Zotlabs/Module/Thing.php:362
msgid "Add Thing to your Profile"
msgstr "Ajouter l'élément à votre profil"
@@ -4293,56 +4346,56 @@ msgstr "Pas d'autre notification du système."
msgid "System Notifications"
msgstr "Notifications du système"
-#: ../../Zotlabs/Module/Follow.php:31
-msgid "Channel added."
-msgstr "Canal ajouté."
+#: ../../Zotlabs/Module/Follow.php:36
+msgid "Connection added."
+msgstr "Connexion ajoutée."
-#: ../../Zotlabs/Module/Import.php:143
+#: ../../Zotlabs/Module/Import.php:144
#, php-format
msgid "Your service plan only allows %d channels."
msgstr "Votre forfait n'autorise que %d canaux."
-#: ../../Zotlabs/Module/Import.php:157
+#: ../../Zotlabs/Module/Import.php:158
msgid "No channel. Import failed."
msgstr "Pas de canal. Echec de l'import."
-#: ../../Zotlabs/Module/Import.php:481
+#: ../../Zotlabs/Module/Import.php:482
#: ../../addon/diaspora/import_diaspora.php:139
msgid "Import completed."
msgstr "L'import est terminé."
-#: ../../Zotlabs/Module/Import.php:509
+#: ../../Zotlabs/Module/Import.php:510
msgid "You must be logged in to use this feature."
msgstr "Vous devez vous connecter pour utiliser cette fonctionnalité."
-#: ../../Zotlabs/Module/Import.php:514
+#: ../../Zotlabs/Module/Import.php:515
msgid "Import Channel"
msgstr "Importation de canal"
-#: ../../Zotlabs/Module/Import.php:515
+#: ../../Zotlabs/Module/Import.php:516
msgid ""
"Use this form to import an existing channel from a different server/hub. You"
" may retrieve the channel identity from the old server/hub via the network "
"or provide an export file."
msgstr "Utilisez ce formulaire pour importer un canal existant sur un autre serveur. Vous pouvez récupérer l'identité du canal sur l'ancien serveur directement par le réseau, ou bien fournir un fichier d'export/import."
-#: ../../Zotlabs/Module/Import.php:517
+#: ../../Zotlabs/Module/Import.php:518
msgid "Or provide the old server/hub details"
msgstr "Ou fournissez les détails de l'ancien serveur/hub"
-#: ../../Zotlabs/Module/Import.php:518
+#: ../../Zotlabs/Module/Import.php:519
msgid "Your old identity address (xyz@example.com)"
msgstr "Votre ancienne identité (zyx@exemple.com)"
-#: ../../Zotlabs/Module/Import.php:519
+#: ../../Zotlabs/Module/Import.php:520
msgid "Your old login email address"
msgstr "Votre ancienne adresse de courriel"
-#: ../../Zotlabs/Module/Import.php:520
+#: ../../Zotlabs/Module/Import.php:521
msgid "Your old login password"
msgstr "Votre ancien mot de passe"
-#: ../../Zotlabs/Module/Import.php:521
+#: ../../Zotlabs/Module/Import.php:522
msgid ""
"For either option, please choose whether to make this hub your new primary "
"address, or whether your old location should continue this role. You will be"
@@ -4350,19 +4403,19 @@ msgid ""
"primary location for files, photos, and media."
msgstr "Quelle que soit l'option choisie, merci de décider si ce hub sera votre nouvelle adresse primaire, ou si votre ancien hub continuera à jouer ce rôle. Vous pourrez publier depuis l'emplacement de votre choix, mais une seule peut être déclarée comme stockage primaire de vos fichiers/photos/media."
-#: ../../Zotlabs/Module/Import.php:522
+#: ../../Zotlabs/Module/Import.php:523
msgid "Make this hub my primary location"
msgstr "Faire de ce hub mon emplacement primaire"
-#: ../../Zotlabs/Module/Import.php:523
+#: ../../Zotlabs/Module/Import.php:524
msgid "Move this channel (disable all previous locations)"
msgstr "Déplacer ce canal (désactiver tous les emplacements précédents)"
-#: ../../Zotlabs/Module/Import.php:524
+#: ../../Zotlabs/Module/Import.php:525
msgid "Import a few months of posts if possible (limited by available memory"
msgstr "Importer plusieurs mois de messages si possible (limité par la mémoire disponible)"
-#: ../../Zotlabs/Module/Import.php:525
+#: ../../Zotlabs/Module/Import.php:526
msgid ""
"This process may take several minutes to complete. Please submit the form "
"only once and leave this page open until finished."
@@ -4372,16 +4425,16 @@ msgstr "Ce processus peut prendre plusieurs minutes. Merci de ne valider le form
msgid "Authentication failed."
msgstr "Échec de l'authentification."
-#: ../../Zotlabs/Module/Rmagic.php:75 ../../boot.php:1583
-#: ../../include/channel.php:2307
+#: ../../Zotlabs/Module/Rmagic.php:75 ../../boot.php:1590
+#: ../../include/channel.php:2318
msgid "Remote Authentication"
msgstr "Authentification distante"
-#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:2308
+#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:2319
msgid "Enter your channel address (e.g. channel@example.com)"
msgstr "Entrez l'adresse de votre canal (par ex. moncanal@monsite.com)"
-#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:2309
+#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:2320
msgid "Authenticate"
msgstr "Authentifier"
@@ -4389,7 +4442,7 @@ msgstr "Authentifier"
msgid "Permissions denied."
msgstr "Accès refusés."
-#: ../../Zotlabs/Module/Cal.php:344 ../../include/text.php:2426
+#: ../../Zotlabs/Module/Cal.php:344 ../../include/text.php:2429
msgid "Import"
msgstr "Import"
@@ -4449,149 +4502,163 @@ msgstr "Humeur"
msgid "Set your current mood and tell your friends"
msgstr "Indiquez votre humeur du moment à vos amis"
-#: ../../Zotlabs/Module/Connections.php:54
-#: ../../Zotlabs/Module/Connections.php:156
-#: ../../Zotlabs/Module/Connections.php:245
+#: ../../Zotlabs/Module/Connections.php:55
+#: ../../Zotlabs/Module/Connections.php:112
+#: ../../Zotlabs/Module/Connections.php:256
+msgid "Active"
+msgstr "Active"
+
+#: ../../Zotlabs/Module/Connections.php:60
+#: ../../Zotlabs/Module/Connections.php:164
+#: ../../Zotlabs/Module/Connections.php:261
msgid "Blocked"
msgstr "Bloqué(e)"
-#: ../../Zotlabs/Module/Connections.php:59
-#: ../../Zotlabs/Module/Connections.php:163
-#: ../../Zotlabs/Module/Connections.php:244
+#: ../../Zotlabs/Module/Connections.php:65
+#: ../../Zotlabs/Module/Connections.php:171
+#: ../../Zotlabs/Module/Connections.php:260
msgid "Ignored"
msgstr "Ignoré(e)"
-#: ../../Zotlabs/Module/Connections.php:64
-#: ../../Zotlabs/Module/Connections.php:177
-#: ../../Zotlabs/Module/Connections.php:243
+#: ../../Zotlabs/Module/Connections.php:70
+#: ../../Zotlabs/Module/Connections.php:185
+#: ../../Zotlabs/Module/Connections.php:259
msgid "Hidden"
msgstr "Caché"
-#: ../../Zotlabs/Module/Connections.php:69
-#: ../../Zotlabs/Module/Connections.php:170
+#: ../../Zotlabs/Module/Connections.php:75
+#: ../../Zotlabs/Module/Connections.php:178
msgid "Archived/Unreachable"
msgstr "Archivé/Injoignable"
-#: ../../Zotlabs/Module/Connections.php:74
-#: ../../Zotlabs/Module/Connections.php:83 ../../Zotlabs/Module/Menu.php:116
+#: ../../Zotlabs/Module/Connections.php:80
+#: ../../Zotlabs/Module/Connections.php:89 ../../Zotlabs/Module/Menu.php:116
#: ../../Zotlabs/Module/Notifications.php:52
-#: ../../include/conversation.php:1714
+#: ../../include/conversation.php:1717
msgid "New"
msgstr "Nouveautés"
-#: ../../Zotlabs/Module/Connections.php:88
-#: ../../Zotlabs/Module/Connections.php:102
+#: ../../Zotlabs/Module/Connections.php:94
+#: ../../Zotlabs/Module/Connections.php:108
#: ../../Zotlabs/Module/Connedit.php:713 ../../Zotlabs/Widget/Affinity.php:26
msgid "All"
msgstr "Tous"
-#: ../../Zotlabs/Module/Connections.php:133
+#: ../../Zotlabs/Module/Connections.php:140
+msgid "Active Connections"
+msgstr "Connexions actives"
+
+#: ../../Zotlabs/Module/Connections.php:143
+msgid "Show active connections"
+msgstr "Voir les connexions actives"
+
+#: ../../Zotlabs/Module/Connections.php:147
#: ../../Zotlabs/Widget/Notifications.php:84
msgid "New Connections"
msgstr "Nouveaux contacts"
-#: ../../Zotlabs/Module/Connections.php:136
+#: ../../Zotlabs/Module/Connections.php:150
msgid "Show pending (new) connections"
msgstr "Voir les (nouveaux) contacts en attente"
-#: ../../Zotlabs/Module/Connections.php:143
-msgid "Show all connections"
-msgstr "Voir tous les contacts"
-
-#: ../../Zotlabs/Module/Connections.php:159
+#: ../../Zotlabs/Module/Connections.php:167
msgid "Only show blocked connections"
msgstr "Ne montrer que les contacts bloqués"
-#: ../../Zotlabs/Module/Connections.php:166
+#: ../../Zotlabs/Module/Connections.php:174
msgid "Only show ignored connections"
msgstr "Ne montrer que les contacts ignorés"
-#: ../../Zotlabs/Module/Connections.php:173
+#: ../../Zotlabs/Module/Connections.php:181
msgid "Only show archived/unreachable connections"
msgstr "Ne montrer que les contacts archivés/injoignables"
-#: ../../Zotlabs/Module/Connections.php:180
+#: ../../Zotlabs/Module/Connections.php:188
msgid "Only show hidden connections"
msgstr "Ne montrer que les contacts cachés"
-#: ../../Zotlabs/Module/Connections.php:241
+#: ../../Zotlabs/Module/Connections.php:203
+msgid "Show all connections"
+msgstr "Voir tous les contacts"
+
+#: ../../Zotlabs/Module/Connections.php:257
msgid "Pending approval"
msgstr "En attente de validation"
-#: ../../Zotlabs/Module/Connections.php:242
+#: ../../Zotlabs/Module/Connections.php:258
msgid "Archived"
msgstr "Archivé"
-#: ../../Zotlabs/Module/Connections.php:246
+#: ../../Zotlabs/Module/Connections.php:262
msgid "Not connected at this location"
msgstr "Contact introuvable à cette adresse"
-#: ../../Zotlabs/Module/Connections.php:263
+#: ../../Zotlabs/Module/Connections.php:279
#, php-format
msgid "%1$s [%2$s]"
msgstr "%1$s [%2$s]"
-#: ../../Zotlabs/Module/Connections.php:264
+#: ../../Zotlabs/Module/Connections.php:280
msgid "Edit connection"
msgstr "Modifier le contact"
-#: ../../Zotlabs/Module/Connections.php:266
+#: ../../Zotlabs/Module/Connections.php:282
msgid "Delete connection"
msgstr "Supprimer le contact"
-#: ../../Zotlabs/Module/Connections.php:275
+#: ../../Zotlabs/Module/Connections.php:291
msgid "Channel address"
msgstr "Adresse du canal"
-#: ../../Zotlabs/Module/Connections.php:277
+#: ../../Zotlabs/Module/Connections.php:293
msgid "Network"
msgstr "Réseau"
-#: ../../Zotlabs/Module/Connections.php:280
+#: ../../Zotlabs/Module/Connections.php:296
msgid "Call"
msgstr "Appeler"
-#: ../../Zotlabs/Module/Connections.php:282
+#: ../../Zotlabs/Module/Connections.php:298
msgid "Status"
msgstr "État"
-#: ../../Zotlabs/Module/Connections.php:284
+#: ../../Zotlabs/Module/Connections.php:300
msgid "Connected"
msgstr "Ami depuis"
-#: ../../Zotlabs/Module/Connections.php:286
+#: ../../Zotlabs/Module/Connections.php:302
msgid "Approve connection"
msgstr "Valider le contact"
-#: ../../Zotlabs/Module/Connections.php:288
+#: ../../Zotlabs/Module/Connections.php:304
msgid "Ignore connection"
msgstr "Ignorer le contact"
-#: ../../Zotlabs/Module/Connections.php:289
+#: ../../Zotlabs/Module/Connections.php:305
#: ../../Zotlabs/Module/Connedit.php:630
msgid "Ignore"
msgstr "Ignorer"
-#: ../../Zotlabs/Module/Connections.php:290
+#: ../../Zotlabs/Module/Connections.php:306
msgid "Recent activity"
msgstr "Activité récente"
-#: ../../Zotlabs/Module/Connections.php:315 ../../Zotlabs/Lib/Apps.php:235
+#: ../../Zotlabs/Module/Connections.php:331 ../../Zotlabs/Lib/Apps.php:235
#: ../../include/text.php:973
msgid "Connections"
msgstr "Contacts"
-#: ../../Zotlabs/Module/Connections.php:320
+#: ../../Zotlabs/Module/Connections.php:336
msgid "Search your connections"
msgstr "Chercher parmi vos contacts"
-#: ../../Zotlabs/Module/Connections.php:321
+#: ../../Zotlabs/Module/Connections.php:337
msgid "Connections search"
msgstr "Chercher des contacts"
-#: ../../Zotlabs/Module/Connections.php:322
-#: ../../Zotlabs/Module/Directory.php:396
-#: ../../Zotlabs/Module/Directory.php:401 ../../include/contact_widgets.php:23
+#: ../../Zotlabs/Module/Connections.php:338
+#: ../../Zotlabs/Module/Directory.php:401
+#: ../../Zotlabs/Module/Directory.php:406 ../../include/contact_widgets.php:23
msgid "Find"
msgstr "Trouver"
@@ -4693,12 +4760,8 @@ msgstr "ou sélectionner un album existant (double-clic)"
msgid "Create a status post for this upload"
msgstr "Créer une publication de statut pour cet envoi"
-#: ../../Zotlabs/Module/Photos.php:698
-msgid "Caption (optional):"
-msgstr "Légende (facultative)"
-
#: ../../Zotlabs/Module/Photos.php:699
-msgid "Description (optional):"
+msgid "Description (optional)"
msgstr "Description (facultative)"
#: ../../Zotlabs/Module/Photos.php:785
@@ -4709,6 +4772,10 @@ msgstr "Les plus récent(e)s en premier"
msgid "Show Oldest First"
msgstr "Les moins récent(e)s en premier"
+#: ../../Zotlabs/Module/Photos.php:844 ../../Zotlabs/Module/Photos.php:1381
+msgid "Add Photos"
+msgstr "Ajouter des photos"
+
#: ../../Zotlabs/Module/Photos.php:892
msgid "Permission denied. Access to this item may be restricted."
msgstr "Accès refusé. L'accès à cet élément peut avoir été restreint."
@@ -4757,10 +4824,6 @@ msgstr "Entrer un nouveau nom d'album"
msgid "or select an existing one (doubleclick)"
msgstr "ou en sélectionner un existant (double-clic)"
-#: ../../Zotlabs/Module/Photos.php:1068
-msgid "Caption"
-msgstr "Titre/légende"
-
#: ../../Zotlabs/Module/Photos.php:1070
msgid "Add a Tag"
msgstr "Ajouter une étiquette"
@@ -4787,12 +4850,12 @@ msgid "Please wait"
msgstr "Merci de patienter"
#: ../../Zotlabs/Module/Photos.php:1119 ../../Zotlabs/Module/Photos.php:1237
-#: ../../Zotlabs/Lib/ThreadItem.php:747
+#: ../../Zotlabs/Lib/ThreadItem.php:749
msgid "This is you"
msgstr "C'est vous"
#: ../../Zotlabs/Module/Photos.php:1121 ../../Zotlabs/Module/Photos.php:1239
-#: ../../Zotlabs/Lib/ThreadItem.php:749 ../../include/js_strings.php:6
+#: ../../Zotlabs/Lib/ThreadItem.php:751 ../../include/js_strings.php:6
msgid "Comment"
msgstr "Commenter"
@@ -4842,8 +4905,8 @@ msgid "View all"
msgstr "Voir tout"
#: ../../Zotlabs/Module/Photos.php:1160 ../../Zotlabs/Lib/ThreadItem.php:205
-#: ../../include/conversation.php:1978 ../../include/channel.php:1540
-#: ../../include/taxonomy.php:597
+#: ../../include/conversation.php:1981 ../../include/channel.php:1539
+#: ../../include/taxonomy.php:601
msgctxt "noun"
msgid "Like"
msgid_plural "Likes"
@@ -4851,7 +4914,7 @@ msgstr[0] "Aime"
msgstr[1] "Aime"
#: ../../Zotlabs/Module/Photos.php:1165 ../../Zotlabs/Lib/ThreadItem.php:210
-#: ../../include/conversation.php:1981
+#: ../../include/conversation.php:1984
msgctxt "noun"
msgid "Dislike"
msgid_plural "Dislikes"
@@ -4886,78 +4949,76 @@ msgid "Close"
msgstr "Fermer"
#: ../../Zotlabs/Module/Photos.php:1365 ../../Zotlabs/Module/Photos.php:1378
-#: ../../Zotlabs/Module/Photos.php:1379 ../../include/photos.php:656
+#: ../../Zotlabs/Module/Photos.php:1379 ../../include/photos.php:663
msgid "Recent Photos"
msgstr "Photos récentes"
-#: ../../Zotlabs/Module/Wiki.php:30
+#: ../../Zotlabs/Module/Wiki.php:30 ../../addon/cart/cart.php:1135
msgid "Profile Unavailable."
msgstr "Profil non disponible."
-#: ../../Zotlabs/Module/Wiki.php:44 ../../Zotlabs/Module/Cloud.php:108
-#: ../../addon/gitwiki/Mod_Gitwiki.php:42
+#: ../../Zotlabs/Module/Wiki.php:44 ../../Zotlabs/Module/Cloud.php:114
msgid "Not found"
msgstr "Non trouvé"
-#: ../../Zotlabs/Module/Wiki.php:68 ../../addon/gitwiki/Mod_Gitwiki.php:62
+#: ../../Zotlabs/Module/Wiki.php:68 ../../addon/cart/myshop.php:114
+#: ../../addon/cart/cart.php:1204 ../../addon/cart/manual_payments.php:58
msgid "Invalid channel"
msgstr "Canal invalide."
-#: ../../Zotlabs/Module/Wiki.php:124 ../../addon/gitwiki/Mod_Gitwiki.php:107
+#: ../../Zotlabs/Module/Wiki.php:124
msgid "Error retrieving wiki"
msgstr "Erreur lors de la récupération du wiki"
-#: ../../Zotlabs/Module/Wiki.php:131 ../../addon/gitwiki/Mod_Gitwiki.php:114
+#: ../../Zotlabs/Module/Wiki.php:131
msgid "Error creating zip file export folder"
msgstr "Erreur lors de la création du dossier d'exportation du fichier zip"
-#: ../../Zotlabs/Module/Wiki.php:182 ../../addon/gitwiki/Mod_Gitwiki.php:132
+#: ../../Zotlabs/Module/Wiki.php:182
msgid "Error downloading wiki: "
msgstr "Erreur lors du téléchargement du wiki:"
-#: ../../Zotlabs/Module/Wiki.php:197 ../../addon/gitwiki/Mod_Gitwiki.php:146
-#: ../../include/conversation.php:1925 ../../include/nav.php:494
+#: ../../Zotlabs/Module/Wiki.php:197 ../../include/conversation.php:1928
+#: ../../include/nav.php:494
msgid "Wikis"
msgstr "Wikis"
-#: ../../Zotlabs/Module/Wiki.php:203 ../../addon/gitwiki/Mod_Gitwiki.php:152
+#: ../../Zotlabs/Module/Wiki.php:203
msgid "Download"
msgstr "Téléchargement"
#: ../../Zotlabs/Module/Wiki.php:205 ../../Zotlabs/Module/Chat.php:256
-#: ../../Zotlabs/Module/Profiles.php:834 ../../Zotlabs/Module/Manage.php:145
-#: ../../addon/gitwiki/Mod_Gitwiki.php:154
+#: ../../Zotlabs/Module/Profiles.php:831 ../../Zotlabs/Module/Manage.php:145
msgid "Create New"
msgstr "Nouveau"
-#: ../../Zotlabs/Module/Wiki.php:207 ../../addon/gitwiki/Mod_Gitwiki.php:156
+#: ../../Zotlabs/Module/Wiki.php:207
msgid "Wiki name"
msgstr "Nom du wiki"
-#: ../../Zotlabs/Module/Wiki.php:208 ../../addon/gitwiki/Mod_Gitwiki.php:157
+#: ../../Zotlabs/Module/Wiki.php:208
msgid "Content type"
msgstr "Type de contenu"
-#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Module/Wiki.php:348
+#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Module/Wiki.php:350
#: ../../Zotlabs/Widget/Wiki_pages.php:36
#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../addon/mdpost/mdpost.php:40
-#: ../../include/text.php:1868
+#: ../../include/text.php:1869
msgid "Markdown"
msgstr "Markdown"
-#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Module/Wiki.php:348
+#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Module/Wiki.php:350
#: ../../Zotlabs/Widget/Wiki_pages.php:36
-#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1866
+#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1867
msgid "BBcode"
msgstr "BBcode"
#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Widget/Wiki_pages.php:36
-#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1869
+#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1870
msgid "Text"
msgstr "Texte"
#: ../../Zotlabs/Module/Wiki.php:210 ../../Zotlabs/Storage/Browser.php:284
-#: ../../addon/gitwiki/Mod_Gitwiki.php:159
msgid "Type"
msgstr "Type"
@@ -4969,7 +5030,7 @@ msgstr "N'importe quel type"
msgid "Lock content type"
msgstr "Verrouiller le type de contenu"
-#: ../../Zotlabs/Module/Wiki.php:219 ../../addon/gitwiki/Mod_Gitwiki.php:166
+#: ../../Zotlabs/Module/Wiki.php:219
msgid "Create a status post for this wiki"
msgstr "Créer un statut de publication pour ce wiki"
@@ -4977,138 +5038,147 @@ msgstr "Créer un statut de publication pour ce wiki"
msgid "Edit Wiki Name"
msgstr "Modifier le nom du wiki"
-#: ../../Zotlabs/Module/Wiki.php:262 ../../addon/gitwiki/Mod_Gitwiki.php:185
+#: ../../Zotlabs/Module/Wiki.php:262
msgid "Wiki not found"
msgstr "Wiki introuvable"
-#: ../../Zotlabs/Module/Wiki.php:286 ../../addon/gitwiki/Mod_Gitwiki.php:210
+#: ../../Zotlabs/Module/Wiki.php:286
msgid "Rename page"
msgstr "Renommer la page"
-#: ../../Zotlabs/Module/Wiki.php:305 ../../addon/gitwiki/Mod_Gitwiki.php:214
+#: ../../Zotlabs/Module/Wiki.php:307
msgid "Error retrieving page content"
msgstr "Erreur lors de la récupération du contenu de la page"
-#: ../../Zotlabs/Module/Wiki.php:313 ../../Zotlabs/Module/Wiki.php:315
+#: ../../Zotlabs/Module/Wiki.php:315 ../../Zotlabs/Module/Wiki.php:317
msgid "New page"
msgstr "Nouvelle page"
-#: ../../Zotlabs/Module/Wiki.php:343 ../../addon/gitwiki/Mod_Gitwiki.php:242
+#: ../../Zotlabs/Module/Wiki.php:345
msgid "Revision Comparison"
msgstr "Comparaison des révisions"
-#: ../../Zotlabs/Module/Wiki.php:344 ../../addon/gitwiki/Mod_Gitwiki.php:243
+#: ../../Zotlabs/Module/Wiki.php:346
msgid "Revert"
msgstr "Revenir"
-#: ../../Zotlabs/Module/Wiki.php:351
+#: ../../Zotlabs/Module/Wiki.php:353
msgid "Short description of your changes (optional)"
msgstr "Description courte de vos modifications (optionnel)"
-#: ../../Zotlabs/Module/Wiki.php:358 ../../addon/gitwiki/Mod_Gitwiki.php:252
+#: ../../Zotlabs/Module/Wiki.php:362
msgid "Source"
msgstr "Source"
-#: ../../Zotlabs/Module/Wiki.php:368 ../../addon/gitwiki/Mod_Gitwiki.php:260
+#: ../../Zotlabs/Module/Wiki.php:372
msgid "New page name"
msgstr "Nouveau nom de la page"
-#: ../../Zotlabs/Module/Wiki.php:373 ../../addon/gitwiki/Mod_Gitwiki.php:265
-#: ../../include/conversation.php:1282
+#: ../../Zotlabs/Module/Wiki.php:377 ../../include/conversation.php:1282
msgid "Embed image from photo albums"
msgstr "Intégrer une image d'un album photo"
-#: ../../Zotlabs/Module/Wiki.php:374 ../../addon/gitwiki/Mod_Gitwiki.php:266
-#: ../../include/conversation.php:1385
+#: ../../Zotlabs/Module/Wiki.php:378 ../../include/conversation.php:1388
msgid "Embed an image from your albums"
msgstr "Intégrer une image de votre album photo"
-#: ../../Zotlabs/Module/Wiki.php:376
+#: ../../Zotlabs/Module/Wiki.php:380
#: ../../Zotlabs/Module/Profile_photo.php:465
#: ../../Zotlabs/Module/Cover_photo.php:366
-#: ../../addon/gitwiki/Mod_Gitwiki.php:268 ../../include/conversation.php:1387
-#: ../../include/conversation.php:1434
+#: ../../include/conversation.php:1390 ../../include/conversation.php:1437
msgid "OK"
msgstr "OK"
-#: ../../Zotlabs/Module/Wiki.php:377 ../../addon/gitwiki/Mod_Gitwiki.php:269
-#: ../../include/conversation.php:1318
+#: ../../Zotlabs/Module/Wiki.php:381
+#: ../../Zotlabs/Module/Profile_photo.php:466
+#: ../../Zotlabs/Module/Cover_photo.php:367
+#: ../../include/conversation.php:1320
msgid "Choose images to embed"
msgstr "Choisissez des images à intégrer"
-#: ../../Zotlabs/Module/Wiki.php:378 ../../addon/gitwiki/Mod_Gitwiki.php:270
-#: ../../include/conversation.php:1319
+#: ../../Zotlabs/Module/Wiki.php:382
+#: ../../Zotlabs/Module/Profile_photo.php:467
+#: ../../Zotlabs/Module/Cover_photo.php:368
+#: ../../include/conversation.php:1321
msgid "Choose an album"
msgstr "Choisir un album"
-#: ../../Zotlabs/Module/Wiki.php:379 ../../addon/gitwiki/Mod_Gitwiki.php:271
+#: ../../Zotlabs/Module/Wiki.php:383
+#: ../../Zotlabs/Module/Profile_photo.php:468
+#: ../../Zotlabs/Module/Cover_photo.php:369
msgid "Choose a different album"
msgstr "Choisissez un autre album"
-#: ../../Zotlabs/Module/Wiki.php:380 ../../addon/gitwiki/Mod_Gitwiki.php:272
-#: ../../include/conversation.php:1321
+#: ../../Zotlabs/Module/Wiki.php:384
+#: ../../Zotlabs/Module/Profile_photo.php:469
+#: ../../Zotlabs/Module/Cover_photo.php:370
+#: ../../include/conversation.php:1323
msgid "Error getting album list"
msgstr "Erreur venant de la liste de l'album"
-#: ../../Zotlabs/Module/Wiki.php:381 ../../addon/gitwiki/Mod_Gitwiki.php:273
-#: ../../include/conversation.php:1322
+#: ../../Zotlabs/Module/Wiki.php:385
+#: ../../Zotlabs/Module/Profile_photo.php:470
+#: ../../Zotlabs/Module/Cover_photo.php:371
+#: ../../include/conversation.php:1324
msgid "Error getting photo link"
msgstr "Erreur provenant du lien de la photo"
-#: ../../Zotlabs/Module/Wiki.php:382 ../../addon/gitwiki/Mod_Gitwiki.php:274
-#: ../../include/conversation.php:1323
+#: ../../Zotlabs/Module/Wiki.php:386
+#: ../../Zotlabs/Module/Profile_photo.php:471
+#: ../../Zotlabs/Module/Cover_photo.php:372
+#: ../../include/conversation.php:1325
msgid "Error getting album"
msgstr "Erreur venant de l'album"
-#: ../../Zotlabs/Module/Wiki.php:458 ../../addon/gitwiki/Mod_Gitwiki.php:337
+#: ../../Zotlabs/Module/Wiki.php:462
msgid "Error creating wiki. Invalid name."
msgstr "Erreur lors de la création du wiki. Nom invalide."
-#: ../../Zotlabs/Module/Wiki.php:465
+#: ../../Zotlabs/Module/Wiki.php:469
msgid "A wiki with this name already exists."
msgstr "Ce nom de wiki est déjà pris"
-#: ../../Zotlabs/Module/Wiki.php:478 ../../addon/gitwiki/Mod_Gitwiki.php:348
+#: ../../Zotlabs/Module/Wiki.php:482
msgid "Wiki created, but error creating Home page."
msgstr "Le wiki a été créé, mais une erreur est survenue lors de la création de sa page d'accueil."
-#: ../../Zotlabs/Module/Wiki.php:485 ../../addon/gitwiki/Mod_Gitwiki.php:353
+#: ../../Zotlabs/Module/Wiki.php:489
msgid "Error creating wiki"
msgstr "Erreur lors de la création du wiki."
-#: ../../Zotlabs/Module/Wiki.php:508
+#: ../../Zotlabs/Module/Wiki.php:512
msgid "Error updating wiki. Invalid name."
msgstr "Erreur de mise à jour du wiki. Nom invalide."
-#: ../../Zotlabs/Module/Wiki.php:528
+#: ../../Zotlabs/Module/Wiki.php:532
msgid "Error updating wiki"
msgstr "Erreur de mise à jour du wiki"
-#: ../../Zotlabs/Module/Wiki.php:543
+#: ../../Zotlabs/Module/Wiki.php:547
msgid "Wiki delete permission denied."
msgstr "Droit de supprimer le wiki refusé."
-#: ../../Zotlabs/Module/Wiki.php:553
+#: ../../Zotlabs/Module/Wiki.php:557
msgid "Error deleting wiki"
msgstr "Erreur durant la suppression du wiki"
-#: ../../Zotlabs/Module/Wiki.php:586 ../../addon/gitwiki/Mod_Gitwiki.php:400
+#: ../../Zotlabs/Module/Wiki.php:590
msgid "New page created"
msgstr "Nouvelle page créée"
-#: ../../Zotlabs/Module/Wiki.php:707
+#: ../../Zotlabs/Module/Wiki.php:711
msgid "Cannot delete Home"
msgstr "Impossible de supprimer la racine"
-#: ../../Zotlabs/Module/Wiki.php:771
+#: ../../Zotlabs/Module/Wiki.php:775
msgid "Current Revision"
msgstr "Version actuelle"
-#: ../../Zotlabs/Module/Wiki.php:771
+#: ../../Zotlabs/Module/Wiki.php:775
msgid "Selected Revision"
msgstr "Version sélectionnée"
-#: ../../Zotlabs/Module/Wiki.php:821
+#: ../../Zotlabs/Module/Wiki.php:825
msgid "You must be authenticated."
msgstr "Vous devez être connecté."
@@ -5259,23 +5329,23 @@ msgstr "Utiliser"
msgid "Use a photo from your albums"
msgstr "Utiliser une photo de vos albums"
-#: ../../Zotlabs/Module/Profile_photo.php:467
-#: ../../Zotlabs/Module/Cover_photo.php:369
+#: ../../Zotlabs/Module/Profile_photo.php:473
+#: ../../Zotlabs/Module/Cover_photo.php:375
msgid "Select existing photo"
msgstr "Sélectionner une photo existante"
-#: ../../Zotlabs/Module/Profile_photo.php:486
-#: ../../Zotlabs/Module/Cover_photo.php:386
+#: ../../Zotlabs/Module/Profile_photo.php:492
+#: ../../Zotlabs/Module/Cover_photo.php:392
msgid "Crop Image"
msgstr "Recadrer l'image"
-#: ../../Zotlabs/Module/Profile_photo.php:487
-#: ../../Zotlabs/Module/Cover_photo.php:387
+#: ../../Zotlabs/Module/Profile_photo.php:493
+#: ../../Zotlabs/Module/Cover_photo.php:393
msgid "Please adjust the image cropping for optimum viewing."
msgstr "Merci d'ajuster le cadre pour une visualisation optimale."
-#: ../../Zotlabs/Module/Profile_photo.php:489
-#: ../../Zotlabs/Module/Cover_photo.php:389
+#: ../../Zotlabs/Module/Profile_photo.php:495
+#: ../../Zotlabs/Module/Cover_photo.php:395
msgid "Done Editing"
msgstr "J'ai terminé"
@@ -5291,61 +5361,61 @@ msgstr "En ligne"
msgid "Unable to locate original post."
msgstr "Impossible de localiser la publication initiale."
-#: ../../Zotlabs/Module/Item.php:476
+#: ../../Zotlabs/Module/Item.php:477
msgid "Empty post discarded."
msgstr "Publication vide annulée."
-#: ../../Zotlabs/Module/Item.php:867
+#: ../../Zotlabs/Module/Item.php:874
msgid "Duplicate post suppressed."
msgstr "Publication en doublon supprimée."
-#: ../../Zotlabs/Module/Item.php:1012
+#: ../../Zotlabs/Module/Item.php:1019
msgid "System error. Post not saved."
msgstr "Erreur système. Publication non sauvegardée."
-#: ../../Zotlabs/Module/Item.php:1048
+#: ../../Zotlabs/Module/Item.php:1055
msgid "Your comment is awaiting approval."
msgstr "Votre commentaire est en attente de validation."
-#: ../../Zotlabs/Module/Item.php:1153
+#: ../../Zotlabs/Module/Item.php:1160
msgid "Unable to obtain post information from database."
msgstr "Impossible d'obtenir les informations de publication depuis la base de données."
-#: ../../Zotlabs/Module/Item.php:1182
+#: ../../Zotlabs/Module/Item.php:1189
#, php-format
msgid "You have reached your limit of %1$.0f top level posts."
msgstr "Vous avez atteint votre limite de %1$.0f contributions \"racines\"."
-#: ../../Zotlabs/Module/Item.php:1189
+#: ../../Zotlabs/Module/Item.php:1196
#, php-format
msgid "You have reached your limit of %1$.0f webpages."
msgstr "Vous avez atteint votre limite de %1$.0f pages web."
-#: ../../Zotlabs/Module/Ping.php:320
+#: ../../Zotlabs/Module/Ping.php:330
msgid "sent you a private message"
msgstr "vous a envoyé un message privé"
-#: ../../Zotlabs/Module/Ping.php:372
+#: ../../Zotlabs/Module/Ping.php:383
msgid "added your channel"
msgstr "a ajouté votre canal"
-#: ../../Zotlabs/Module/Ping.php:396
+#: ../../Zotlabs/Module/Ping.php:407
msgid "requires approval"
msgstr "nécessite une approbation"
-#: ../../Zotlabs/Module/Ping.php:406
+#: ../../Zotlabs/Module/Ping.php:417
msgid "g A l F d"
msgstr "g A l F d"
-#: ../../Zotlabs/Module/Ping.php:424
+#: ../../Zotlabs/Module/Ping.php:435
msgid "[today]"
msgstr "[aujourd'hui]"
-#: ../../Zotlabs/Module/Ping.php:433
+#: ../../Zotlabs/Module/Ping.php:444
msgid "posted an event"
msgstr "a publié un événement"
-#: ../../Zotlabs/Module/Ping.php:466
+#: ../../Zotlabs/Module/Ping.php:477
msgid "shared a file with you"
msgstr "a partagé un fichier avec vous"
@@ -5354,7 +5424,8 @@ msgid "Invalid item."
msgstr "Élément invalide."
#: ../../Zotlabs/Module/Page.php:136 ../../Zotlabs/Module/Block.php:77
-#: ../../Zotlabs/Module/Display.php:133
+#: ../../Zotlabs/Module/Display.php:141 ../../Zotlabs/Module/Display.php:158
+#: ../../Zotlabs/Module/Display.php:175
#: ../../Zotlabs/Lib/NativeWikiPage.php:519 ../../Zotlabs/Web/Router.php:167
#: ../../include/help.php:81
msgid "Page not found."
@@ -5435,7 +5506,7 @@ msgstr "Actualiser la photo"
msgid "Fetch updated photo"
msgstr "Récupérer la photo mise à jour"
-#: ../../Zotlabs/Module/Connedit.php:615
+#: ../../Zotlabs/Module/Connedit.php:615 ../../include/conversation.php:1042
msgid "Recent Activity"
msgstr "Activité récente"
@@ -5579,11 +5650,11 @@ msgid ""
msgstr "Ce contact est injoignable à partir de cette adresse. Sa plate-forme ne gère pas la localisation multiple des canaux/contacts."
#: ../../Zotlabs/Module/Connedit.php:850 ../../Zotlabs/Module/Defperms.php:238
-#: ../../Zotlabs/Widget/Settings_menu.php:109
+#: ../../Zotlabs/Widget/Settings_menu.php:117
msgid "Connection Default Permissions"
msgstr "Droits d'accès par défaut des contacts"
-#: ../../Zotlabs/Module/Connedit.php:850 ../../include/items.php:4164
+#: ../../Zotlabs/Module/Connedit.php:850 ../../include/items.php:4214
#, php-format
msgid "Connection: %s"
msgstr "Contact&nbsp;: %s"
@@ -5718,13 +5789,13 @@ msgid "Bookmark this room"
msgstr "Marquer ce salon comme favori"
#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Mail.php:241
-#: ../../Zotlabs/Module/Mail.php:362 ../../include/conversation.php:1313
+#: ../../Zotlabs/Module/Mail.php:362 ../../include/conversation.php:1315
msgid "Please enter a link URL:"
msgstr "Merci d'entrer l'URL d'un lien&nbsp;:"
#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Module/Mail.php:294
-#: ../../Zotlabs/Module/Mail.php:436 ../../Zotlabs/Lib/ThreadItem.php:764
-#: ../../include/conversation.php:1432
+#: ../../Zotlabs/Module/Mail.php:436 ../../Zotlabs/Lib/ThreadItem.php:766
+#: ../../include/conversation.php:1435
msgid "Encrypt text"
msgstr "Chiffrer le texte"
@@ -5758,12 +5829,12 @@ msgid "min"
msgstr "min"
#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:248
-#: ../../include/conversation.php:1831 ../../include/nav.php:401
+#: ../../include/conversation.php:1834 ../../include/nav.php:401
msgid "Photos"
msgstr "Photos"
#: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:243
-#: ../../Zotlabs/Storage/Browser.php:272 ../../include/conversation.php:1839
+#: ../../Zotlabs/Storage/Browser.php:272 ../../include/conversation.php:1842
#: ../../include/nav.php:409
msgid "Files"
msgstr "Fichiers"
@@ -5804,7 +5875,7 @@ msgstr "Le menu pourra être utilisé pour stocker des favoris"
msgid "Submit and proceed"
msgstr "Valider et continuer"
-#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2403
+#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2406
msgid "Menus"
msgstr "Menus"
@@ -5856,7 +5927,7 @@ msgstr "Titre du menu tel que vu par les visiteurs"
msgid "Allow bookmarks"
msgstr "Autoriser l'usage de favoris"
-#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2404
+#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2407
msgid "Layouts"
msgstr "Mises-en-page"
@@ -5878,11 +5949,11 @@ msgstr "Description de la mise en page"
msgid "Download PDL file"
msgstr "Télécharger le fichier PDL"
-#: ../../Zotlabs/Module/Cloud.php:114
+#: ../../Zotlabs/Module/Cloud.php:120
msgid "Please refresh page"
msgstr "Veuillez rafraîchir la page"
-#: ../../Zotlabs/Module/Cloud.php:117
+#: ../../Zotlabs/Module/Cloud.php:123
msgid "Unknown error"
msgstr "Erreur inconnue"
@@ -5916,16 +5987,16 @@ msgid "Post not found."
msgstr "Publication introuvable."
#: ../../Zotlabs/Module/Tagger.php:77 ../../include/markdown.php:160
-#: ../../include/bbcode.php:339
+#: ../../include/bbcode.php:352
msgid "post"
msgstr "publication"
#: ../../Zotlabs/Module/Tagger.php:79 ../../include/conversation.php:146
-#: ../../include/text.php:2012
+#: ../../include/text.php:2013
msgid "comment"
msgstr "commentaire"
-#: ../../Zotlabs/Module/Tagger.php:117
+#: ../../Zotlabs/Module/Tagger.php:119
#, php-format
msgid "%1$s tagged %2$s's %3$s with %4$s"
msgstr "%1$s a étiqueté le %3$s de %2$s avec %4$s"
@@ -5960,6 +6031,23 @@ msgid ""
"channel type and privacy settings."
msgstr "Certaines permissions individuelles peuvent avoir été prédéfinies ou verrouillées en fonction de votre type de canal et de vos paramètres de confidentialité."
+#: ../../Zotlabs/Module/Authorize.php:17
+msgid "Unknown App"
+msgstr "App inconnue"
+
+#: ../../Zotlabs/Module/Authorize.php:22
+msgid "Authorize"
+msgstr "Autoriser"
+
+#: ../../Zotlabs/Module/Authorize.php:23
+#, php-format
+msgid "Do you authorize the app %s to access your channel data?"
+msgstr "Autorisez vous l'app %s à accéder aux données de votre canal&nbsp;?"
+
+#: ../../Zotlabs/Module/Authorize.php:25
+msgid "Allow"
+msgstr "Permettre"
+
#: ../../Zotlabs/Module/Group.php:24
msgid "Privacy group created."
msgstr "Groupe de contacts créé."
@@ -5969,7 +6057,7 @@ msgid "Could not create privacy group."
msgstr "Impossible de créer le groupe de contacts."
#: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:143
-#: ../../include/items.php:4131
+#: ../../include/items.php:4181
msgid "Privacy group not found."
msgstr "Groupe de contacts introuvable."
@@ -6050,15 +6138,15 @@ msgstr "Statut marital"
msgid "Romantic Partner"
msgstr "Partenaire amoureux"
-#: ../../Zotlabs/Module/Profiles.php:467 ../../Zotlabs/Module/Profiles.php:775
+#: ../../Zotlabs/Module/Profiles.php:467 ../../Zotlabs/Module/Profiles.php:772
msgid "Likes"
msgstr "Aime"
-#: ../../Zotlabs/Module/Profiles.php:471 ../../Zotlabs/Module/Profiles.php:776
+#: ../../Zotlabs/Module/Profiles.php:471 ../../Zotlabs/Module/Profiles.php:773
msgid "Dislikes"
msgstr "N'aime pas"
-#: ../../Zotlabs/Module/Profiles.php:475 ../../Zotlabs/Module/Profiles.php:783
+#: ../../Zotlabs/Module/Profiles.php:475 ../../Zotlabs/Module/Profiles.php:780
msgid "Work/Employment"
msgstr "Travail/Occupation"
@@ -6095,198 +6183,198 @@ msgstr "Profil mis à jour."
msgid "Hide your connections list from viewers of this profile"
msgstr "Cacher la liste de vos contacts pour les visiteurs de votre profile"
-#: ../../Zotlabs/Module/Profiles.php:725
+#: ../../Zotlabs/Module/Profiles.php:722
msgid "Edit Profile Details"
msgstr "Modifier les détails du profil"
-#: ../../Zotlabs/Module/Profiles.php:727
+#: ../../Zotlabs/Module/Profiles.php:724
msgid "View this profile"
msgstr "Voir ce profil"
-#: ../../Zotlabs/Module/Profiles.php:728 ../../Zotlabs/Module/Profiles.php:827
-#: ../../include/channel.php:1320
+#: ../../Zotlabs/Module/Profiles.php:725 ../../Zotlabs/Module/Profiles.php:824
+#: ../../include/channel.php:1319
msgid "Edit visibility"
msgstr "Changer la visibilité"
-#: ../../Zotlabs/Module/Profiles.php:729
+#: ../../Zotlabs/Module/Profiles.php:726
msgid "Profile Tools"
-msgstr "Ouitls pour votre profile"
+msgstr "Outils pour votre profil"
-#: ../../Zotlabs/Module/Profiles.php:730
+#: ../../Zotlabs/Module/Profiles.php:727
msgid "Change cover photo"
msgstr "Modifier votre bannière"
-#: ../../Zotlabs/Module/Profiles.php:731 ../../include/channel.php:1290
+#: ../../Zotlabs/Module/Profiles.php:728 ../../include/channel.php:1289
msgid "Change profile photo"
msgstr "Changer la photo du profil"
-#: ../../Zotlabs/Module/Profiles.php:732
+#: ../../Zotlabs/Module/Profiles.php:729
msgid "Create a new profile using these settings"
msgstr "Créer un nouveau profil avec ces paramètres"
-#: ../../Zotlabs/Module/Profiles.php:733
+#: ../../Zotlabs/Module/Profiles.php:730
msgid "Clone this profile"
msgstr "Cloner ce profil"
-#: ../../Zotlabs/Module/Profiles.php:734
+#: ../../Zotlabs/Module/Profiles.php:731
msgid "Delete this profile"
msgstr "Supprimer ce profil"
-#: ../../Zotlabs/Module/Profiles.php:735
+#: ../../Zotlabs/Module/Profiles.php:732
msgid "Add profile things"
msgstr "Ajouter des éléments de profil"
-#: ../../Zotlabs/Module/Profiles.php:736 ../../include/conversation.php:1705
+#: ../../Zotlabs/Module/Profiles.php:733 ../../include/conversation.php:1708
msgid "Personal"
msgstr "Me concernant"
-#: ../../Zotlabs/Module/Profiles.php:738
-msgid "Relation"
-msgstr "Contacts"
+#: ../../Zotlabs/Module/Profiles.php:735
+msgid "Relationship"
+msgstr "Relation"
-#: ../../Zotlabs/Module/Profiles.php:739 ../../Zotlabs/Widget/Newmember.php:53
+#: ../../Zotlabs/Module/Profiles.php:736 ../../Zotlabs/Widget/Newmember.php:44
#: ../../include/datetime.php:58
msgid "Miscellaneous"
msgstr "Divers"
-#: ../../Zotlabs/Module/Profiles.php:741
+#: ../../Zotlabs/Module/Profiles.php:738
msgid "Import profile from file"
msgstr "Importer le profil à partir d'un fichier"
-#: ../../Zotlabs/Module/Profiles.php:742
+#: ../../Zotlabs/Module/Profiles.php:739
msgid "Export profile to file"
msgstr "Exporter le profil vers un fichier."
-#: ../../Zotlabs/Module/Profiles.php:743
+#: ../../Zotlabs/Module/Profiles.php:740
msgid "Your gender"
msgstr "Votre genre"
-#: ../../Zotlabs/Module/Profiles.php:744
+#: ../../Zotlabs/Module/Profiles.php:741
msgid "Marital status"
msgstr "Etat civil"
-#: ../../Zotlabs/Module/Profiles.php:745
+#: ../../Zotlabs/Module/Profiles.php:742
msgid "Sexual preference"
msgstr "préférence sexuelle"
-#: ../../Zotlabs/Module/Profiles.php:748
+#: ../../Zotlabs/Module/Profiles.php:745
msgid "Profile name"
-msgstr "Nom du profile"
+msgstr "Nom du profil"
-#: ../../Zotlabs/Module/Profiles.php:750
+#: ../../Zotlabs/Module/Profiles.php:747
msgid "This is your default profile."
msgstr "Ceci est votre profil par défaut."
-#: ../../Zotlabs/Module/Profiles.php:752
+#: ../../Zotlabs/Module/Profiles.php:749
msgid "Your full name"
msgstr "Votre nom complet"
-#: ../../Zotlabs/Module/Profiles.php:753
+#: ../../Zotlabs/Module/Profiles.php:750
msgid "Title/Description"
msgstr "Titre/description"
-#: ../../Zotlabs/Module/Profiles.php:756
+#: ../../Zotlabs/Module/Profiles.php:753
msgid "Street address"
msgstr "Rue"
-#: ../../Zotlabs/Module/Profiles.php:757
+#: ../../Zotlabs/Module/Profiles.php:754
msgid "Locality/City"
msgstr "Ville"
-#: ../../Zotlabs/Module/Profiles.php:758
+#: ../../Zotlabs/Module/Profiles.php:755
msgid "Region/State"
msgstr "Région"
-#: ../../Zotlabs/Module/Profiles.php:759
+#: ../../Zotlabs/Module/Profiles.php:756
msgid "Postal/Zip code"
msgstr "Code postal"
-#: ../../Zotlabs/Module/Profiles.php:765
+#: ../../Zotlabs/Module/Profiles.php:762
msgid "Who (if applicable)"
msgstr "Qui (si applicable)"
-#: ../../Zotlabs/Module/Profiles.php:765
+#: ../../Zotlabs/Module/Profiles.php:762
msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
msgstr "Exemples&nbsp;: marie123, Marie Deschamps, marie@exemple.com"
-#: ../../Zotlabs/Module/Profiles.php:766
+#: ../../Zotlabs/Module/Profiles.php:763
msgid "Since (date)"
msgstr "Depuis (date)"
-#: ../../Zotlabs/Module/Profiles.php:769
+#: ../../Zotlabs/Module/Profiles.php:766
msgid "Tell us about yourself"
msgstr "Parlez nous de vous..."
-#: ../../Zotlabs/Module/Profiles.php:770
+#: ../../Zotlabs/Module/Profiles.php:767
#: ../../addon/openid/MysqlProvider.php:68
msgid "Homepage URL"
msgstr "URL de mon site Internet&nbsp;:"
-#: ../../Zotlabs/Module/Profiles.php:771
+#: ../../Zotlabs/Module/Profiles.php:768
msgid "Hometown"
msgstr "Ville de naissance"
-#: ../../Zotlabs/Module/Profiles.php:772
+#: ../../Zotlabs/Module/Profiles.php:769
msgid "Political views"
msgstr "Opinions politiques"
-#: ../../Zotlabs/Module/Profiles.php:773
+#: ../../Zotlabs/Module/Profiles.php:770
msgid "Religious views"
msgstr "Convictions religieuses"
-#: ../../Zotlabs/Module/Profiles.php:774
+#: ../../Zotlabs/Module/Profiles.php:771
msgid "Keywords used in directory listings"
msgstr "Mots clés pour l'annuaire"
-#: ../../Zotlabs/Module/Profiles.php:774
+#: ../../Zotlabs/Module/Profiles.php:771
msgid "Example: fishing photography software"
msgstr "Exemple&nbsp;: escrime photographie modélisme"
-#: ../../Zotlabs/Module/Profiles.php:777
+#: ../../Zotlabs/Module/Profiles.php:774
msgid "Musical interests"
msgstr "Goûts musicaux"
-#: ../../Zotlabs/Module/Profiles.php:778
+#: ../../Zotlabs/Module/Profiles.php:775
msgid "Books, literature"
msgstr "Livres, littérature"
-#: ../../Zotlabs/Module/Profiles.php:779
+#: ../../Zotlabs/Module/Profiles.php:776
msgid "Television"
msgstr "Télévision"
-#: ../../Zotlabs/Module/Profiles.php:780
+#: ../../Zotlabs/Module/Profiles.php:777
msgid "Film/Dance/Culture/Entertainment"
msgstr "Cinéma/Danse/Culture/Divertissement"
-#: ../../Zotlabs/Module/Profiles.php:781
+#: ../../Zotlabs/Module/Profiles.php:778
msgid "Hobbies/Interests"
msgstr "Loisirs/Centres d'intêret"
-#: ../../Zotlabs/Module/Profiles.php:782
+#: ../../Zotlabs/Module/Profiles.php:779
msgid "Love/Romance"
msgstr "Amour/Relation amoureuse"
-#: ../../Zotlabs/Module/Profiles.php:784
+#: ../../Zotlabs/Module/Profiles.php:781
msgid "School/Education"
msgstr "Niveau d'étude"
-#: ../../Zotlabs/Module/Profiles.php:785
+#: ../../Zotlabs/Module/Profiles.php:782
msgid "Contact information and social networks"
msgstr "Coordonnées et autres réseaux sociaux"
-#: ../../Zotlabs/Module/Profiles.php:786
+#: ../../Zotlabs/Module/Profiles.php:783
msgid "My other channels"
msgstr "Mes autres canaux"
-#: ../../Zotlabs/Module/Profiles.php:788
+#: ../../Zotlabs/Module/Profiles.php:785
msgid "Communications"
msgstr "Communications"
-#: ../../Zotlabs/Module/Profiles.php:823 ../../include/channel.php:1316
+#: ../../Zotlabs/Module/Profiles.php:820 ../../include/channel.php:1315
msgid "Profile Image"
msgstr "Image du profil"
-#: ../../Zotlabs/Module/Profiles.php:833 ../../include/channel.php:1297
+#: ../../Zotlabs/Module/Profiles.php:830 ../../include/channel.php:1296
#: ../../include/nav.php:117
msgid "Edit Profiles"
msgstr "Modifier mes profils"
@@ -6320,11 +6408,11 @@ msgstr "Téléverser une photo de couverture"
msgid "Edit your default profile"
msgstr "Modifier votre profil par défaut"
-#: ../../Zotlabs/Module/Go.php:38 ../../Zotlabs/Widget/Newmember.php:43
+#: ../../Zotlabs/Module/Go.php:38 ../../Zotlabs/Widget/Newmember.php:34
msgid "View friend suggestions"
msgstr "Voir les suggestions d'amis"
-#: ../../Zotlabs/Module/Go.php:39 ../../Zotlabs/Widget/Newmember.php:42
+#: ../../Zotlabs/Module/Go.php:39
msgid "View the channel directory"
msgstr "Voir l'annuaire des canaux"
@@ -6401,9 +6489,9 @@ msgstr "%d nouvelles relations"
msgid "Delegated Channel"
msgstr "Canaux délégués"
-#: ../../Zotlabs/Module/Cards.php:42 ../../Zotlabs/Module/Cards.php:181
-#: ../../Zotlabs/Lib/Apps.php:230 ../../include/conversation.php:1890
-#: ../../include/features.php:114 ../../include/nav.php:458
+#: ../../Zotlabs/Module/Cards.php:42 ../../Zotlabs/Module/Cards.php:194
+#: ../../Zotlabs/Lib/Apps.php:230 ../../include/conversation.php:1893
+#: ../../include/features.php:123 ../../include/nav.php:458
msgid "Cards"
msgstr "Cartes"
@@ -6495,7 +6583,7 @@ msgid "Export selected"
msgstr "Export sélectionné"
#: ../../Zotlabs/Module/Webpages.php:237 ../../Zotlabs/Lib/Apps.php:244
-#: ../../include/conversation.php:1912 ../../include/nav.php:481
+#: ../../include/conversation.php:1915 ../../include/nav.php:481
msgid "Webpages"
msgstr "Pages web"
@@ -6568,7 +6656,7 @@ msgstr "Renommer canal"
msgid "Item is not editable"
msgstr "Elément non modifiable"
-#: ../../Zotlabs/Module/Editpost.php:108 ../../Zotlabs/Module/Rpost.php:178
+#: ../../Zotlabs/Module/Editpost.php:108 ../../Zotlabs/Module/Rpost.php:144
msgid "Edit post"
msgstr "Modifier la publication"
@@ -6655,7 +6743,7 @@ msgid "*"
msgstr "*"
#: ../../Zotlabs/Module/Sources.php:96
-#: ../../Zotlabs/Widget/Settings_menu.php:125 ../../include/features.php:274
+#: ../../Zotlabs/Widget/Settings_menu.php:133 ../../include/features.php:292
msgid "Channel Sources"
msgstr "Sources du canal"
@@ -6746,165 +6834,169 @@ msgstr "Canal indisponible."
msgid "Previous action reversed."
msgstr "Action précédente annulée."
-#: ../../Zotlabs/Module/Like.php:436 ../../addon/diaspora/Receiver.php:1547
-#: ../../addon/pubcrawl/as.php:1394 ../../include/conversation.php:160
+#: ../../Zotlabs/Module/Like.php:438 ../../addon/diaspora/Receiver.php:1529
+#: ../../addon/pubcrawl/as.php:1423 ../../include/conversation.php:160
#, php-format
msgid "%1$s likes %2$s's %3$s"
msgstr "%1$s aime %3$s de %2$s"
-#: ../../Zotlabs/Module/Like.php:438 ../../addon/pubcrawl/as.php:1396
+#: ../../Zotlabs/Module/Like.php:440 ../../addon/pubcrawl/as.php:1425
#: ../../include/conversation.php:163
#, php-format
msgid "%1$s doesn't like %2$s's %3$s"
msgstr "%1$s n'aime pas %3$s de %2$s"
-#: ../../Zotlabs/Module/Like.php:440
+#: ../../Zotlabs/Module/Like.php:442
#, php-format
msgid "%1$s agrees with %2$s's %3$s"
msgstr "%1$s approuve %3$s de %2$s"
-#: ../../Zotlabs/Module/Like.php:442
+#: ../../Zotlabs/Module/Like.php:444
#, php-format
msgid "%1$s doesn't agree with %2$s's %3$s"
msgstr "%1$s n'est pas d'accord avec %3$s de %2$s"
-#: ../../Zotlabs/Module/Like.php:444
+#: ../../Zotlabs/Module/Like.php:446
#, php-format
msgid "%1$s abstains from a decision on %2$s's %3$s"
msgstr "%1$s s'abstient de toute décision sur le %3$s de %2$s"
-#: ../../Zotlabs/Module/Like.php:446 ../../addon/diaspora/Receiver.php:2031
+#: ../../Zotlabs/Module/Like.php:448 ../../addon/diaspora/Receiver.php:2072
#, php-format
msgid "%1$s is attending %2$s's %3$s"
msgstr "%1$s participe à %3$s de %2$s"
-#: ../../Zotlabs/Module/Like.php:448 ../../addon/diaspora/Receiver.php:2033
+#: ../../Zotlabs/Module/Like.php:450 ../../addon/diaspora/Receiver.php:2074
#, php-format
msgid "%1$s is not attending %2$s's %3$s"
msgstr "%1$s ne participe pas à %3$s de %2$s"
-#: ../../Zotlabs/Module/Like.php:450 ../../addon/diaspora/Receiver.php:2035
+#: ../../Zotlabs/Module/Like.php:452 ../../addon/diaspora/Receiver.php:2076
#, php-format
msgid "%1$s may attend %2$s's %3$s"
msgstr "%1$s participe peut-être à %3$s de %2$s"
-#: ../../Zotlabs/Module/Like.php:562
+#: ../../Zotlabs/Module/Like.php:564
msgid "Action completed."
msgstr "Action terminée."
-#: ../../Zotlabs/Module/Like.php:563
+#: ../../Zotlabs/Module/Like.php:565
msgid "Thank you."
msgstr "Merci."
-#: ../../Zotlabs/Module/Directory.php:250
+#: ../../Zotlabs/Module/Directory.php:106
+msgid "No default suggestions were found."
+msgstr "Aucune suggestion par défaut n'a été trouvée."
+
+#: ../../Zotlabs/Module/Directory.php:255
#, php-format
msgid "%d rating"
msgid_plural "%d ratings"
msgstr[0] "%d évaluation"
msgstr[1] "%d évaluations"
-#: ../../Zotlabs/Module/Directory.php:261
+#: ../../Zotlabs/Module/Directory.php:266
msgid "Gender: "
msgstr "Sexe/genre&nbsp;:"
-#: ../../Zotlabs/Module/Directory.php:263
+#: ../../Zotlabs/Module/Directory.php:268
msgid "Status: "
msgstr "État&nbsp;:"
-#: ../../Zotlabs/Module/Directory.php:265
+#: ../../Zotlabs/Module/Directory.php:270
msgid "Homepage: "
msgstr "Site web&nbsp;:"
-#: ../../Zotlabs/Module/Directory.php:314 ../../include/channel.php:1565
+#: ../../Zotlabs/Module/Directory.php:319 ../../include/channel.php:1564
msgid "Age:"
msgstr "Age&nbsp;:"
-#: ../../Zotlabs/Module/Directory.php:319 ../../include/channel.php:1392
+#: ../../Zotlabs/Module/Directory.php:324 ../../include/channel.php:1391
#: ../../include/event.php:54 ../../include/event.php:86
msgid "Location:"
msgstr "Emplacement&nbsp;:"
-#: ../../Zotlabs/Module/Directory.php:325
+#: ../../Zotlabs/Module/Directory.php:330
msgid "Description:"
msgstr "Description&nbsp;:"
-#: ../../Zotlabs/Module/Directory.php:330 ../../include/channel.php:1581
+#: ../../Zotlabs/Module/Directory.php:335 ../../include/channel.php:1593
msgid "Hometown:"
msgstr "Ville natale&nbsp;:"
-#: ../../Zotlabs/Module/Directory.php:332 ../../include/channel.php:1589
+#: ../../Zotlabs/Module/Directory.php:337 ../../include/channel.php:1599
msgid "About:"
msgstr "À propos&nbsp;:"
-#: ../../Zotlabs/Module/Directory.php:333 ../../Zotlabs/Module/Suggest.php:56
+#: ../../Zotlabs/Module/Directory.php:338 ../../Zotlabs/Module/Suggest.php:56
#: ../../Zotlabs/Widget/Follow.php:32 ../../Zotlabs/Widget/Suggestions.php:44
-#: ../../include/conversation.php:1052 ../../include/channel.php:1377
-#: ../../include/connections.php:111
+#: ../../include/conversation.php:1052 ../../include/channel.php:1376
+#: ../../include/connections.php:110
msgid "Connect"
msgstr "Ajouter/Suivre"
-#: ../../Zotlabs/Module/Directory.php:334
+#: ../../Zotlabs/Module/Directory.php:339
msgid "Public Forum:"
msgstr "Forum public&nbsp;:"
-#: ../../Zotlabs/Module/Directory.php:337
+#: ../../Zotlabs/Module/Directory.php:342
msgid "Keywords: "
msgstr "Mots-clefs&nbsp;:"
-#: ../../Zotlabs/Module/Directory.php:340
+#: ../../Zotlabs/Module/Directory.php:345
msgid "Don't suggest"
msgstr "Ne pas suggérer"
-#: ../../Zotlabs/Module/Directory.php:342
+#: ../../Zotlabs/Module/Directory.php:347
msgid "Common connections (estimated):"
msgstr "Connexions communes (estimation) :"
-#: ../../Zotlabs/Module/Directory.php:391
+#: ../../Zotlabs/Module/Directory.php:396
msgid "Global Directory"
msgstr "Annuaire global"
-#: ../../Zotlabs/Module/Directory.php:391
+#: ../../Zotlabs/Module/Directory.php:396
msgid "Local Directory"
msgstr "Annuaire local"
-#: ../../Zotlabs/Module/Directory.php:397
+#: ../../Zotlabs/Module/Directory.php:402
msgid "Finding:"
msgstr "Recherche&nbsp;:"
-#: ../../Zotlabs/Module/Directory.php:400 ../../Zotlabs/Module/Suggest.php:64
+#: ../../Zotlabs/Module/Directory.php:405 ../../Zotlabs/Module/Suggest.php:64
#: ../../include/contact_widgets.php:24
msgid "Channel Suggestions"
msgstr "Canaux suggérés"
-#: ../../Zotlabs/Module/Directory.php:402
+#: ../../Zotlabs/Module/Directory.php:407
msgid "next page"
msgstr "page suivante"
-#: ../../Zotlabs/Module/Directory.php:402
+#: ../../Zotlabs/Module/Directory.php:407
msgid "previous page"
msgstr "page précédente"
-#: ../../Zotlabs/Module/Directory.php:403
+#: ../../Zotlabs/Module/Directory.php:408
msgid "Sort options"
msgstr "Options de tri"
-#: ../../Zotlabs/Module/Directory.php:404
+#: ../../Zotlabs/Module/Directory.php:409
msgid "Alphabetic"
msgstr "Alphabétique"
-#: ../../Zotlabs/Module/Directory.php:405
+#: ../../Zotlabs/Module/Directory.php:410
msgid "Reverse Alphabetic"
msgstr "Alphabétique inversé"
-#: ../../Zotlabs/Module/Directory.php:406
+#: ../../Zotlabs/Module/Directory.php:411
msgid "Newest to Oldest"
msgstr "Du plus récent au moins récent"
-#: ../../Zotlabs/Module/Directory.php:407
+#: ../../Zotlabs/Module/Directory.php:412
msgid "Oldest to Newest"
msgstr "Du moins récent du plus récent"
-#: ../../Zotlabs/Module/Directory.php:424
+#: ../../Zotlabs/Module/Directory.php:429
msgid "No entries (some entries may be hidden)."
msgstr "Pas d'entrées (certaines peuvent être cachées)."
@@ -6987,7 +7079,7 @@ msgid "Subject:"
msgstr "Objet&nbsp;:"
#: ../../Zotlabs/Module/Mail.php:287 ../../Zotlabs/Module/Mail.php:429
-#: ../../include/conversation.php:1382
+#: ../../include/conversation.php:1385
msgid "Attach file"
msgstr "Joindre un fichier"
@@ -6996,7 +7088,7 @@ msgid "Send"
msgstr "Envoyer"
#: ../../Zotlabs/Module/Mail.php:292 ../../Zotlabs/Module/Mail.php:434
-#: ../../include/conversation.php:1427
+#: ../../include/conversation.php:1430
msgid "Set expiration date"
msgstr "Définir la date d'expiration"
@@ -7218,7 +7310,7 @@ msgstr "oui"
msgid "Membership on this site is by invitation only."
msgstr "L'inscription à ce site se fait uniquement sur invitation."
-#: ../../Zotlabs/Module/Register.php:286 ../../boot.php:1563
+#: ../../Zotlabs/Module/Register.php:286 ../../boot.php:1570
#: ../../include/nav.php:164
msgid "Register"
msgstr "S'inscrire"
@@ -7234,30 +7326,30 @@ msgstr "Ce site nécessite une vérification par courriel. Après avoir rempli c
msgid "Cover Photos"
msgstr "Photos de couverture"
-#: ../../Zotlabs/Module/Cover_photo.php:237 ../../include/items.php:4508
+#: ../../Zotlabs/Module/Cover_photo.php:237 ../../include/items.php:4558
msgid "female"
msgstr "femme"
-#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4509
+#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4559
#, php-format
msgid "%1$s updated her %2$s"
msgstr "%1$s a mis à jour son %2$s"
-#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/items.php:4510
+#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/items.php:4560
msgid "male"
msgstr "homme"
-#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/items.php:4511
+#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/items.php:4561
#, php-format
msgid "%1$s updated his %2$s"
msgstr "%1$s a mis à jour son %2$s"
-#: ../../Zotlabs/Module/Cover_photo.php:242 ../../include/items.php:4513
+#: ../../Zotlabs/Module/Cover_photo.php:242 ../../include/items.php:4563
#, php-format
msgid "%1$s updated their %2$s"
msgstr "%1$s a mis a jour sa %2$s"
-#: ../../Zotlabs/Module/Cover_photo.php:244 ../../include/channel.php:2059
+#: ../../Zotlabs/Module/Cover_photo.php:244 ../../include/channel.php:2070
msgid "cover photo"
msgstr "Photo principale"
@@ -7269,7 +7361,7 @@ msgstr "Changer la photo de couverture"
msgid "Documentation Search"
msgstr "Chercher dans la documentation"
-#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1821
+#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1824
#: ../../include/nav.php:391
msgid "About"
msgstr "À propos"
@@ -7294,11 +7386,11 @@ msgstr "Documentation $Projectname"
msgid "Contents"
msgstr "Contenus"
-#: ../../Zotlabs/Module/Display.php:351
+#: ../../Zotlabs/Module/Display.php:394
msgid "Article"
msgstr "Article"
-#: ../../Zotlabs/Module/Display.php:403
+#: ../../Zotlabs/Module/Display.php:446
msgid "Item has been removed."
msgstr "L'élément a été supprimé."
@@ -7543,7 +7635,7 @@ msgid ""
"Password reset failed."
msgstr "La demande n'a pas pu être vérifiée. (Peut-être l'avez vous déjà utilisée.) La réinitialisation a échoué."
-#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1591
+#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1598
msgid "Password Reset"
msgstr "Réinitialiser le mot de passe"
@@ -7641,11 +7733,11 @@ msgstr "Partager via Firefox"
msgid "Remote Diagnostics"
msgstr "Diagnostiques à distance"
-#: ../../Zotlabs/Lib/Apps.php:238 ../../include/features.php:390
+#: ../../Zotlabs/Lib/Apps.php:238 ../../include/features.php:417
msgid "Suggest Channels"
msgstr "Suggérer des canaux"
-#: ../../Zotlabs/Lib/Apps.php:239 ../../boot.php:1582
+#: ../../Zotlabs/Lib/Apps.php:239 ../../boot.php:1589
#: ../../include/nav.php:126 ../../include/nav.php:130
msgid "Login"
msgstr "Connexion"
@@ -7654,8 +7746,8 @@ msgstr "Connexion"
msgid "Activity"
msgstr "Activité"
-#: ../../Zotlabs/Lib/Apps.php:245 ../../include/conversation.php:1928
-#: ../../include/features.php:87 ../../include/nav.php:497
+#: ../../Zotlabs/Lib/Apps.php:245 ../../include/conversation.php:1931
+#: ../../include/features.php:96 ../../include/nav.php:497
msgid "Wiki"
msgstr "Wiki"
@@ -7663,8 +7755,8 @@ msgstr "Wiki"
msgid "Channel Home"
msgstr "Mon canal"
-#: ../../Zotlabs/Lib/Apps.php:249 ../../include/conversation.php:1850
-#: ../../include/conversation.php:1853
+#: ../../Zotlabs/Lib/Apps.php:249 ../../include/conversation.php:1853
+#: ../../include/conversation.php:1856
msgid "Events"
msgstr "Événements"
@@ -7821,9 +7913,8 @@ msgctxt "wiki_history"
msgid "Message"
msgstr "Message"
-#: ../../Zotlabs/Lib/NativeWikiPage.php:597
-#: ../../addon/gitwiki/gitwiki_backend.php:579 ../../include/bbcode.php:706
-#: ../../include/bbcode.php:865
+#: ../../Zotlabs/Lib/NativeWikiPage.php:597 ../../include/bbcode.php:744
+#: ../../include/bbcode.php:914
msgid "Different viewers will see this text differently"
msgstr "Ce texte aura un rendu différent en fonction des utilisateurs"
@@ -7945,61 +8036,61 @@ msgstr "Pour ne plus recevoir ces messages, veuillez ajuster vos paramètres de
msgid "To stop receiving these messages, please adjust your %s."
msgstr "Pour ne plus recevoir ces messages, veuillez ajuster votre %s."
-#: ../../Zotlabs/Lib/Enotify.php:120
+#: ../../Zotlabs/Lib/Enotify.php:123
#, php-format
msgid "%s <!item_type!>"
msgstr "%s <!item_type!>"
-#: ../../Zotlabs/Lib/Enotify.php:124
+#: ../../Zotlabs/Lib/Enotify.php:127
#, php-format
msgid "[$Projectname:Notify] New mail received at %s"
msgstr "[$Projectname:Notify] Nouveau mail reçu sur %s"
-#: ../../Zotlabs/Lib/Enotify.php:126
+#: ../../Zotlabs/Lib/Enotify.php:129
#, php-format
-msgid "%1$s, %2$s sent you a new private message at %3$s."
-msgstr "%1$s, vous avez reçu un message privé sur %3$s, de la part de %2$s."
+msgid "%1$s sent you a new private message at %2$s."
+msgstr "%1$s vous a envoyé un nouveau message privé à %2$s."
-#: ../../Zotlabs/Lib/Enotify.php:127
+#: ../../Zotlabs/Lib/Enotify.php:130
#, php-format
msgid "%1$s sent you %2$s."
msgstr "%1$s vous a envoyé %2$s."
-#: ../../Zotlabs/Lib/Enotify.php:127
+#: ../../Zotlabs/Lib/Enotify.php:130
msgid "a private message"
msgstr "un message privé"
-#: ../../Zotlabs/Lib/Enotify.php:128
+#: ../../Zotlabs/Lib/Enotify.php:131
#, php-format
msgid "Please visit %s to view and/or reply to your private messages."
msgstr "Merci de visiter %s pour voir et/ou répondre à vos messages privés."
-#: ../../Zotlabs/Lib/Enotify.php:141
+#: ../../Zotlabs/Lib/Enotify.php:144
msgid "commented on"
msgstr "commenté"
-#: ../../Zotlabs/Lib/Enotify.php:152
+#: ../../Zotlabs/Lib/Enotify.php:155
msgid "liked"
msgstr "aimé"
-#: ../../Zotlabs/Lib/Enotify.php:155
+#: ../../Zotlabs/Lib/Enotify.php:158
msgid "disliked"
msgstr "pas aimé"
-#: ../../Zotlabs/Lib/Enotify.php:198
+#: ../../Zotlabs/Lib/Enotify.php:201
#, php-format
-msgid "%1$s, %2$s %3$s [zrl=%4$s]a %5$s[/zrl]"
-msgstr "%1$s, %2$s %3$s [zrl=%4$s]a %5$s[/zrl]"
+msgid "%1$s %2$s [zrl=%3$s]a %4$s[/zrl]"
+msgstr "%1$s %2$s [zrl=%3$s]a %4$s[/zrl]"
-#: ../../Zotlabs/Lib/Enotify.php:207
+#: ../../Zotlabs/Lib/Enotify.php:209
#, php-format
-msgid "%1$s, %2$s %3$s [zrl=%4$s]%5$s's %6$s[/zrl]"
-msgstr "%1$s, %2$s %3$s [zrl=%4$s]%5$s's %6$s[/zrl]"
+msgid "%1$s %2$s [zrl=%3$s]%4$s's %5$s[/zrl]"
+msgstr "%1$s %2$s [zrl=%3$s]%4$s de %5$s[/zrl]"
-#: ../../Zotlabs/Lib/Enotify.php:217
+#: ../../Zotlabs/Lib/Enotify.php:218
#, php-format
-msgid "%1$s, %2$s %3$s [zrl=%4$s]your %5$s[/zrl]"
-msgstr "%1$s, %2$s %3$s [zrl=%4$s]votre %5$s[/zrl]"
+msgid "%1$s %2$s [zrl=%3$s]your %4$s[/zrl]"
+msgstr "%1$s %2$s [zrl=%3$s]votre %4$s[/zrl]"
#: ../../Zotlabs/Lib/Enotify.php:230
#, php-format
@@ -8013,12 +8104,12 @@ msgstr "[$Projectname:Notify] Commentaire effectué sur la conversation #%1$d pa
#: ../../Zotlabs/Lib/Enotify.php:233
#, php-format
-msgid "%1$s, %2$s commented on an item/conversation you have been following."
-msgstr "%1$s, %2$s a commenté un élément de conversation que vous suivez."
+msgid "%1$s commented on an item/conversation you have been following."
+msgstr "%1$sa commenté un élément ou une conversation que vous suivez."
-#: ../../Zotlabs/Lib/Enotify.php:236 ../../Zotlabs/Lib/Enotify.php:318
-#: ../../Zotlabs/Lib/Enotify.php:335 ../../Zotlabs/Lib/Enotify.php:361
-#: ../../Zotlabs/Lib/Enotify.php:379 ../../Zotlabs/Lib/Enotify.php:393
+#: ../../Zotlabs/Lib/Enotify.php:236 ../../Zotlabs/Lib/Enotify.php:317
+#: ../../Zotlabs/Lib/Enotify.php:333 ../../Zotlabs/Lib/Enotify.php:358
+#: ../../Zotlabs/Lib/Enotify.php:375 ../../Zotlabs/Lib/Enotify.php:388
#, php-format
msgid "Please visit %s to view and/or reply to the conversation."
msgstr "Merci de visiter %s pour voir et/ou répondre sur cette conversation."
@@ -8030,152 +8121,150 @@ msgstr "Merci de visiter %spour valider ou rejeter ce commentaire."
#: ../../Zotlabs/Lib/Enotify.php:299
#, php-format
-msgid "%1$s, %2$s liked [zrl=%3$s]your %4$s[/zrl]"
-msgstr "%1$s, %2$s aiment [zrl=%3$s]votre %4$s[/zrl]"
+msgid "%1$s liked [zrl=%2$s]your %3$s[/zrl]"
+msgstr "%1$s aime [zrl=%2$s]votre %3$s[/zrl]"
-#: ../../Zotlabs/Lib/Enotify.php:314
+#: ../../Zotlabs/Lib/Enotify.php:313
#, php-format
msgid "[$Projectname:Notify] Like received to conversation #%1$d by %2$s"
msgstr "[$Projectname:Notify] Aime reçu à la convesation #%1$d par %2$s"
-#: ../../Zotlabs/Lib/Enotify.php:315
+#: ../../Zotlabs/Lib/Enotify.php:314
#, php-format
-msgid "%1$s, %2$s liked an item/conversation you created."
-msgstr "%1$s, %2$s a aimé un élément ou une conversation que vous avez créée."
+msgid "%1$s liked an item/conversation you created."
+msgstr "%1$sa commenté un élément ou une conversation que vous avez créée "
-#: ../../Zotlabs/Lib/Enotify.php:326
+#: ../../Zotlabs/Lib/Enotify.php:325
#, php-format
msgid "[$Projectname:Notify] %s posted to your profile wall"
msgstr "[$Projectname:Notify] %s a publié sur le mur de votre profil"
-#: ../../Zotlabs/Lib/Enotify.php:328
+#: ../../Zotlabs/Lib/Enotify.php:327
#, php-format
-msgid "%1$s, %2$s posted to your profile wall at %3$s"
-msgstr "%1$s, %2$s a publié sur votre profil à %3$s"
+msgid "%1$s posted to your profile wall at %2$s"
+msgstr "%1$s a posté sur le mur de votre profil à %2$s"
-#: ../../Zotlabs/Lib/Enotify.php:330
+#: ../../Zotlabs/Lib/Enotify.php:329
#, php-format
-msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
-msgstr "%1$s, %2$s a publié sur [zrl=%3$s]votre profil[/zrl]"
+msgid "%1$s posted to [zrl=%2$s]your wall[/zrl]"
+msgstr "%1$s envoyé à [zrl=%2$s]votre mur[/zrl]"
-#: ../../Zotlabs/Lib/Enotify.php:354
+#: ../../Zotlabs/Lib/Enotify.php:352
#, php-format
msgid "[$Projectname:Notify] %s tagged you"
msgstr "[$Projectname:Notify] %s vous a étiquetté"
-#: ../../Zotlabs/Lib/Enotify.php:355
+#: ../../Zotlabs/Lib/Enotify.php:353
#, php-format
-msgid "%1$s, %2$s tagged you at %3$s"
-msgstr "%1$s, vous avez été étiqueté sur %3$s par %2$s"
+msgid "%1$s tagged you at %2$s"
+msgstr "%1$s vous a étiqueté à %2$s"
-#: ../../Zotlabs/Lib/Enotify.php:356
+#: ../../Zotlabs/Lib/Enotify.php:354
#, php-format
-msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
-msgstr "%1$s, %2$s [zrl=%3$s]vous a étiqueté[/zrl]."
+msgid "%1$s [zrl=%2$s]tagged you[/zrl]."
+msgstr "%1$s [zrl=%2$s]vous a étiqueté[/zrl]."
-#: ../../Zotlabs/Lib/Enotify.php:368
+#: ../../Zotlabs/Lib/Enotify.php:365
#, php-format
msgid "[$Projectname:Notify] %1$s poked you"
msgstr "[$Projectname:Notify] %1$s vous a poké"
-#: ../../Zotlabs/Lib/Enotify.php:369
+#: ../../Zotlabs/Lib/Enotify.php:366
#, php-format
-msgid "%1$s, %2$s poked you at %3$s"
-msgstr "%1$s, %2$s vous a tapoté sur %3$s"
+msgid "%1$s poked you at %2$s"
+msgstr "%1$s vous a tapoté à %2$s"
-#: ../../Zotlabs/Lib/Enotify.php:370
+#: ../../Zotlabs/Lib/Enotify.php:367
#, php-format
-msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
-msgstr "%1$s, %2$s [zrl=%2$s]vous a tapoté[/zrl]."
+msgid "%1$s [zrl=%2$s]poked you[/zrl]."
+msgstr "%1$s [zrl=%2$s]vous a tapoté[/zrl]."
-#: ../../Zotlabs/Lib/Enotify.php:386
+#: ../../Zotlabs/Lib/Enotify.php:382
#, php-format
msgid "[$Projectname:Notify] %s tagged your post"
msgstr "[$Projectname:Notify] %s a étiquetté votre publication"
-#: ../../Zotlabs/Lib/Enotify.php:387
+#: ../../Zotlabs/Lib/Enotify.php:383
#, php-format
-msgid "%1$s, %2$s tagged your post at %3$s"
-msgstr "%1$s, %2$s a étiqueté votre publication sur %3$s"
+msgid "%1$s tagged your post at %2$s"
+msgstr "%1$s a étiqueté votre message à %2$s"
-#: ../../Zotlabs/Lib/Enotify.php:388
+#: ../../Zotlabs/Lib/Enotify.php:384
#, php-format
-msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
-msgstr "%1$s, %2$s a étiqueté [zrl=%3$s]votre publication[/zrl]"
+msgid "%1$s tagged [zrl=%2$s]your post[/zrl]"
+msgstr "%1$s a étiqueté [zrl=%2$s]votre message[/zrl]"
-#: ../../Zotlabs/Lib/Enotify.php:400
+#: ../../Zotlabs/Lib/Enotify.php:395
msgid "[$Projectname:Notify] Introduction received"
msgstr "[$Projectname:Notify] Demande de relation reçue"
-#: ../../Zotlabs/Lib/Enotify.php:401
+#: ../../Zotlabs/Lib/Enotify.php:396
#, php-format
-msgid "%1$s, you've received an new connection request from '%2$s' at %3$s"
-msgstr "%1$s, vous avez reçu une demande de contact de '%2$s' sur %3$s"
+msgid "You've received an new connection request from '%1$s' at %2$s"
+msgstr "Vous avez reçu une nouvelle demande de connexion de la part de '%1$s' à %2$s"
-#: ../../Zotlabs/Lib/Enotify.php:402
+#: ../../Zotlabs/Lib/Enotify.php:397
#, php-format
-msgid ""
-"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s."
-msgstr "%1$s, vous avez reçu [zrl=%2$s]une demande de contact[/zrl] de %3$s."
+msgid "You've received [zrl=%1$s]a new connection request[/zrl] from %2$s."
+msgstr "Vous avez reçu [zrl=%1$s]une nouvelle demande de connexion[/zrl] de la part de %2$s."
-#: ../../Zotlabs/Lib/Enotify.php:406 ../../Zotlabs/Lib/Enotify.php:425
+#: ../../Zotlabs/Lib/Enotify.php:400 ../../Zotlabs/Lib/Enotify.php:418
#, php-format
msgid "You may visit their profile at %s"
msgstr "Vous pouvez visiter leur profil sur %s"
-#: ../../Zotlabs/Lib/Enotify.php:408
+#: ../../Zotlabs/Lib/Enotify.php:402
#, php-format
msgid "Please visit %s to approve or reject the connection request."
msgstr "Merci de visiter %s pour valider (ou non) cette demande de contact."
-#: ../../Zotlabs/Lib/Enotify.php:415
+#: ../../Zotlabs/Lib/Enotify.php:409
msgid "[$Projectname:Notify] Friend suggestion received"
msgstr "[$Projectname:Notify] Suggestion d'amitié reçue"
-#: ../../Zotlabs/Lib/Enotify.php:416
+#: ../../Zotlabs/Lib/Enotify.php:410
#, php-format
-msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
-msgstr "%1$s, vous avez reçu une suggestion d'ami(e) de '%2$s' à %3$s"
+msgid "You've received a friend suggestion from '%1$s' at %2$s"
+msgstr "Vous avez reçu une suggestion d'ami de la part de '%1$s' à %2$s"
-#: ../../Zotlabs/Lib/Enotify.php:417
+#: ../../Zotlabs/Lib/Enotify.php:411
#, php-format
msgid ""
-"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from "
-"%4$s."
-msgstr "%1$s, avez reçu %3$s comme [zrl=%2$s]une suggestion d'ami(e)[/zrl] de %4$s."
+"You've received [zrl=%1$s]a friend suggestion[/zrl] for %2$s from %3$s."
+msgstr "Vous avez reçu [zrl=%1$s]une suggestion d'ami[/zrl] pour %2$s de %3$s."
-#: ../../Zotlabs/Lib/Enotify.php:423
+#: ../../Zotlabs/Lib/Enotify.php:416
msgid "Name:"
msgstr "Nom&nbsp;:"
-#: ../../Zotlabs/Lib/Enotify.php:424
+#: ../../Zotlabs/Lib/Enotify.php:417
msgid "Photo:"
msgstr "Photo&nbsp;:"
-#: ../../Zotlabs/Lib/Enotify.php:427
+#: ../../Zotlabs/Lib/Enotify.php:420
#, php-format
msgid "Please visit %s to approve or reject the suggestion."
msgstr "Merci de visiter %s pour valider ou rejeter cette suggestion."
-#: ../../Zotlabs/Lib/Enotify.php:647
+#: ../../Zotlabs/Lib/Enotify.php:640
msgid "[$Projectname:Notify]"
msgstr "[$Projectname:Notify]"
-#: ../../Zotlabs/Lib/Enotify.php:815
+#: ../../Zotlabs/Lib/Enotify.php:808
msgid "created a new post"
msgstr "a publié un nouveau message"
-#: ../../Zotlabs/Lib/Enotify.php:816
+#: ../../Zotlabs/Lib/Enotify.php:809
#, php-format
msgid "commented on %s's post"
msgstr "a commenté la publication de %s"
-#: ../../Zotlabs/Lib/Enotify.php:823
+#: ../../Zotlabs/Lib/Enotify.php:816
#, php-format
msgid "edited a post dated %s"
msgstr "a édité un post daté du %s"
-#: ../../Zotlabs/Lib/Enotify.php:827
+#: ../../Zotlabs/Lib/Enotify.php:820
#, php-format
msgid "edited a comment dated %s"
msgstr "a édité un commentaire daté du %s"
@@ -8258,11 +8347,11 @@ msgstr "Signature du message incorrecte"
msgid "Add Tag"
msgstr "Ajouter une étiquette"
-#: ../../Zotlabs/Lib/ThreadItem.php:281 ../../include/taxonomy.php:510
+#: ../../Zotlabs/Lib/ThreadItem.php:281 ../../include/taxonomy.php:514
msgid "like"
msgstr "aiment"
-#: ../../Zotlabs/Lib/ThreadItem.php:282 ../../include/taxonomy.php:511
+#: ../../Zotlabs/Lib/ThreadItem.php:282 ../../include/taxonomy.php:515
msgid "dislike"
msgstr "n'aiment pas"
@@ -8355,51 +8444,51 @@ msgstr "Il s'agit d'une prévisualisation non sauvegardée."
msgid "%s show all"
msgstr "%s montre tout"
-#: ../../Zotlabs/Lib/ThreadItem.php:751 ../../include/conversation.php:1377
+#: ../../Zotlabs/Lib/ThreadItem.php:753 ../../include/conversation.php:1380
msgid "Bold"
msgstr "Gras"
-#: ../../Zotlabs/Lib/ThreadItem.php:752 ../../include/conversation.php:1378
+#: ../../Zotlabs/Lib/ThreadItem.php:754 ../../include/conversation.php:1381
msgid "Italic"
msgstr "Italique"
-#: ../../Zotlabs/Lib/ThreadItem.php:753 ../../include/conversation.php:1379
+#: ../../Zotlabs/Lib/ThreadItem.php:755 ../../include/conversation.php:1382
msgid "Underline"
msgstr "Souligné"
-#: ../../Zotlabs/Lib/ThreadItem.php:754 ../../include/conversation.php:1380
+#: ../../Zotlabs/Lib/ThreadItem.php:756 ../../include/conversation.php:1383
msgid "Quote"
msgstr "Citation"
-#: ../../Zotlabs/Lib/ThreadItem.php:755 ../../include/conversation.php:1381
+#: ../../Zotlabs/Lib/ThreadItem.php:757 ../../include/conversation.php:1384
msgid "Code"
msgstr "Code"
-#: ../../Zotlabs/Lib/ThreadItem.php:756
+#: ../../Zotlabs/Lib/ThreadItem.php:758
msgid "Image"
msgstr "Image"
-#: ../../Zotlabs/Lib/ThreadItem.php:757
+#: ../../Zotlabs/Lib/ThreadItem.php:759
msgid "Attach File"
msgstr "Joindre fichier"
-#: ../../Zotlabs/Lib/ThreadItem.php:758
+#: ../../Zotlabs/Lib/ThreadItem.php:760
msgid "Insert Link"
msgstr "Insérer un lien"
-#: ../../Zotlabs/Lib/ThreadItem.php:759
+#: ../../Zotlabs/Lib/ThreadItem.php:761
msgid "Video"
msgstr "Vidéo"
-#: ../../Zotlabs/Lib/ThreadItem.php:769
+#: ../../Zotlabs/Lib/ThreadItem.php:771
msgid "Your full name (required)"
msgstr "Votre nom complet (obligatoire)"
-#: ../../Zotlabs/Lib/ThreadItem.php:770
+#: ../../Zotlabs/Lib/ThreadItem.php:772
msgid "Your email address (required)"
msgstr "Votre adresse de courriel (obligatoire)"
-#: ../../Zotlabs/Lib/ThreadItem.php:771
+#: ../../Zotlabs/Lib/ThreadItem.php:773
msgid "Your website URL (optional)"
msgstr "L'adresse de votre site web (optionelle)"
@@ -8419,7 +8508,7 @@ msgstr "Bienvenue %s. L'authentification distante a fonctionné."
msgid "parent"
msgstr "retour"
-#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2821
+#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2828
msgid "Collection"
msgstr "Groupe de contacts"
@@ -8452,6 +8541,10 @@ msgstr "Total"
msgid "Shared"
msgstr "Partagé"
+#: ../../Zotlabs/Storage/Browser.php:277
+msgid "Add Files"
+msgstr "Ajouter des fichiers"
+
#: ../../Zotlabs/Storage/Browser.php:353
#, php-format
msgid "You are using %1$s of your available file storage."
@@ -8559,10 +8652,10 @@ msgid "Select an addressbook to import to"
msgstr "Sélectionner un carnet d'adresses à importer dans"
#: ../../Zotlabs/Widget/Appcategories.php:40
-#: ../../Zotlabs/Widget/Tagcloud.php:25 ../../include/contact_widgets.php:97
-#: ../../include/contact_widgets.php:141 ../../include/contact_widgets.php:186
-#: ../../include/taxonomy.php:344 ../../include/taxonomy.php:426
-#: ../../include/taxonomy.php:446 ../../include/taxonomy.php:467
+#: ../../include/contact_widgets.php:97 ../../include/contact_widgets.php:141
+#: ../../include/contact_widgets.php:186 ../../include/taxonomy.php:348
+#: ../../include/taxonomy.php:430 ../../include/taxonomy.php:450
+#: ../../include/taxonomy.php:471
msgid "Categories"
msgstr "Catégories"
@@ -8617,7 +8710,7 @@ msgid "New Message"
msgstr "Nouveau message"
#: ../../Zotlabs/Widget/Chatroom_list.php:16
-#: ../../include/conversation.php:1864 ../../include/conversation.php:1867
+#: ../../include/conversation.php:1867 ../../include/conversation.php:1870
#: ../../include/nav.php:434 ../../include/nav.php:437
msgid "Chatrooms"
msgstr "Salons de clavardage"
@@ -8660,7 +8753,7 @@ msgstr "Saisissez l'adresse du canal"
msgid "Examples: bob@example.com, https://example.com/barbara"
msgstr "Exemples&nbsp;: pierre@exemple.com, https://exemple.com/sophie"
-#: ../../Zotlabs/Widget/Wiki_list.php:15 ../../addon/gitwiki/gitwiki.php:95
+#: ../../Zotlabs/Widget/Wiki_list.php:15
msgid "Wiki List"
msgstr "Liste de wikis"
@@ -8700,7 +8793,7 @@ msgstr "photo/image"
msgid "Remove term"
msgstr "Retirer le terme"
-#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:354
+#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:381
msgid "Saved Searches"
msgstr "Recherches sauvegardées"
@@ -8713,15 +8806,15 @@ msgid "Notes"
msgstr "Notes"
#: ../../Zotlabs/Widget/Wiki_pages.php:32
-#: ../../Zotlabs/Widget/Wiki_pages.php:89 ../../addon/gitwiki/gitwiki.php:81
+#: ../../Zotlabs/Widget/Wiki_pages.php:89
msgid "Add new page"
msgstr "Ajouter une nouvelle page"
-#: ../../Zotlabs/Widget/Wiki_pages.php:83 ../../addon/gitwiki/gitwiki.php:76
+#: ../../Zotlabs/Widget/Wiki_pages.php:83
msgid "Wiki Pages"
msgstr "Pages wiki"
-#: ../../Zotlabs/Widget/Wiki_pages.php:94 ../../addon/gitwiki/gitwiki.php:82
+#: ../../Zotlabs/Widget/Wiki_pages.php:94
msgid "Page name"
msgstr "Nom de la page"
@@ -8742,7 +8835,7 @@ msgid "See more..."
msgstr "Voir plus..."
#: ../../Zotlabs/Widget/Filer.php:28 ../../include/contact_widgets.php:53
-#: ../../include/features.php:443
+#: ../../include/features.php:470
msgid "Saved Folders"
msgstr "Dossiers sauvegardés"
@@ -8750,51 +8843,60 @@ msgstr "Dossiers sauvegardés"
msgid "Click to show more"
msgstr "Cliquer pour voir plus"
-#: ../../Zotlabs/Widget/Newmember.php:33
+#: ../../Zotlabs/Widget/Tagcloud.php:22 ../../include/taxonomy.php:388
+#: ../../include/taxonomy.php:409
+msgid "Tags"
+msgstr "Étiquettes"
+
+#: ../../Zotlabs/Widget/Newmember.php:24
msgid "Profile Creation"
msgstr "Création de profil"
-#: ../../Zotlabs/Widget/Newmember.php:35
+#: ../../Zotlabs/Widget/Newmember.php:26
msgid "Upload profile photo"
msgstr "Téléverser la photo du profil"
-#: ../../Zotlabs/Widget/Newmember.php:36
+#: ../../Zotlabs/Widget/Newmember.php:27
msgid "Upload cover photo"
msgstr "Téléverser la photo de couverture"
-#: ../../Zotlabs/Widget/Newmember.php:37 ../../include/nav.php:119
+#: ../../Zotlabs/Widget/Newmember.php:28 ../../include/nav.php:119
msgid "Edit your profile"
msgstr "Modifier votre profil"
-#: ../../Zotlabs/Widget/Newmember.php:40
+#: ../../Zotlabs/Widget/Newmember.php:31
msgid "Find and Connect with others"
msgstr "Trouver et connecter avec des autres personnes"
-#: ../../Zotlabs/Widget/Newmember.php:44
+#: ../../Zotlabs/Widget/Newmember.php:33
+msgid "View the directory"
+msgstr "Voir l'annuaire"
+
+#: ../../Zotlabs/Widget/Newmember.php:35
msgid "Manage your connections"
msgstr "Gérez vos connexions"
-#: ../../Zotlabs/Widget/Newmember.php:47
+#: ../../Zotlabs/Widget/Newmember.php:38
msgid "Communicate"
msgstr "Communiquer"
-#: ../../Zotlabs/Widget/Newmember.php:49
+#: ../../Zotlabs/Widget/Newmember.php:40
msgid "View your channel homepage"
msgstr "Voir la page d'accueil de votre canal"
-#: ../../Zotlabs/Widget/Newmember.php:50
+#: ../../Zotlabs/Widget/Newmember.php:41
msgid "View your network stream"
msgstr "Visualisez votre flux réseau"
-#: ../../Zotlabs/Widget/Newmember.php:56
+#: ../../Zotlabs/Widget/Newmember.php:47
msgid "Documentation"
msgstr "Documentation"
-#: ../../Zotlabs/Widget/Newmember.php:67
-msgid "View public stream. Warning: not moderated"
-msgstr "Voir le flux public. Avertissement : non modéré"
+#: ../../Zotlabs/Widget/Newmember.php:58
+msgid "View public stream"
+msgstr "Voir le flux public"
-#: ../../Zotlabs/Widget/Newmember.php:71
+#: ../../Zotlabs/Widget/Newmember.php:62 ../../include/features.php:60
msgid "New Member Links"
msgstr "Liens pour les nouveaux membres"
@@ -8847,14 +8949,18 @@ msgid "Export channel"
msgstr "Exporter le canal"
#: ../../Zotlabs/Widget/Settings_menu.php:84
-msgid "Connected apps"
-msgstr "Applications connectées"
+msgid "OAuth1 apps"
+msgstr "OAuth1 applications"
+
+#: ../../Zotlabs/Widget/Settings_menu.php:92
+msgid "OAuth2 apps"
+msgstr "OAuth2 applications"
-#: ../../Zotlabs/Widget/Settings_menu.php:100 ../../include/features.php:231
+#: ../../Zotlabs/Widget/Settings_menu.php:108 ../../include/features.php:240
msgid "Permission Groups"
msgstr "Groupes d'accès"
-#: ../../Zotlabs/Widget/Settings_menu.php:117
+#: ../../Zotlabs/Widget/Settings_menu.php:125
msgid "Premium Channel Settings"
msgstr "Paramètres de canal VIP"
@@ -8992,50 +9098,50 @@ msgstr "Désolé, vous n'avez pas de notifications pour le moment."
msgid "Source channel not found."
msgstr "Source du canal introuvable."
-#: ../../boot.php:1562
+#: ../../boot.php:1569
msgid "Create an account to access services and applications"
msgstr "Créer un compte pour accéder aux services et applications"
-#: ../../boot.php:1581 ../../include/nav.php:111 ../../include/nav.php:140
+#: ../../boot.php:1588 ../../include/nav.php:111 ../../include/nav.php:140
#: ../../include/nav.php:159
msgid "Logout"
msgstr "Déconnexion"
-#: ../../boot.php:1585
+#: ../../boot.php:1592
msgid "Login/Email"
msgstr "pseudo / email"
-#: ../../boot.php:1586
+#: ../../boot.php:1593
msgid "Password"
msgstr "Mot de passe"
-#: ../../boot.php:1587
+#: ../../boot.php:1594
msgid "Remember me"
msgstr "Se souvenir de moi"
-#: ../../boot.php:1590
+#: ../../boot.php:1597
msgid "Forgot your password?"
msgstr "Mot de passe oublié&nbsp;?"
-#: ../../boot.php:2347
+#: ../../boot.php:2354
#, php-format
msgid "[$Projectname] Website SSL error for %s"
msgstr "[$Projectname] erreur SSL du site web pour %s"
-#: ../../boot.php:2352
+#: ../../boot.php:2359
msgid "Website SSL certificate is not valid. Please correct."
msgstr "Le certificat SSL n'est pas valide. Corrigez le."
-#: ../../boot.php:2468
+#: ../../boot.php:2475
#, php-format
msgid "[$Projectname] Cron tasks not running on %s"
msgstr "[$Projectname] Tâches Cron inactives sur %s"
-#: ../../boot.php:2473
+#: ../../boot.php:2480
msgid "Cron/Scheduled tasks not running."
msgstr "Les taches planifiées ne tournent pas."
-#: ../../boot.php:2474 ../../include/datetime.php:232
+#: ../../boot.php:2481 ../../include/datetime.php:238
msgid "never"
msgstr "jamais"
@@ -9281,6 +9387,10 @@ msgid ""
" share their own locations with the group."
msgstr "Créez un nouveau rendez-vous et partagez le lien d'accès avec les gens que vous souhaitez inviter au groupe. Ceux qui ouvrent le lien deviennent membres du rendez-vous. Ils peuvent afficher les emplacements des autres membres, ajouter des marqueurs à la carte ou partager leurs propres emplacements avec le groupe."
+#: ../../addon/rendezvous/rendezvous.php:232
+msgid "You have no rendezvous. Press the button above to create a rendezvous!"
+msgstr "Vous n'avez pas de rendez-vous. Appuyez sur le bouton ci-dessus pour créer un rendez-vous !"
+
#: ../../addon/skeleton/skeleton.php:59
msgid "Some setting"
msgstr "Un certain paramètre"
@@ -9293,30 +9403,30 @@ msgstr "Un paramètre"
msgid "Skeleton Settings"
msgstr "Paramètres du squelette"
-#: ../../addon/gnusoc/gnusoc.php:247
+#: ../../addon/gnusoc/gnusoc.php:249
msgid "GNU-Social Protocol Settings updated."
msgstr "Paramètres du protocol GNU-Social mis à jour."
-#: ../../addon/gnusoc/gnusoc.php:266
+#: ../../addon/gnusoc/gnusoc.php:268
msgid ""
"The GNU-Social protocol does not support location independence. Connections "
"you make within that network may be unreachable from alternate channel "
"locations."
msgstr "Le protocole GNU-Social ne gère pas les canaux localisés sur plusieurs serveurs. Vos contacts sur ce réseau peuvent donc être injoignables à partir des autres emplacements (clones) de ce canal."
-#: ../../addon/gnusoc/gnusoc.php:269
+#: ../../addon/gnusoc/gnusoc.php:271
msgid "Enable the GNU-Social protocol for this channel"
msgstr "Activer le protocole GNU-Social pour ce canal"
-#: ../../addon/gnusoc/gnusoc.php:273
+#: ../../addon/gnusoc/gnusoc.php:275
msgid "GNU-Social Protocol Settings"
msgstr "Paramètres du protocol GNU-Social"
-#: ../../addon/gnusoc/gnusoc.php:464
+#: ../../addon/gnusoc/gnusoc.php:471
msgid "Follow"
msgstr "S'abonner"
-#: ../../addon/gnusoc/gnusoc.php:467
+#: ../../addon/gnusoc/gnusoc.php:474
#, php-format
msgid "%1$s is now following %2$s"
msgstr "%1$s est maintenant abonné à %2$s"
@@ -9362,7 +9472,7 @@ msgstr "Retourner ensuite"
msgid "Page to load after image selection."
msgstr "Page à afficher après la sélection de l'image."
-#: ../../addon/openclipatar/openclipatar.php:58 ../../include/channel.php:1301
+#: ../../addon/openclipatar/openclipatar.php:58 ../../include/channel.php:1300
#: ../../include/nav.php:119
msgid "Edit Profile"
msgstr "Éditeur de profil"
@@ -9851,17 +9961,17 @@ msgstr "Date de naissance"
msgid "OpenID protocol error. No ID returned."
msgstr "Erreur du protocole OpenID. Aucune ID trouvée."
-#: ../../addon/openid/Mod_Openid.php:188 ../../include/auth.php:290
+#: ../../addon/openid/Mod_Openid.php:188 ../../include/auth.php:300
msgid "Login failed."
msgstr "Échec de la connexion."
#: ../../addon/openid/Mod_Id.php:85 ../../include/selectors.php:49
-#: ../../include/selectors.php:66 ../../include/channel.php:1481
+#: ../../include/selectors.php:66 ../../include/channel.php:1480
msgid "Male"
msgstr "Homme"
#: ../../addon/openid/Mod_Id.php:87 ../../include/selectors.php:49
-#: ../../include/selectors.php:66 ../../include/channel.php:1479
+#: ../../include/selectors.php:66 ../../include/channel.php:1478
msgid "Female"
msgstr "Femme"
@@ -10048,39 +10158,39 @@ msgstr "Déclarer un amour éternel pour"
msgid "declared undying love for"
msgstr "A déclaré l'amour éternel pour"
-#: ../../addon/diaspora/diaspora.php:778
+#: ../../addon/diaspora/diaspora.php:779
msgid "Diaspora Protocol Settings updated."
msgstr "Paramètres du protocole Diaspora mis à jour."
-#: ../../addon/diaspora/diaspora.php:797
+#: ../../addon/diaspora/diaspora.php:798
msgid ""
"The Diaspora protocol does not support location independence. Connections "
"you make within that network may be unreachable from alternate channel "
"locations."
msgstr "Le protocole Diaspora ne gère pas les canaux localisés sur plusieurs serveurs. Vos contacts sur ce réseau peuvent donc être injoignables à partir des autres emplacements (clones) de ce canal."
-#: ../../addon/diaspora/diaspora.php:800
+#: ../../addon/diaspora/diaspora.php:801
msgid "Enable the Diaspora protocol for this channel"
msgstr "Activer le protocole Diaspora pour ce canal"
-#: ../../addon/diaspora/diaspora.php:804
+#: ../../addon/diaspora/diaspora.php:805
msgid "Allow any Diaspora member to comment on your public posts"
msgstr "Permettre à tous les membres de Diaspora de commenter vos publications publiques"
-#: ../../addon/diaspora/diaspora.php:808
+#: ../../addon/diaspora/diaspora.php:809
msgid "Prevent your hashtags from being redirected to other sites"
msgstr "Empêcher la redirection de vos mots-clés (hashtags) vers d'autres sites"
-#: ../../addon/diaspora/diaspora.php:812
+#: ../../addon/diaspora/diaspora.php:813
msgid ""
"Sign and forward posts and comments with no existing Diaspora signature"
msgstr "Signer et faire suivre les publications et commentaires n'ayant aucune signature Diaspora"
-#: ../../addon/diaspora/diaspora.php:817
+#: ../../addon/diaspora/diaspora.php:818
msgid "Followed hashtags (comma separated, do not include the #)"
msgstr "Mots-clés suivis (séparer par une virgule, ne pas mettre le #)"
-#: ../../addon/diaspora/diaspora.php:822
+#: ../../addon/diaspora/diaspora.php:823
msgid "Diaspora Protocol Settings"
msgstr "Paramètres du protocole Diaspora"
@@ -10088,7 +10198,7 @@ msgstr "Paramètres du protocole Diaspora"
msgid "No username found in import file."
msgstr "Pas de nom d'utilisateur dans le fichier d'import."
-#: ../../addon/diaspora/import_diaspora.php:41 ../../include/import.php:62
+#: ../../addon/diaspora/import_diaspora.php:41 ../../include/import.php:67
msgid "Unable to create a unique channel address. Import failed."
msgstr "Impossible de créer une adresse de canal unique. Echec de l'import."
@@ -10359,8 +10469,8 @@ msgstr "Mot de passe de connexion Friendica"
msgid "Hubzilla to Friendica Post Settings"
msgstr "Paramètres de publication de Hubzilla vers Friendica"
-#: ../../addon/jappixmini/jappixmini.php:305 ../../include/channel.php:1397
-#: ../../include/channel.php:1568
+#: ../../addon/jappixmini/jappixmini.php:305 ../../include/channel.php:1396
+#: ../../include/channel.php:1567
msgid "Status:"
msgstr "État&nbsp;:"
@@ -10422,8 +10532,8 @@ msgid "No channels currently blocked"
msgstr "Aucun canal n'est actuellement bloqué"
#: ../../addon/superblock/superblock.php:120
-msgid "\"Superblock\" Settings"
-msgstr "Paramètres \"Superblock\""
+msgid "Superblock Settings"
+msgstr "Paramètres de Superblock"
#: ../../addon/superblock/superblock.php:345
msgid "Block Completely"
@@ -10505,55 +10615,55 @@ msgstr "Taille du fichier journal en octets avant la rotation"
msgid "Number of logfiles to retain"
msgstr "Nombre de fichiers de journal à conserver"
-#: ../../addon/frphotos/frphotos.php:91
+#: ../../addon/frphotos/frphotos.php:92
msgid "Friendica Photo Album Import"
msgstr "Importation de l'album photo Friendica "
-#: ../../addon/frphotos/frphotos.php:92
+#: ../../addon/frphotos/frphotos.php:93
msgid "This will import all your Friendica photo albums to this Red channel."
msgstr "Ceci importera toutes vos albums photos Friendica dans ce canal Hubzilla."
-#: ../../addon/frphotos/frphotos.php:93
+#: ../../addon/frphotos/frphotos.php:94
msgid "Friendica Server base URL"
msgstr "URL de base du serveur Friendica"
-#: ../../addon/frphotos/frphotos.php:94
+#: ../../addon/frphotos/frphotos.php:95
msgid "Friendica Login Username"
msgstr "Identifiant de connexion Friendica"
-#: ../../addon/frphotos/frphotos.php:95
+#: ../../addon/frphotos/frphotos.php:96
msgid "Friendica Login Password"
msgstr "Mot de passe de connexion Friendica"
-#: ../../addon/pubcrawl/as.php:1101 ../../addon/pubcrawl/as.php:1228
-#: ../../addon/pubcrawl/as.php:1403 ../../include/network.php:1774
+#: ../../addon/pubcrawl/as.php:1129 ../../addon/pubcrawl/as.php:1256
+#: ../../addon/pubcrawl/as.php:1432 ../../include/network.php:1775
msgid "ActivityPub"
msgstr "ActivityPub"
-#: ../../addon/pubcrawl/pubcrawl.php:1034
+#: ../../addon/pubcrawl/pubcrawl.php:1050
msgid "ActivityPub Protocol Settings updated."
msgstr "Paramètres du protocole ActivityPub Protocol mise à jour."
-#: ../../addon/pubcrawl/pubcrawl.php:1043
+#: ../../addon/pubcrawl/pubcrawl.php:1059
msgid ""
"The ActivityPub protocol does not support location independence. Connections"
" you make within that network may be unreachable from alternate channel "
"locations."
msgstr "Le protocole ActivityPub ne prend pas en charge l'indépendance de localisation. Les connexions que vous établissez au sein de ce réseau peuvent être inaccessibles à partir d'autres emplacements de canaux."
-#: ../../addon/pubcrawl/pubcrawl.php:1046
+#: ../../addon/pubcrawl/pubcrawl.php:1062
msgid "Enable the ActivityPub protocol for this channel"
msgstr "Activer le protocole ActivityPub pour ce canal."
-#: ../../addon/pubcrawl/pubcrawl.php:1049
+#: ../../addon/pubcrawl/pubcrawl.php:1065
msgid "Send multi-media HTML articles"
msgstr "Envoyer des articles HTML multimédia"
-#: ../../addon/pubcrawl/pubcrawl.php:1049
+#: ../../addon/pubcrawl/pubcrawl.php:1065
msgid "Not supported by some microblog services such as Mastodon"
msgstr "Non pris en charge par certains services de microblog tels que Mastodon."
-#: ../../addon/pubcrawl/pubcrawl.php:1053
+#: ../../addon/pubcrawl/pubcrawl.php:1069
msgid "ActivityPub Protocol Settings"
msgstr "Paramètres du protocole ActivityPub "
@@ -10869,7 +10979,7 @@ msgid ""
"details from unknown viewers?</em>) the link potentially included in public "
"postings relayed to GNU social will lead the visitor to a blank page "
"informing the visitor that the access to your profile has been restricted."
-msgstr "Remarque : en raison de vos paramètres de confidentialité (masquer les détails de votre profil aux visiteurs inconnus? ), le lien potentiellement inclus dans les annonces publiques relayées sur GNU-social amènera le visiteur à une page vierge informant le visiteur que l'accès à votre profil a été restreint."
+msgstr "<strong>Remarque</strong>&nbsp;: en raison de vos paramètres de confidentialité (<em>masquer les détails de votre profil aux visiteurs inconnus&nbsp;?</em>), le lien potentiellement inclus dans les annonces publiques relayées sur GNU-social amènera le visiteur à une page vierge informant le visiteur que l'accès à votre profil a été restreint."
#: ../../addon/statusnet/statusnet.php:411
msgid "Allow posting to GNU social"
@@ -10943,7 +11053,7 @@ msgstr "Couleur aléatoire choisie."
msgid "Error creating new game."
msgstr "Erreur lors de la création du nouveau jeu."
-#: ../../addon/chess/chess.php:486 ../../include/channel.php:1152
+#: ../../addon/chess/chess.php:486 ../../include/channel.php:1151
msgid "Requested channel is not available."
msgstr "Canal demandé non disponible."
@@ -11038,6 +11148,78 @@ msgstr "Cacher le bouton et afficher les émoticônes directement."
msgid "Smileybutton Settings"
msgstr "Paramètres du bouton des émoticônes"
+#: ../../addon/cart/myshop.php:138
+msgid "Order Not Found"
+msgstr "Commande introuvable"
+
+#: ../../addon/cart/cart.php:810
+msgid "Order cannot be checked out."
+msgstr "La commande ne peut pas être finalisée."
+
+#: ../../addon/cart/cart.php:1073
+msgid "Enable Shopping Cart"
+msgstr "Activer le panier d'achats"
+
+#: ../../addon/cart/cart.php:1080
+msgid "Enable Test Catalog"
+msgstr "Activer le catalogue de test"
+
+#: ../../addon/cart/cart.php:1088
+msgid "Enable Manual Payments"
+msgstr "Activer les paiements manuels"
+
+#: ../../addon/cart/cart.php:1103
+msgid "Base Cart Settings"
+msgstr "Paramètres de base du panier"
+
+#: ../../addon/cart/cart.php:1151
+msgid "Add Item"
+msgstr "Ajouter un article"
+
+#: ../../addon/cart/cart.php:1165
+msgid "Call cart_post_"
+msgstr "Appeler cart_post_"
+
+#: ../../addon/cart/cart.php:1195
+msgid "Cart Not Enabled (profile: "
+msgstr "Panier non activé (profile:"
+
+#: ../../addon/cart/cart.php:1226 ../../addon/cart/manual_payments.php:36
+msgid "Order not found."
+msgstr "Commande introuvable."
+
+#: ../../addon/cart/cart.php:1262 ../../addon/cart/cart.php:1389
+msgid "No Order Found"
+msgstr "Aucune commande trouvée"
+
+#: ../../addon/cart/cart.php:1270
+msgid "call: "
+msgstr "appel:"
+
+#: ../../addon/cart/cart.php:1273
+msgid "An unknown error has occurred Please start again."
+msgstr "Une erreur inconnue s'est produite. Veuillez recommencer."
+
+#: ../../addon/cart/cart.php:1414
+msgid "Invalid Payment Type. Please start again."
+msgstr "Type de paiement non valable. Recommencez, s'il vous plaît."
+
+#: ../../addon/cart/cart.php:1421
+msgid "Order not found"
+msgstr "Commande non trouvée"
+
+#: ../../addon/cart/manual_payments.php:9
+msgid "Error: order mismatch. Please try again."
+msgstr "Erreur : non-appariement de commande. Veuillez réessayer."
+
+#: ../../addon/cart/manual_payments.php:29
+msgid "Manual payments are not enabled."
+msgstr "Les paiements manuels ne sont pas activés."
+
+#: ../../addon/cart/manual_payments.php:44
+msgid "Finished"
+msgstr "Terminé."
+
#: ../../addon/piwik/piwik.php:85
msgid ""
"This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> "
@@ -11082,156 +11264,156 @@ msgstr "Activer le traqueur d'erreur du frontend JavaScript"
msgid "This feature requires Piwik >= 2.2.0"
msgstr "Cette fonctionnalité requiert une version de Piwik >=2.2.0"
-#: ../../addon/tour/tour.php:75
+#: ../../addon/tour/tour.php:76
msgid "Edit your profile and change settings."
msgstr "Éditer votre profil et changer les paramètres."
-#: ../../addon/tour/tour.php:76
+#: ../../addon/tour/tour.php:77
msgid "Click here to see activity from your connections."
msgstr "Cliquer ici pour voir l'activité de vos contacts."
-#: ../../addon/tour/tour.php:77
+#: ../../addon/tour/tour.php:78
msgid "Click here to see your channel home."
msgstr "Cliquer ici pour voir votre canal principal."
-#: ../../addon/tour/tour.php:78
+#: ../../addon/tour/tour.php:79
msgid "You can access your private messages from here."
msgstr "Vous pouvez accéder à vos messages privés à partir d'ici."
-#: ../../addon/tour/tour.php:79
+#: ../../addon/tour/tour.php:80
msgid "Create new events here."
msgstr "Créer de nouveaux événements ici."
-#: ../../addon/tour/tour.php:80
+#: ../../addon/tour/tour.php:81
msgid ""
"You can accept new connections and change permissions for existing ones "
"here. You can also e.g. create groups of contacts."
msgstr "Vous pouvez accepter de nouveaux contacts et changer les droits d'accès des contacts existants. Vous pouvez également créer des groupes de contacts."
-#: ../../addon/tour/tour.php:81
+#: ../../addon/tour/tour.php:82
msgid "System notifications will arrive here"
msgstr "Les notifications du système arriveront ici."
-#: ../../addon/tour/tour.php:82
+#: ../../addon/tour/tour.php:83
msgid "Search for content and users"
msgstr "Rechercher du contenu ou des utilisateurs"
-#: ../../addon/tour/tour.php:83
+#: ../../addon/tour/tour.php:84
msgid "Browse for new contacts"
msgstr "Rechercher de nouveaux contacts"
-#: ../../addon/tour/tour.php:84
+#: ../../addon/tour/tour.php:85
msgid "Launch installed apps"
msgstr "Démarrer des applications installées"
-#: ../../addon/tour/tour.php:85
+#: ../../addon/tour/tour.php:86
msgid "Looking for help? Click here."
msgstr "Un peu d'aide ? Cliquer ici."
-#: ../../addon/tour/tour.php:86
+#: ../../addon/tour/tour.php:87
msgid ""
"New events have occurred in your network. Click here to see what has "
"happened!"
msgstr "De nouveaux événement se sont produits dans votre réseau. Cliquer ici pour voir ce qui s'est passé !"
-#: ../../addon/tour/tour.php:87
+#: ../../addon/tour/tour.php:88
msgid "You have received a new private message. Click here to see from who!"
msgstr "Vous avez reçu un nouveau message privé. Cliquer ici pour voir qui vous écrit !"
-#: ../../addon/tour/tour.php:88
+#: ../../addon/tour/tour.php:89
msgid "There are events this week. Click here too see which!"
msgstr "Il y a des événements cette semaine. Cliquer ici pour voir lesquels !"
-#: ../../addon/tour/tour.php:89
+#: ../../addon/tour/tour.php:90
msgid "You have received a new introduction. Click here to see who!"
msgstr "Vous avez reçu une nouvelle demande de relation. Cliquer ici pour voir de qui !"
-#: ../../addon/tour/tour.php:90
+#: ../../addon/tour/tour.php:91
msgid ""
"There is a new system notification. Click here to see what has happened!"
msgstr "Vous avez reçu une notification du système. Cliquer ici pour voir ce qui se passe !"
-#: ../../addon/tour/tour.php:93
+#: ../../addon/tour/tour.php:94
msgid "Click here to share text, images, videos and sound."
msgstr "Cliquer ici pour partager du texte, des images, des vidéos ou du son."
-#: ../../addon/tour/tour.php:94
+#: ../../addon/tour/tour.php:95
msgid "You can write an optional title for your update (good for long posts)."
msgstr "Vous pouvez ajouter à votre mise à jour un titre facultatif (pratique pour de longues publications)."
-#: ../../addon/tour/tour.php:95
+#: ../../addon/tour/tour.php:96
msgid "Entering some categories here makes it easier to find your post later."
msgstr "Renseigner certaines catégories ici permet de retrouver plus facilement votre message plus tard."
-#: ../../addon/tour/tour.php:96
+#: ../../addon/tour/tour.php:97
msgid "Share photos, links, location, etc."
msgstr "Partager des photos, des liens, des localisations, etc."
-#: ../../addon/tour/tour.php:97
+#: ../../addon/tour/tour.php:98
msgid ""
"Only want to share content for a while? Make it expire at a certain date."
msgstr "Envie de partager un contenu pour une durée limitée ? Faites-le expirer à une certaine date."
-#: ../../addon/tour/tour.php:98
+#: ../../addon/tour/tour.php:99
msgid "You can password protect content."
msgstr "Vous pouvez protéger un contenu avec un mot de passe."
-#: ../../addon/tour/tour.php:99
+#: ../../addon/tour/tour.php:100
msgid "Choose who you share with."
msgstr "Choisir avec qui vous partagez."
-#: ../../addon/tour/tour.php:101
+#: ../../addon/tour/tour.php:102
msgid "Click here when you are done."
msgstr "Cliquer ici quand vous avez fini."
-#: ../../addon/tour/tour.php:104
+#: ../../addon/tour/tour.php:105
msgid "Adjust from which channels posts should be displayed."
msgstr "Préciser de quels canaux les publications seront affichées."
-#: ../../addon/tour/tour.php:105
+#: ../../addon/tour/tour.php:106
msgid "Only show posts from channels in the specified privacy group."
msgstr "Afficher uniquement les messages des canaux appartenant au groupe de contacts spécifié."
-#: ../../addon/tour/tour.php:109
+#: ../../addon/tour/tour.php:110
msgid "Easily find posts containing tags (keywords preceded by the \"#\" symbol)."
msgstr "Trouvez facilement des publications contenant des tags (mots-clés précédés du symbole \"#\")."
-#: ../../addon/tour/tour.php:110
+#: ../../addon/tour/tour.php:111
msgid "Easily find posts in given category."
msgstr "Trouvez facilement des publications dans une catégorie donnée."
-#: ../../addon/tour/tour.php:111
+#: ../../addon/tour/tour.php:112
msgid "Easily find posts by date."
msgstr "Trouvez facilement des publications en fonction de leur date."
-#: ../../addon/tour/tour.php:112
+#: ../../addon/tour/tour.php:113
msgid ""
"Suggested users who have volounteered to be shown as suggestions, and who we"
" think you might find interesting."
msgstr "Voici des utilisateurs que vous pourriez trouver intéressants. Ces utilisateurs se sont portés volontaires pour être affichés comme exemples."
-#: ../../addon/tour/tour.php:113
+#: ../../addon/tour/tour.php:114
msgid "Here you see channels you have connected to."
msgstr "Retrouvez ici les canaux auxquels vous vous êtes connectés."
-#: ../../addon/tour/tour.php:114
+#: ../../addon/tour/tour.php:115
msgid "Save your search so you can repeat it at a later date."
msgstr "Enregistrer votre recherche de façon à pouvoir la répéter plus tard."
-#: ../../addon/tour/tour.php:117
+#: ../../addon/tour/tour.php:118
msgid ""
"If you see this icon you can be sure that the sender is who it say it is. It"
" is normal that it is not always possible to verify the sender, so the icon "
"will be missing sometimes. There is usually no need to worry about that."
msgstr "Si vous voyez cette icône, vous pouvez être sûr que l'expéditeur est qui il dit qu'il est. Il est normal qu'il ne soit pas toujours possible de vérifier l'expéditeur, donc l'icône manquera parfois. Il n'est généralement pas nécessaire de s'inquiéter à ce sujet."
-#: ../../addon/tour/tour.php:118
+#: ../../addon/tour/tour.php:119
msgid ""
"Danger! It seems someone tried to forge a message! This message is not "
"necessarily from who it says it is from!"
msgstr "Attention ! Il semble que quelqu'un a essayé de contrefaire un message ! Ce message n'a pas nécessairement été envoyé par la personne annoncée !"
-#: ../../addon/tour/tour.php:125
+#: ../../addon/tour/tour.php:126
msgid ""
"Welcome to Hubzilla! Would you like to see a tour of the UI?</p> <p>You can "
"pause it at any time and continue where you left off by reloading the page, "
@@ -11630,11 +11812,11 @@ msgstr "Transsexuel"
msgid "Hermaphrodite"
msgstr "Hermaphrodite"
-#: ../../include/selectors.php:49 ../../include/channel.php:1485
+#: ../../include/selectors.php:49 ../../include/channel.php:1484
msgid "Neuter"
msgstr "Neutre"
-#: ../../include/selectors.php:49 ../../include/channel.php:1487
+#: ../../include/selectors.php:49 ../../include/channel.php:1486
msgid "Non-specific"
msgstr "Non spécifique"
@@ -11817,12 +11999,12 @@ msgstr "Me demander"
#: ../../include/conversation.php:169
#, php-format
msgid "likes %1$s's %2$s"
-msgstr "aime %1$s's %2$s"
+msgstr "aime le %2$s de %1$s"
#: ../../include/conversation.php:172
#, php-format
msgid "doesn't like %1$s's %2$s"
-msgstr "n'aime pas %1$s's %2$s"
+msgstr "n'aime pas le %2$s de%1$s "
#: ../../include/conversation.php:212
#, php-format
@@ -11880,10 +12062,6 @@ msgstr "Suivre la discussion"
msgid "Unfollow Thread"
msgstr "Ne plus suivre la discussion"
-#: ../../include/conversation.php:1042
-msgid "Activity/Posts"
-msgstr "Activité/Publications"
-
#: ../../include/conversation.php:1062
msgid "Edit Connection"
msgstr "Modifier le contact"
@@ -11945,175 +12123,175 @@ msgstr "Spécifier votre emplacement géographique"
msgid "Clear browser location"
msgstr "Supprimer l'emplacement géographique du navigateur"
-#: ../../include/conversation.php:1314
+#: ../../include/conversation.php:1316
msgid "Tag term:"
msgstr "Étiquette&nbsp;:"
-#: ../../include/conversation.php:1315
+#: ../../include/conversation.php:1317
msgid "Where are you right now?"
-msgstr "Où êtes-vous en ce moment&nbsp;?"
+msgstr "Où êtes-vous en ce moment ?"
-#: ../../include/conversation.php:1320
+#: ../../include/conversation.php:1322
msgid "Choose a different album..."
msgstr "Choisissez un autre album"
-#: ../../include/conversation.php:1324
+#: ../../include/conversation.php:1326
msgid "Comments enabled"
msgstr "Commentaires activés"
-#: ../../include/conversation.php:1325
+#: ../../include/conversation.php:1327
msgid "Comments disabled"
msgstr "Commentaires désactivés"
-#: ../../include/conversation.php:1372
+#: ../../include/conversation.php:1375
msgid "Page link name"
msgstr "Nom du lien vers la page"
-#: ../../include/conversation.php:1375
+#: ../../include/conversation.php:1378
msgid "Post as"
msgstr "Publier en tant que"
-#: ../../include/conversation.php:1389
+#: ../../include/conversation.php:1392
msgid "Toggle voting"
msgstr "(Dés)activer le vote"
-#: ../../include/conversation.php:1392
+#: ../../include/conversation.php:1395
msgid "Disable comments"
msgstr "Désactiver les commentaires"
-#: ../../include/conversation.php:1393
+#: ../../include/conversation.php:1396
msgid "Toggle comments"
msgstr "Basculer les commentaires"
-#: ../../include/conversation.php:1401
+#: ../../include/conversation.php:1404
msgid "Categories (optional, comma-separated list)"
msgstr "Catégories (facultatives, séparées par des virgules)"
-#: ../../include/conversation.php:1424
+#: ../../include/conversation.php:1427
msgid "Other networks and post services"
msgstr "Autres réseaux et services de messagerie"
-#: ../../include/conversation.php:1430
+#: ../../include/conversation.php:1433
msgid "Set publish date"
msgstr "Définir la date de publication"
-#: ../../include/conversation.php:1690
+#: ../../include/conversation.php:1693
msgid "Commented Order"
msgstr "Par date de commentaire"
-#: ../../include/conversation.php:1693
+#: ../../include/conversation.php:1696
msgid "Sort by Comment Date"
msgstr "Trier par date de dernier commentaire"
-#: ../../include/conversation.php:1697
+#: ../../include/conversation.php:1700
msgid "Posted Order"
msgstr "Par date de publication"
-#: ../../include/conversation.php:1700
+#: ../../include/conversation.php:1703
msgid "Sort by Post Date"
msgstr "Trier par date de publication"
-#: ../../include/conversation.php:1708
+#: ../../include/conversation.php:1711
msgid "Posts that mention or involve you"
msgstr "Publications qui vous mentionnent ou vous concernent d'une manière ou d'une autre"
-#: ../../include/conversation.php:1717
+#: ../../include/conversation.php:1720
msgid "Activity Stream - by date"
msgstr "Flux d'activité - par date"
-#: ../../include/conversation.php:1723
+#: ../../include/conversation.php:1726
msgid "Starred"
msgstr "Avec étoile"
-#: ../../include/conversation.php:1726
+#: ../../include/conversation.php:1729
msgid "Favourite Posts"
msgstr "Publications préférées"
-#: ../../include/conversation.php:1733
+#: ../../include/conversation.php:1736
msgid "Spam"
msgstr "Indésirable"
-#: ../../include/conversation.php:1736
+#: ../../include/conversation.php:1739
msgid "Posts flagged as SPAM"
msgstr "Publications marquées comme indésirables"
-#: ../../include/conversation.php:1811 ../../include/nav.php:381
+#: ../../include/conversation.php:1814 ../../include/nav.php:381
msgid "Status Messages and Posts"
msgstr "Messages d'état et contributions"
-#: ../../include/conversation.php:1824 ../../include/nav.php:394
+#: ../../include/conversation.php:1827 ../../include/nav.php:394
msgid "Profile Details"
msgstr "Détails du profil"
-#: ../../include/conversation.php:1834 ../../include/nav.php:404
-#: ../../include/photos.php:655
+#: ../../include/conversation.php:1837 ../../include/nav.php:404
+#: ../../include/photos.php:662
msgid "Photo Albums"
msgstr "Albums photo"
-#: ../../include/conversation.php:1842 ../../include/nav.php:412
+#: ../../include/conversation.php:1845 ../../include/nav.php:412
msgid "Files and Storage"
msgstr "Fichiers et Stockage"
-#: ../../include/conversation.php:1879 ../../include/nav.php:447
+#: ../../include/conversation.php:1882 ../../include/nav.php:447
msgid "Bookmarks"
msgstr "Favoris"
-#: ../../include/conversation.php:1882 ../../include/nav.php:450
+#: ../../include/conversation.php:1885 ../../include/nav.php:450
msgid "Saved Bookmarks"
msgstr "Favoris sauvegardés"
-#: ../../include/conversation.php:1893 ../../include/nav.php:461
+#: ../../include/conversation.php:1896 ../../include/nav.php:461
msgid "View Cards"
msgstr "Voir cartes"
-#: ../../include/conversation.php:1901
+#: ../../include/conversation.php:1904
msgid "articles"
msgstr "articles"
-#: ../../include/conversation.php:1904 ../../include/nav.php:472
+#: ../../include/conversation.php:1907 ../../include/nav.php:472
msgid "View Articles"
msgstr "Voir articles"
-#: ../../include/conversation.php:1915 ../../include/nav.php:484
+#: ../../include/conversation.php:1918 ../../include/nav.php:484
msgid "View Webpages"
msgstr "Voir les pages web"
-#: ../../include/conversation.php:1984
+#: ../../include/conversation.php:1987
msgctxt "noun"
msgid "Attending"
msgid_plural "Attending"
msgstr[0] "Participe"
msgstr[1] "Participent"
-#: ../../include/conversation.php:1987
+#: ../../include/conversation.php:1990
msgctxt "noun"
msgid "Not Attending"
msgid_plural "Not Attending"
msgstr[0] "Ne participe pas"
msgstr[1] "Ne participent pas"
-#: ../../include/conversation.php:1990
+#: ../../include/conversation.php:1993
msgctxt "noun"
msgid "Undecided"
msgid_plural "Undecided"
msgstr[0] "Indécis(e)"
msgstr[1] "Indécis(es)"
-#: ../../include/conversation.php:1993
+#: ../../include/conversation.php:1996
msgctxt "noun"
msgid "Agree"
msgid_plural "Agrees"
msgstr[0] "D'accord"
msgstr[1] "D'accord"
-#: ../../include/conversation.php:1996
+#: ../../include/conversation.php:1999
msgctxt "noun"
msgid "Disagree"
msgid_plural "Disagrees"
msgstr[0] "Pas d'accord"
msgstr[1] "Pas d'accord"
-#: ../../include/conversation.php:1999
+#: ../../include/conversation.php:2002
msgctxt "noun"
msgid "Abstain"
msgid_plural "Abstains"
@@ -12141,12 +12319,16 @@ msgstr "Ce site uniquement"
msgid "%1$s's bookmarks"
msgstr "Favoris de %1$s"
-#: ../../include/import.php:41
+#: ../../include/import.php:25
+msgid "Unable to import a removed channel."
+msgstr "Impossible d'importer un canal supprimé."
+
+#: ../../include/import.php:46
msgid ""
"Cannot create a duplicate channel identifier on this system. Import failed."
msgstr "L'import a échoué. Un canal existe déjà avec ce nom"
-#: ../../include/import.php:106
+#: ../../include/import.php:111
msgid "Cloned channel not found. Import failed."
msgstr "Canal cloné non trouvé. Echec de l'import."
@@ -12201,7 +12383,7 @@ msgstr "encourager"
#: ../../include/text.php:1135
msgid "prodded"
-msgstr "encouragé"
+msgstr "à encouragé"
#: ../../include/text.php:1136
msgid "slap"
@@ -12391,7 +12573,7 @@ msgstr "Décembre"
msgid "Unknown Attachment"
msgstr "Pièce jointe inconnue"
-#: ../../include/text.php:1434 ../../include/feedutils.php:852
+#: ../../include/text.php:1434 ../../include/feedutils.php:860
msgid "unknown"
msgstr "Inconnu"
@@ -12407,107 +12589,107 @@ msgstr "retirer du fichier"
msgid "Download binary/encrypted content"
msgstr "Télécharger le contenu binaire/chiffré"
-#: ../../include/text.php:1848 ../../include/language.php:397
+#: ../../include/text.php:1849 ../../include/language.php:397
msgid "default"
msgstr "défaut"
-#: ../../include/text.php:1856
+#: ../../include/text.php:1857
msgid "Page layout"
msgstr "Mise en page"
-#: ../../include/text.php:1856
+#: ../../include/text.php:1857
msgid "You can create your own with the layouts tool"
msgstr "Créez les vôtres avec les outils de mise en page"
-#: ../../include/text.php:1867
+#: ../../include/text.php:1868
msgid "HTML"
msgstr "HTML"
-#: ../../include/text.php:1870
+#: ../../include/text.php:1871
msgid "Comanche Layout"
msgstr "mise en page Comanche"
-#: ../../include/text.php:1875
+#: ../../include/text.php:1876
msgid "PHP"
msgstr "PHP"
-#: ../../include/text.php:1884
+#: ../../include/text.php:1885
msgid "Page content type"
msgstr "Type de contenu de la page"
-#: ../../include/text.php:2017
+#: ../../include/text.php:2018
msgid "activity"
msgstr "activité"
-#: ../../include/text.php:2099
+#: ../../include/text.php:2100
msgid "a-z, 0-9, -, and _ only"
msgstr "a-z, 0-9, -, -, et _ seulement"
-#: ../../include/text.php:2399
+#: ../../include/text.php:2402
msgid "Design Tools"
msgstr "Outils de conception"
-#: ../../include/text.php:2405
+#: ../../include/text.php:2408
msgid "Pages"
msgstr "Pages"
-#: ../../include/text.php:2427
+#: ../../include/text.php:2430
msgid "Import website..."
msgstr "Importer le site web…"
-#: ../../include/text.php:2428
+#: ../../include/text.php:2431
msgid "Select folder to import"
msgstr "Sélectionner le dossier à importer"
-#: ../../include/text.php:2429
+#: ../../include/text.php:2432
msgid "Import from a zipped folder:"
msgstr "Importer à partir d'un dossier zippé :"
-#: ../../include/text.php:2430
+#: ../../include/text.php:2433
msgid "Import from cloud files:"
msgstr "Importer à partir de fichiers dans le cloud :"
-#: ../../include/text.php:2431
+#: ../../include/text.php:2434
msgid "/cloud/channel/path/to/folder"
msgstr "/cloud/channel/chemain/du/repertoire"
-#: ../../include/text.php:2432
+#: ../../include/text.php:2435
msgid "Enter path to website files"
msgstr "Entrer le chemin vers les fichiers du site web"
-#: ../../include/text.php:2433
+#: ../../include/text.php:2436
msgid "Select folder"
msgstr "Sélectionner un répertoire"
-#: ../../include/text.php:2434
+#: ../../include/text.php:2437
msgid "Export website..."
msgstr "Exporter le site web…"
-#: ../../include/text.php:2435
+#: ../../include/text.php:2438
msgid "Export to a zip file"
msgstr "Exporter dans un fichier zip"
-#: ../../include/text.php:2436
+#: ../../include/text.php:2439
msgid "website.zip"
msgstr "website.zip"
-#: ../../include/text.php:2437
+#: ../../include/text.php:2440
msgid "Enter a name for the zip file."
msgstr "Entrer un nom pour le fichier zip."
-#: ../../include/text.php:2438
+#: ../../include/text.php:2441
msgid "Export to cloud files"
msgstr "Exporter dans des fichiers sur le cloud"
-#: ../../include/text.php:2439
+#: ../../include/text.php:2442
msgid "/path/to/export/folder"
msgstr "/chemin/vers/le/dossier/d'export"
-#: ../../include/text.php:2440
+#: ../../include/text.php:2443
msgid "Enter a path to a cloud files destination."
msgstr "Entrer le chemin vers le cloud de fichiers"
-#: ../../include/text.php:2441
+#: ../../include/text.php:2444
msgid "Specify folder"
msgstr "Spécifier un répertoire"
@@ -12555,7 +12737,7 @@ msgstr "Connexions communes"
msgid "View all %d common connections"
msgstr "Voir toutes les connexions communes %d"
-#: ../../include/markdown.php:158 ../../include/bbcode.php:343
+#: ../../include/markdown.php:158 ../../include/bbcode.php:356
#, php-format
msgid "%1$s wrote the following %2$s %3$s"
msgstr "%1$s a écrit %2$s qui suit %3$s"
@@ -12572,23 +12754,27 @@ msgstr "Emplacement du canal introuvable."
msgid "Response from remote channel was incomplete."
msgstr "La réponse du canal distant était incomplète."
-#: ../../include/follow.php:101
+#: ../../include/follow.php:96
+msgid "Premium channel - please visit:"
+msgstr "Canal Premium - s'il vous plaît visitez :"
+
+#: ../../include/follow.php:110
msgid "Channel was deleted and no longer exists."
msgstr "Le canal a été supprimé et n'existe plus."
-#: ../../include/follow.php:156
+#: ../../include/follow.php:165
msgid "Remote channel or protocol unavailable."
msgstr "Canal distant ou protocole indisponible."
-#: ../../include/follow.php:179
+#: ../../include/follow.php:188
msgid "Channel discovery failed."
msgstr "La tentative d'accéder au canal a échoué."
-#: ../../include/follow.php:191
+#: ../../include/follow.php:200
msgid "Protocol disabled."
msgstr "Protocole désactivé."
-#: ../../include/follow.php:202
+#: ../../include/follow.php:211
msgid "Cannot connect to yourself."
msgstr "Ne peut pas se connecter à vous."
@@ -12908,35 +13094,35 @@ msgstr "Vous avez atteint votre limite de %1$.0f méga-octets autorisés pour le
msgid "File upload failed. Possible system limit or action terminated."
msgstr "Envoi du fichier impossible. Limite système ou action avortée."
-#: ../../include/attach.php:959
+#: ../../include/attach.php:969
msgid "Stored file could not be verified. Upload failed."
msgstr "Le fichier stocké n'a pu être vérifié. Echec de l'envoi."
-#: ../../include/attach.php:1033 ../../include/attach.php:1049
+#: ../../include/attach.php:1043 ../../include/attach.php:1059
msgid "Path not available."
msgstr "Chemin non disponible."
-#: ../../include/attach.php:1098 ../../include/attach.php:1263
+#: ../../include/attach.php:1108 ../../include/attach.php:1273
msgid "Empty pathname"
msgstr "Chemin vide"
-#: ../../include/attach.php:1124
+#: ../../include/attach.php:1134
msgid "duplicate filename or path"
msgstr "doublon de chemin ou de fichier"
-#: ../../include/attach.php:1149
+#: ../../include/attach.php:1159
msgid "Path not found."
msgstr "Chemin introuvable."
-#: ../../include/attach.php:1217
+#: ../../include/attach.php:1227
msgid "mkdir failed."
msgstr "mkdir a échoué."
-#: ../../include/attach.php:1221
+#: ../../include/attach.php:1231
msgid "database storage failed."
msgstr "l'écriture dans la base de données a échoué."
-#: ../../include/attach.php:1269
+#: ../../include/attach.php:1279
msgid "Empty path"
msgstr "Chemin vide"
@@ -12950,67 +13136,67 @@ msgstr "Le formulaire n'est plus sécurisé, probablement parce qu'il est ouvert
msgid "(Unknown)"
msgstr "(Inconnu)"
-#: ../../include/items.php:1129
+#: ../../include/items.php:1133
msgid "Visible to anybody on the internet."
msgstr "Visible pour tout le monde sur internet."
-#: ../../include/items.php:1131
+#: ../../include/items.php:1135
msgid "Visible to you only."
msgstr "Visible pour vous seulement."
-#: ../../include/items.php:1133
+#: ../../include/items.php:1137
msgid "Visible to anybody in this network."
msgstr "Visible pour tout le monde sur ce réseau."
-#: ../../include/items.php:1135
+#: ../../include/items.php:1139
msgid "Visible to anybody authenticated."
msgstr "Visible aux utilisateurs authentifiés."
-#: ../../include/items.php:1137
+#: ../../include/items.php:1141
#, php-format
msgid "Visible to anybody on %s."
msgstr "Visible pour tous sur %s."
-#: ../../include/items.php:1139
+#: ../../include/items.php:1143
msgid "Visible to all connections."
msgstr "Visible par tous les contacts."
-#: ../../include/items.php:1141
+#: ../../include/items.php:1145
msgid "Visible to approved connections."
msgstr "Visible par les contacts validés."
-#: ../../include/items.php:1143
+#: ../../include/items.php:1147
msgid "Visible to specific connections."
msgstr "Visible par certains contacts."
-#: ../../include/items.php:4147
+#: ../../include/items.php:4197
msgid "Privacy group is empty."
msgstr "Groupe de contacts vide."
-#: ../../include/items.php:4154
+#: ../../include/items.php:4204
#, php-format
msgid "Privacy group: %s"
msgstr "Groupe de contacts&nbsp;: %s"
-#: ../../include/items.php:4166
+#: ../../include/items.php:4216
msgid "Connection not found."
msgstr "Contact non trouvé."
-#: ../../include/items.php:4515
+#: ../../include/items.php:4565
msgid "profile photo"
msgstr "photo de profil"
-#: ../../include/items.php:4706
+#: ../../include/items.php:4756
#, php-format
msgid "[Edited %s]"
msgstr "[%s édité]"
-#: ../../include/items.php:4706
+#: ../../include/items.php:4756
msgctxt "edit_activity"
msgid "Post"
msgstr "Publier"
-#: ../../include/items.php:4706
+#: ../../include/items.php:4756
msgctxt "edit_activity"
msgid "Comment"
msgstr "Commenter"
@@ -13047,120 +13233,120 @@ msgstr "Profil par défaut"
msgid "Unable to retrieve modified identity"
msgstr "Impossible de récupérer l'identité modifiée"
-#: ../../include/channel.php:1298
+#: ../../include/channel.php:1297
msgid "Create New Profile"
msgstr "Créer un nouveau profil"
-#: ../../include/channel.php:1319
+#: ../../include/channel.php:1318
msgid "Visible to everybody"
msgstr "Visible de tous"
-#: ../../include/channel.php:1396 ../../include/channel.php:1524
+#: ../../include/channel.php:1395 ../../include/channel.php:1523
msgid "Gender:"
msgstr "Sexe&nbsp;:"
-#: ../../include/channel.php:1398 ../../include/channel.php:1579
+#: ../../include/channel.php:1397 ../../include/channel.php:1591
msgid "Homepage:"
msgstr "Site Internet&nbsp;:"
-#: ../../include/channel.php:1399
+#: ../../include/channel.php:1398
msgid "Online Now"
msgstr "Connecté"
-#: ../../include/channel.php:1452
+#: ../../include/channel.php:1451
msgid "Change your profile photo"
msgstr "Modifier votre photo de profil"
-#: ../../include/channel.php:1483
+#: ../../include/channel.php:1482
msgid "Trans"
msgstr "Trans"
-#: ../../include/channel.php:1529
+#: ../../include/channel.php:1528
msgid "Like this channel"
msgstr "J'aime ce canal"
-#: ../../include/channel.php:1553
+#: ../../include/channel.php:1552
msgid "j F, Y"
msgstr "j F, Y"
-#: ../../include/channel.php:1554
+#: ../../include/channel.php:1553
msgid "j F"
msgstr "j F"
-#: ../../include/channel.php:1561
+#: ../../include/channel.php:1560
msgid "Birthday:"
msgstr "Date de naissance&nbsp;:"
-#: ../../include/channel.php:1574
+#: ../../include/channel.php:1573
#, php-format
msgid "for %1$d %2$s"
msgstr "depuis %1$d %2$s"
-#: ../../include/channel.php:1577
-msgid "Sexual Preference:"
-msgstr "Orientation sexuelle&nbsp;:"
-
-#: ../../include/channel.php:1583
+#: ../../include/channel.php:1585
msgid "Tags:"
msgstr "Étiquettes&nbsp;:"
-#: ../../include/channel.php:1585
+#: ../../include/channel.php:1589
+msgid "Sexual Preference:"
+msgstr "Orientation sexuelle&nbsp;:"
+
+#: ../../include/channel.php:1595
msgid "Political Views:"
msgstr "Opinions politiques&nbsp;:"
-#: ../../include/channel.php:1587
+#: ../../include/channel.php:1597
msgid "Religion:"
msgstr "Religion&nbsp;:"
-#: ../../include/channel.php:1591
+#: ../../include/channel.php:1601
msgid "Hobbies/Interests:"
msgstr "Occupations/Centres d'intérêt&nbsp;:"
-#: ../../include/channel.php:1593
+#: ../../include/channel.php:1603
msgid "Likes:"
msgstr "Aime&nbsp;:"
-#: ../../include/channel.php:1595
+#: ../../include/channel.php:1605
msgid "Dislikes:"
msgstr "N'aime pas&nbsp;:"
-#: ../../include/channel.php:1597
+#: ../../include/channel.php:1607
msgid "Contact information and Social Networks:"
msgstr "Coordonnées et réseaux sociaux&nbsp;:"
-#: ../../include/channel.php:1599
+#: ../../include/channel.php:1609
msgid "My other channels:"
msgstr "Mes autres canaux&nbsp;:"
-#: ../../include/channel.php:1601
+#: ../../include/channel.php:1611
msgid "Musical interests:"
msgstr "Goûts musicaux&nbsp;:"
-#: ../../include/channel.php:1603
+#: ../../include/channel.php:1613
msgid "Books, literature:"
msgstr "Lectures, goûts littéraires&nbsp;:"
-#: ../../include/channel.php:1605
+#: ../../include/channel.php:1615
msgid "Television:"
msgstr "Télévision&nbsp;:"
-#: ../../include/channel.php:1607
+#: ../../include/channel.php:1617
msgid "Film/dance/culture/entertainment:"
msgstr "Cinéma/danse/culture/divertissement&nsbp;:"
-#: ../../include/channel.php:1609
+#: ../../include/channel.php:1619
msgid "Love/Romance:"
msgstr "Vie sentimentale/amoureuse&nbsp;:"
-#: ../../include/channel.php:1611
+#: ../../include/channel.php:1621
msgid "Work/employment:"
msgstr "Travail/Occupation&nbsp;"
-#: ../../include/channel.php:1613
+#: ../../include/channel.php:1623
msgid "School/education:"
msgstr "Études&nbsp;"
-#: ../../include/channel.php:1636
+#: ../../include/channel.php:1646
msgid "Like this thing"
msgstr "J'aime ceci"
@@ -13200,19 +13386,19 @@ msgstr "En cours"
msgid "Cancelled"
msgstr "Annulé"
-#: ../../include/event.php:1310 ../../include/connections.php:684
+#: ../../include/event.php:1310 ../../include/connections.php:692
msgid "Home, Voice"
msgstr "Domicile, Voix"
-#: ../../include/event.php:1311 ../../include/connections.php:685
+#: ../../include/event.php:1311 ../../include/connections.php:693
msgid "Home, Fax"
msgstr "Domicile, Fax"
-#: ../../include/event.php:1313 ../../include/connections.php:687
+#: ../../include/event.php:1313 ../../include/connections.php:695
msgid "Work, Voice"
msgstr "Travail, Voix"
-#: ../../include/event.php:1314 ../../include/connections.php:688
+#: ../../include/event.php:1314 ../../include/connections.php:696
msgid "Work, Fax"
msgstr "Travail, Fax"
@@ -13220,43 +13406,43 @@ msgstr "Travail, Fax"
msgid "view full size"
msgstr "voir en taille réelle"
-#: ../../include/network.php:1769 ../../include/network.php:1770
+#: ../../include/network.php:1770 ../../include/network.php:1771
msgid "Friendica"
msgstr "Friendica"
-#: ../../include/network.php:1771
+#: ../../include/network.php:1772
msgid "OStatus"
msgstr "OStatus"
-#: ../../include/network.php:1772
+#: ../../include/network.php:1773
msgid "GNU-Social"
msgstr "GNU-Social"
-#: ../../include/network.php:1773
+#: ../../include/network.php:1774
msgid "RSS/Atom"
msgstr "RSS/Atom"
-#: ../../include/network.php:1776
+#: ../../include/network.php:1777
msgid "Diaspora"
msgstr "Diaspora"
-#: ../../include/network.php:1777
+#: ../../include/network.php:1778
msgid "Facebook"
msgstr "Facebook"
-#: ../../include/network.php:1778
+#: ../../include/network.php:1779
msgid "Zot"
msgstr "Zot"
-#: ../../include/network.php:1779
+#: ../../include/network.php:1780
msgid "LinkedIn"
msgstr "Linkedin"
-#: ../../include/network.php:1780
+#: ../../include/network.php:1781
msgid "XMPP/IM"
msgstr "XMPP/IM"
-#: ../../include/network.php:1781
+#: ../../include/network.php:1782
msgid "MySpace"
msgstr "MySpace"
@@ -13298,17 +13484,17 @@ msgstr "Les droits d'accès d'un message %s ne peuvent pas être modifiés %s un
msgid "Cannot locate DNS info for database server '%s'"
msgstr "Impossible de trouver les infos DNS du serveur de BDD '%s'"
-#: ../../include/bbcode.php:198 ../../include/bbcode.php:1151
-#: ../../include/bbcode.php:1154 ../../include/bbcode.php:1159
-#: ../../include/bbcode.php:1162 ../../include/bbcode.php:1165
-#: ../../include/bbcode.php:1168 ../../include/bbcode.php:1173
-#: ../../include/bbcode.php:1176 ../../include/bbcode.php:1181
-#: ../../include/bbcode.php:1184 ../../include/bbcode.php:1187
-#: ../../include/bbcode.php:1190
+#: ../../include/bbcode.php:198 ../../include/bbcode.php:1200
+#: ../../include/bbcode.php:1203 ../../include/bbcode.php:1208
+#: ../../include/bbcode.php:1211 ../../include/bbcode.php:1214
+#: ../../include/bbcode.php:1217 ../../include/bbcode.php:1222
+#: ../../include/bbcode.php:1225 ../../include/bbcode.php:1230
+#: ../../include/bbcode.php:1233 ../../include/bbcode.php:1236
+#: ../../include/bbcode.php:1239
msgid "Image/photo"
msgstr "Image/photo"
-#: ../../include/bbcode.php:237 ../../include/bbcode.php:1201
+#: ../../include/bbcode.php:237 ../../include/bbcode.php:1250
msgid "Encrypted content"
msgstr "Contenu chiffré"
@@ -13324,565 +13510,583 @@ msgid ""
"to install it on this site."
msgstr "Ce message contient un élément installable %s, mais vous n'avez pas le droit de l'installer sur ce site."
-#: ../../include/bbcode.php:335
+#: ../../include/bbcode.php:348
msgid "card"
msgstr "carte"
-#: ../../include/bbcode.php:337
+#: ../../include/bbcode.php:350
msgid "article"
msgstr "article"
-#: ../../include/bbcode.php:420 ../../include/bbcode.php:428
+#: ../../include/bbcode.php:433 ../../include/bbcode.php:441
msgid "Click to open/close"
msgstr "Cliquer pour ouvrir/fermer"
-#: ../../include/bbcode.php:428
+#: ../../include/bbcode.php:441
msgid "spoiler"
msgstr "spoiler"
-#: ../../include/bbcode.php:441
+#: ../../include/bbcode.php:454
msgid "View article"
msgstr "Voir l'article"
-#: ../../include/bbcode.php:441
+#: ../../include/bbcode.php:454
msgid "View summary"
msgstr "Voir le résumé"
-#: ../../include/bbcode.php:1139
+#: ../../include/bbcode.php:1188
msgid "$1 wrote:"
msgstr "$1 a écrit&nbsp;:"
-#: ../../include/oembed.php:328
+#: ../../include/oembed.php:329
msgid " by "
msgstr "par"
-#: ../../include/oembed.php:329
+#: ../../include/oembed.php:330
msgid " on "
msgstr "sur"
-#: ../../include/oembed.php:358
+#: ../../include/oembed.php:359
msgid "Embedded content"
msgstr "Contenu imbriqué"
-#: ../../include/oembed.php:367
+#: ../../include/oembed.php:368
msgid "Embedding disabled"
msgstr "Imbrication désactivée"
-#: ../../include/zid.php:346
+#: ../../include/zid.php:347
#, php-format
msgid "OpenWebAuth: %1$s welcomes %2$s"
msgstr "OpenWebAuth: %1$s accueille favorablement %2$s"
-#: ../../include/features.php:54
+#: ../../include/features.php:56
msgid "General Features"
msgstr "Fonctionnalités générales"
-#: ../../include/features.php:60
+#: ../../include/features.php:61
+msgid "Display new member quick links menu"
+msgstr "Afficher le menu des liens rapides pour les nouveaux membres"
+
+#: ../../include/features.php:69
msgid "Advanced Profiles"
-msgstr "Profils Avancés"
+msgstr "Profils avancés"
-#: ../../include/features.php:61
+#: ../../include/features.php:70
msgid "Additional profile sections and selections"
msgstr "Sections et sélections supplémentaires du profil"
-#: ../../include/features.php:69
+#: ../../include/features.php:78
msgid "Profile Import/Export"
-msgstr "Importer/Exporter le profil"
+msgstr "Importer/exporter le profil"
-#: ../../include/features.php:70
+#: ../../include/features.php:79
msgid "Save and load profile details across sites/channels"
msgstr "Sauvegarder et charger les détails d'un profil entre sites/canaux"
-#: ../../include/features.php:78
+#: ../../include/features.php:87
msgid "Web Pages"
msgstr "Pages web"
-#: ../../include/features.php:79
+#: ../../include/features.php:88
msgid "Provide managed web pages on your channel"
msgstr "Fournir des pages web, sous votre contrôle, sur votre canal"
-#: ../../include/features.php:88
+#: ../../include/features.php:97
msgid "Provide a wiki for your channel"
msgstr "Fournir un wiki pour votre canal."
-#: ../../include/features.php:105
+#: ../../include/features.php:114
msgid "Private Notes"
msgstr "Notes privées"
-#: ../../include/features.php:106
+#: ../../include/features.php:115
msgid "Enables a tool to store notes and reminders (note: not encrypted)"
msgstr "Active un outil pour stocker des notes et des rappels (note&nbsp;:non chiffré)"
-#: ../../include/features.php:115
+#: ../../include/features.php:124
msgid "Create personal planning cards"
msgstr "Créer des cartes de planification personnelle"
-#: ../../include/features.php:125
+#: ../../include/features.php:134
msgid "Create interactive articles"
msgstr "Créer des articles interactifs"
-#: ../../include/features.php:133
+#: ../../include/features.php:142
msgid "Navigation Channel Select"
msgstr "Sélection du canal par la navigation"
-#: ../../include/features.php:134
+#: ../../include/features.php:143
msgid "Change channels directly from within the navigation dropdown menu"
msgstr "Changez de canal directement depuis le menu de navigation déroulant"
-#: ../../include/features.php:142
+#: ../../include/features.php:151
msgid "Photo Location"
msgstr "Site de prise de vue"
-#: ../../include/features.php:143
+#: ../../include/features.php:152
msgid "If location data is available on uploaded photos, link this to a map."
msgstr "Si des informations géographiques sont présentes dans les images téléversées, les lier à une carte."
-#: ../../include/features.php:151
+#: ../../include/features.php:160
msgid "Access Controlled Chatrooms"
msgstr "Accéder au salons de discussions contrôlés."
-#: ../../include/features.php:152
+#: ../../include/features.php:161
msgid "Provide chatrooms and chat services with access control."
msgstr "Fournir des salons de discussions et des services de discussions avec contrôle d'accès."
-#: ../../include/features.php:161
+#: ../../include/features.php:170
msgid "Smart Birthdays"
msgstr "Anniversaires intelligents"
-#: ../../include/features.php:162
+#: ../../include/features.php:171
msgid ""
"Make birthday events timezone aware in case your friends are scattered "
"across the planet."
msgstr "Adapter les anniversaires aux fuseaux horaires, utile pour vos amis sur d'autres continents."
-#: ../../include/features.php:170
+#: ../../include/features.php:179
msgid "Event Timezone Selection"
msgstr "Sélection du fuseau horaire de l'événement"
-#: ../../include/features.php:171
+#: ../../include/features.php:180
msgid "Allow event creation in timezones other than your own."
msgstr "Autorise la création d’événements sur d'autres fuseaux horaires que le vôtre."
-#: ../../include/features.php:180
+#: ../../include/features.php:189
msgid "Premium Channel"
msgstr "Canal VIP"
-#: ../../include/features.php:181
+#: ../../include/features.php:190
msgid ""
"Allows you to set restrictions and terms on those that connect with your "
"channel"
msgstr "Vous permet d'appliquer des règles et restrictions aux contacts de votre canal"
-#: ../../include/features.php:189
+#: ../../include/features.php:198
msgid "Advanced Directory Search"
msgstr "Recherche avancée dans les répertoires"
-#: ../../include/features.php:190
+#: ../../include/features.php:199
msgid "Allows creation of complex directory search queries"
msgstr "Autoriser la création d'entrées complexes de recherche de répertoire"
-#: ../../include/features.php:198
+#: ../../include/features.php:207
msgid "Advanced Theme and Layout Settings"
msgstr "Paramètres avancés du thème et de l'agencement."
-#: ../../include/features.php:199
+#: ../../include/features.php:208
msgid "Allows fine tuning of themes and page layouts"
msgstr "Autoriser la personnalisation fine des thèmes et des agencements."
-#: ../../include/features.php:208
+#: ../../include/features.php:217
msgid "Access Control and Permissions"
msgstr "Contrôle d'accès et autorisations"
-#: ../../include/features.php:212 ../../include/group.php:328
+#: ../../include/features.php:221 ../../include/group.php:328
msgid "Privacy Groups"
msgstr "Groupes de contacts"
-#: ../../include/features.php:213
+#: ../../include/features.php:222
msgid "Enable management and selection of privacy groups"
msgstr "Active la gestion et la sélection des groupes de contacts"
-#: ../../include/features.php:221
+#: ../../include/features.php:230
msgid "Multiple Profiles"
msgstr "Profils multiples"
-#: ../../include/features.php:222
+#: ../../include/features.php:231
msgid "Ability to create multiple profiles"
msgstr "Possibilité de créer plusieurs profils"
-#: ../../include/features.php:232
+#: ../../include/features.php:241
msgid "Provide alternate connection permission roles."
msgstr "Fournir des rôles d'accès différents pour ce contact."
-#: ../../include/features.php:240
-msgid "OAuth Clients"
-msgstr "Clients OAuth"
+#: ../../include/features.php:249
+msgid "OAuth1 Clients"
+msgstr "Clients OAuth1"
-#: ../../include/features.php:241
-msgid "Manage authenticatication tokens for mobile and remote apps."
-msgstr "Gérer les jetons d'authentification pour les applications mobiles et distantes."
+#: ../../include/features.php:250
+msgid "Manage OAuth1 authenticatication tokens for mobile and remote apps."
+msgstr "Gérer les jetons d'authentification OAuth1 pour les applications mobiles et distantes."
-#: ../../include/features.php:249
+#: ../../include/features.php:258
+msgid "OAuth2 Clients"
+msgstr "Clients OAuth2"
+
+#: ../../include/features.php:259
+msgid "Manage OAuth2 authenticatication tokens for mobile and remote apps."
+msgstr "Gérer les jetons d'authentification OAuth2 pour les applications mobiles et distantes."
+
+#: ../../include/features.php:267
msgid "Access Tokens"
msgstr "Jetons d'accès."
-#: ../../include/features.php:250
+#: ../../include/features.php:268
msgid "Create access tokens so that non-members can access private content."
msgstr "Créez des jetons d'accès pour que les non-membres puissent accéder au contenu privé."
-#: ../../include/features.php:261
+#: ../../include/features.php:279
msgid "Post Composition Features"
msgstr "Fonctionnalités de composition"
-#: ../../include/features.php:265
+#: ../../include/features.php:283
msgid "Large Photos"
msgstr "Grandes photos"
-#: ../../include/features.php:266
+#: ../../include/features.php:284
msgid ""
"Include large (1024px) photo thumbnails in posts. If not enabled, use small "
"(640px) photo thumbnails"
msgstr "Inclure de grands aperçus (1024px) dans les messages. Si désactivé, inclure de petits aperçus (640px)."
-#: ../../include/features.php:275
+#: ../../include/features.php:293
msgid "Automatically import channel content from other channels or feeds"
msgstr "Importe automatiquement le contenus d'autres canaux ou flux dans le canal actif"
-#: ../../include/features.php:283
+#: ../../include/features.php:301
msgid "Even More Encryption"
msgstr "Encore plus de chiffrement"
-#: ../../include/features.php:284
+#: ../../include/features.php:302
msgid ""
"Allow optional encryption of content end-to-end with a shared secret key"
msgstr "Permettre le chiffrement optionnel du contenu de bout en bout au moyen d'un secret partagé"
-#: ../../include/features.php:292
+#: ../../include/features.php:310
msgid "Enable Voting Tools"
msgstr "Activer les outils de vote"
-#: ../../include/features.php:293
+#: ../../include/features.php:311
msgid "Provide a class of post which others can vote on"
msgstr "Fournit un type de publication sur lequel les utilisateurs peuvent voter"
-#: ../../include/features.php:301
+#: ../../include/features.php:319
msgid "Disable Comments"
msgstr "Désactiver les commentaires"
-#: ../../include/features.php:302
+#: ../../include/features.php:320
msgid "Provide the option to disable comments for a post"
msgstr "Fournir la possibilité de désactiver les commentaires pour une publication."
-#: ../../include/features.php:310
+#: ../../include/features.php:328
msgid "Delayed Posting"
msgstr "Publication plus tard"
-#: ../../include/features.php:311
+#: ../../include/features.php:329
msgid "Allow posts to be published at a later date"
msgstr "Permettre de publier des messages à une date programmée"
-#: ../../include/features.php:319
+#: ../../include/features.php:337
msgid "Content Expiration"
msgstr "Expiration du contenu"
-#: ../../include/features.php:320
+#: ../../include/features.php:338
msgid "Remove posts/comments and/or private messages at a future time"
msgstr "Supprimer les contributions/commentaires et/ou messages privés plus tard"
-#: ../../include/features.php:328
+#: ../../include/features.php:346
msgid "Suppress Duplicate Posts/Comments"
msgstr "Supprimer les publications/commentaires en doublon"
-#: ../../include/features.php:329
+#: ../../include/features.php:347
msgid ""
"Prevent posts with identical content to be published with less than two "
"minutes in between submissions."
msgstr "Empêcher des messages aux contenus identiques d'être publiés à moins de deux minutes d'intervalle"
-#: ../../include/features.php:340
+#: ../../include/features.php:355
+msgid "Auto-save drafts of posts and comments"
+msgstr "Sauvegarde automatique des brouillons de messages et commentaires"
+
+#: ../../include/features.php:356
+msgid ""
+"Automatically saves post and comment drafts in local browser storage to help"
+" prevent accidental loss of compositions"
+msgstr "Enregistre automatiquement les brouillons de messages et de commentaires dans le stockage local du navigateur pour aider à prévenir la perte accidentelle de compositions."
+
+#: ../../include/features.php:367
msgid "Network and Stream Filtering"
msgstr "Filtrage du réseau et des flux"
-#: ../../include/features.php:344
+#: ../../include/features.php:371
msgid "Search by Date"
msgstr "Chercher par date"
-#: ../../include/features.php:345
+#: ../../include/features.php:372
msgid "Ability to select posts by date ranges"
msgstr "Pouvoir choisir des publications par date"
-#: ../../include/features.php:355
+#: ../../include/features.php:382
msgid "Save search terms for re-use"
msgstr "Sauvegarder des termes de recherche pour utilisation ultérieure"
-#: ../../include/features.php:363
+#: ../../include/features.php:390
msgid "Network Personal Tab"
msgstr "Onglet \"Me concernant\""
-#: ../../include/features.php:364
+#: ../../include/features.php:391
msgid "Enable tab to display only Network posts that you've interacted on"
msgstr "Activer un onglet affichant seulement les publications du réseau sur lesquelles vous êtes intervenu"
-#: ../../include/features.php:372
+#: ../../include/features.php:399
msgid "Network New Tab"
msgstr "Onglet \"nouveautés réseau\""
-#: ../../include/features.php:373
+#: ../../include/features.php:400
msgid "Enable tab to display all new Network activity"
msgstr "Activer un onglet présentant toute l'activité récente sur le réseau"
-#: ../../include/features.php:381
+#: ../../include/features.php:408
msgid "Affinity Tool"
msgstr "Gérer l'affinité"
-#: ../../include/features.php:382
+#: ../../include/features.php:409
msgid "Filter stream activity by depth of relationships"
msgstr "Filtrer le flux d'activité en fonction de la profondeur des relations"
-#: ../../include/features.php:391
+#: ../../include/features.php:418
msgid "Show friend and connection suggestions"
msgstr "Afficher les suggestions de mise en contact"
-#: ../../include/features.php:399
+#: ../../include/features.php:426
msgid "Connection Filtering"
msgstr "Filtrage des contacts"
-#: ../../include/features.php:400
+#: ../../include/features.php:427
msgid "Filter incoming posts from connections based on keywords/content"
msgstr "Filtrer les publications entrantes de mes contacts sur la base de mots-clefs"
-#: ../../include/features.php:412
+#: ../../include/features.php:439
msgid "Post/Comment Tools"
msgstr "Gérer les publications/commentaires"
-#: ../../include/features.php:416
+#: ../../include/features.php:443
msgid "Community Tagging"
msgstr "Etiquetage communautaire"
-#: ../../include/features.php:417
+#: ../../include/features.php:444
msgid "Ability to tag existing posts"
msgstr "Permettre de marquer les publications existantes"
-#: ../../include/features.php:425
+#: ../../include/features.php:452
msgid "Post Categories"
msgstr "Catégoriser les publications"
-#: ../../include/features.php:426
+#: ../../include/features.php:453
msgid "Add categories to your posts"
msgstr "Ajouter des catégories à vos publications"
-#: ../../include/features.php:434
+#: ../../include/features.php:461
msgid "Emoji Reactions"
msgstr "Réactions par émoticônes"
-#: ../../include/features.php:435
+#: ../../include/features.php:462
msgid "Add emoji reaction ability to posts"
msgstr "Ajouter la possibilité de réagir aux publications par émoticônes"
-#: ../../include/features.php:444
+#: ../../include/features.php:471
msgid "Ability to file posts under folders"
msgstr "Permettre de classer les publications dans des dossiers"
-#: ../../include/features.php:452
+#: ../../include/features.php:479
msgid "Dislike Posts"
msgstr "\"Ne pas aimer\" les publications"
-#: ../../include/features.php:453
+#: ../../include/features.php:480
msgid "Ability to dislike posts/comments"
msgstr "Possibilité de \"ne pas aimer\" les publications/commentaires"
-#: ../../include/features.php:461
+#: ../../include/features.php:488
msgid "Star Posts"
msgstr "Pouvoir mettre en avant les publications"
-#: ../../include/features.php:462
+#: ../../include/features.php:489
msgid "Ability to mark special posts with a star indicator"
msgstr "Pouvoir marquer certaines publications d'une étoile"
-#: ../../include/features.php:470
+#: ../../include/features.php:497
msgid "Tag Cloud"
msgstr "Nuage de tags"
-#: ../../include/features.php:471
+#: ../../include/features.php:498
msgid "Provide a personal tag cloud on your channel page"
msgstr "Afficher un nuage de vos tags sur votre canal"
-#: ../../include/taxonomy.php:384 ../../include/taxonomy.php:405
-msgid "Tags"
-msgstr "Étiquettes"
-
-#: ../../include/taxonomy.php:487
+#: ../../include/taxonomy.php:491
msgid "Keywords"
msgstr "Mots-clefs"
-#: ../../include/taxonomy.php:508
+#: ../../include/taxonomy.php:512
msgid "have"
msgstr "ont"
-#: ../../include/taxonomy.php:508
+#: ../../include/taxonomy.php:512
msgid "has"
msgstr "a"
-#: ../../include/taxonomy.php:509
+#: ../../include/taxonomy.php:513
msgid "want"
msgstr "veulent"
-#: ../../include/taxonomy.php:509
+#: ../../include/taxonomy.php:513
msgid "wants"
msgstr "veut"
-#: ../../include/taxonomy.php:510
+#: ../../include/taxonomy.php:514
msgid "likes"
msgstr "aime"
-#: ../../include/taxonomy.php:511
+#: ../../include/taxonomy.php:515
msgid "dislikes"
msgstr "n'aime pas"
-#: ../../include/account.php:35
+#: ../../include/account.php:36
msgid "Not a valid email address"
msgstr "Ce n'est pas une adresse de courriel valide"
-#: ../../include/account.php:37
+#: ../../include/account.php:38
msgid "Your email domain is not among those allowed on this site"
msgstr "Votre domaine de courriel ne fait pas partie de ceux autorisés par ce site"
-#: ../../include/account.php:43
+#: ../../include/account.php:44
msgid "Your email address is already registered at this site."
msgstr "Votre adresse de courriel est déjà inscrite sur ce site."
-#: ../../include/account.php:75
+#: ../../include/account.php:76
msgid "An invitation is required."
msgstr "Une invitation est requise."
-#: ../../include/account.php:79
+#: ../../include/account.php:80
msgid "Invitation could not be verified."
msgstr "Votre invitation n'a pas pu être vérifiée."
-#: ../../include/account.php:157
+#: ../../include/account.php:158
msgid "Please enter the required information."
msgstr "Merci d'entrer les informations requises."
-#: ../../include/account.php:224
+#: ../../include/account.php:225
msgid "Failed to store account information."
msgstr "Impossible de stocker les informations liées au compte."
-#: ../../include/account.php:313
+#: ../../include/account.php:314
#, php-format
msgid "Registration confirmation for %s"
msgstr "Confirmation de l'inscription pour %s"
-#: ../../include/account.php:382
+#: ../../include/account.php:383
#, php-format
msgid "Registration request at %s"
msgstr "Demande d'inscription sur %s"
-#: ../../include/account.php:404
+#: ../../include/account.php:405
msgid "your registration password"
msgstr "votre mot de passe d'inscription"
-#: ../../include/account.php:410 ../../include/account.php:472
+#: ../../include/account.php:411 ../../include/account.php:473
#, php-format
msgid "Registration details for %s"
msgstr "Détails de l'inscription pour %s"
-#: ../../include/account.php:483
+#: ../../include/account.php:484
msgid "Account approved."
msgstr "Compte validé."
-#: ../../include/account.php:523
+#: ../../include/account.php:524
#, php-format
msgid "Registration revoked for %s"
msgstr "Inscription révoquée pour %s"
-#: ../../include/account.php:802 ../../include/account.php:804
+#: ../../include/account.php:803 ../../include/account.php:805
msgid "Click here to upgrade."
msgstr "Cliquez ici pour mettre à jour."
-#: ../../include/account.php:810
+#: ../../include/account.php:811
msgid "This action exceeds the limits set by your subscription plan."
msgstr "Cette action outrepasserait les limites prévues par votre forfait."
-#: ../../include/account.php:815
+#: ../../include/account.php:816
msgid "This action is not available under your subscription plan."
msgstr "Cette action n'est pas disponible avec votre forfait."
-#: ../../include/datetime.php:134
+#: ../../include/datetime.php:140
msgid "Birthday"
msgstr "Anniversaire"
-#: ../../include/datetime.php:134
+#: ../../include/datetime.php:140
msgid "Age: "
msgstr "Age&nbsp;:"
-#: ../../include/datetime.php:134
+#: ../../include/datetime.php:140
msgid "YYYY-MM-DD or MM-DD"
msgstr "AAAA-MM-JJ ou MM-JJ"
-#: ../../include/datetime.php:238
+#: ../../include/datetime.php:244
msgid "less than a second ago"
msgstr "à l'instant"
-#: ../../include/datetime.php:256
+#: ../../include/datetime.php:262
#, php-format
msgctxt "e.g. 22 hours ago, 1 minute ago"
msgid "%1$d %2$s ago"
msgstr "il y a %1$d %2$s"
-#: ../../include/datetime.php:267
+#: ../../include/datetime.php:273
msgctxt "relative_date"
msgid "year"
msgid_plural "years"
msgstr[0] "an"
msgstr[1] "ans"
-#: ../../include/datetime.php:270
+#: ../../include/datetime.php:276
msgctxt "relative_date"
msgid "month"
msgid_plural "months"
msgstr[0] "mois"
msgstr[1] "mois"
-#: ../../include/datetime.php:273
+#: ../../include/datetime.php:279
msgctxt "relative_date"
msgid "week"
msgid_plural "weeks"
msgstr[0] "semaine"
msgstr[1] "semaines"
-#: ../../include/datetime.php:276
+#: ../../include/datetime.php:282
msgctxt "relative_date"
msgid "day"
msgid_plural "days"
msgstr[0] "jour"
msgstr[1] "jours"
-#: ../../include/datetime.php:279
+#: ../../include/datetime.php:285
msgctxt "relative_date"
msgid "hour"
msgid_plural "hours"
msgstr[0] "heure"
msgstr[1] "heures"
-#: ../../include/datetime.php:282
+#: ../../include/datetime.php:288
msgctxt "relative_date"
msgid "minute"
msgid_plural "minutes"
msgstr[0] "minute"
msgstr[1] "minutes"
-#: ../../include/datetime.php:285
+#: ../../include/datetime.php:291
msgctxt "relative_date"
msgid "second"
msgid_plural "seconds"
msgstr[0] "seconde"
msgstr[1] "secondes"
-#: ../../include/datetime.php:514
+#: ../../include/datetime.php:520
#, php-format
msgid "%1$s's birthday"
msgstr "Anniversaire de %1$s"
-#: ../../include/datetime.php:515
+#: ../../include/datetime.php:521
#, php-format
msgid "Happy Birthday %1$s"
msgstr "Joyeux Anniversaire %1$s"
@@ -13976,34 +14180,34 @@ msgstr "L'image est vide."
msgid "Photo storage failed."
msgstr "Le stockage de l'image a échoué."
-#: ../../include/photos.php:364
+#: ../../include/photos.php:371
msgid "a new photo"
msgstr "une nouvelle photo"
-#: ../../include/photos.php:368
+#: ../../include/photos.php:375
#, php-format
msgctxt "photo_upload"
msgid "%1$s posted %2$s to %3$s"
msgstr "%1$s a publié %2$s pour %3$s"
-#: ../../include/photos.php:660
+#: ../../include/photos.php:667
msgid "Upload New Photos"
msgstr "Ajouter des photos"
-#: ../../include/zot.php:767
+#: ../../include/zot.php:772
msgid "Invalid data packet"
msgstr "Paquet de données invalide"
-#: ../../include/zot.php:794
+#: ../../include/zot.php:799
msgid "Unable to verify channel signature"
msgstr "Impossible de vérifier la signature du canal"
-#: ../../include/zot.php:2529
+#: ../../include/zot.php:2552
#, php-format
msgid "Unable to verify site signature for %s"
msgstr "Impossible de vérifier la signature de site pour %s"
-#: ../../include/zot.php:4180
+#: ../../include/zot.php:4206
msgid "invalid target signature"
msgstr "signature de la cible invalide"
@@ -14034,23 +14238,27 @@ msgstr "Créer un groupe de contacts"
msgid "Channels not in any privacy group"
msgstr "Contacts n'étant dans aucun groupe de contacts"
-#: ../../include/connections.php:128
+#: ../../include/connections.php:133
msgid "New window"
msgstr "Nouvelle fenêtre"
-#: ../../include/connections.php:129
+#: ../../include/connections.php:134
msgid "Open the selected location in a different window or browser tab"
msgstr "Ouvrir l'emplacement dans une fenêtre ou un onglet différent"
-#: ../../include/auth.php:148
+#: ../../include/auth.php:152
+msgid "Delegation session ended."
+msgstr "La séance de délégation a pris fin."
+
+#: ../../include/auth.php:156
msgid "Logged out."
msgstr "Deconnecté."
-#: ../../include/auth.php:263
+#: ../../include/auth.php:273
msgid "Email validation is incomplete. Please check your email."
msgstr "La validation du courriel est incomplète. Veuillez vérifier l'adresse courriel."
-#: ../../include/auth.php:279
+#: ../../include/auth.php:289
msgid "Failed authentication"
msgstr "Échec de l'authentification"
diff --git a/view/fr/hstrings.php b/view/fr/hstrings.php
index f7fe764cd..6941f6321 100644
--- a/view/fr/hstrings.php
+++ b/view/fr/hstrings.php
@@ -7,7 +7,7 @@ function string_plural_select_fr($n){
App::$rtl = 0;
App::$strings["Can view my channel stream and posts"] = "Peut voir mon canal et mes publications";
App::$strings["Can send me their channel stream and posts"] = "Peuvent m'envoyer leur flux et les publications de leur canal";
-App::$strings["Can view my default channel profile"] = "Peut voir le profil par défaut du canal.";
+App::$strings["Can view my default channel profile"] = "Peut voir le profil par défaut du canal";
App::$strings["Can view my connections"] = "Peut voir mes contacts";
App::$strings["Can view my file storage and photos"] = "Peut voir mes fichiers et photos";
App::$strings["Can upload/modify my file storage and photos"] = "Peut télécharger/modifier mes fichiers et mes photos";
@@ -15,15 +15,16 @@ App::$strings["Can view my channel webpages"] = "Peut voir les pages web de mon
App::$strings["Can view my wiki pages"] = "Peut voir les pages de mon wiki";
App::$strings["Can create/edit my channel webpages"] = "Peut créer ou modifier les pages web de mon canal";
App::$strings["Can write to my wiki pages"] = "Peut écrire sur mon wiki";
-App::$strings["Can post on my channel (wall) page"] = "Peut écrire sur le mur de mon canal (mur)";
+App::$strings["Can post on my channel (wall) page"] = "Peut poster sur mon canal (\"mur\")";
App::$strings["Can comment on or like my posts"] = "Peuvent commenter et/ou aimer mes publications";
App::$strings["Can send me private mail messages"] = "Peuvent m'envoyer des messages privés";
-App::$strings["Can like/dislike profiles and profile things"] = "Peut aimer ou détester des profiles";
+App::$strings["Can like/dislike profiles and profile things"] = "Peut aimer ou détester des profils";
App::$strings["Can forward to all my channel connections via @+ mentions in posts"] = "Peut faire suivre à tous mes contacts avec la mention @+ dans une publication";
App::$strings["Can chat with me"] = "Peut discuter avec moi";
App::$strings["Can source my public posts in derived channels"] = "Peut rediriger mes publications publiques vers des canaux dérivés";
App::$strings["Can administer my channel"] = "Peut administrer mon canal";
App::$strings["Social Networking"] = "Réseau social";
+App::$strings["Social - Party"] = "Social - Fête";
App::$strings["Social - Mostly Public"] = "Social - principalement public";
App::$strings["Social - Restricted"] = "Social - restreint";
App::$strings["Social - Private"] = "Social - privé";
@@ -362,11 +363,10 @@ App::$strings["Error: PDO database PHP module required but not installed."] = "E
App::$strings["Error: mb_string PHP module required but not installed."] = "Erreur&nbsp;: le module mb_string de PHP est requis, mais pas installé.";
App::$strings["Error: xml PHP module required for DAV but not installed."] = "Erreur&nbsp;: le module xml de PHP est requis pour le DAV, mais pas installé.";
App::$strings["Error: zip PHP module required but not installed."] = "Erreur&nbsp;: le module zip de PHP est requis, mais pas installé.";
+App::$strings[".htconfig.php is writable"] = "Le fichier .htconfig.php est accessible en écriture";
App::$strings["The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so."] = "L'installeur web a besoin de créer un fichier \".htconfig.php\" à la racine de votre serveur web, mais en est incapable.";
App::$strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "C'est généralement lié à un problème de droits d'accès, à cause duquel le serveur web est interdit d'écriture dans le répertoire concerné - alors que votre propre utilisateur a le droit.";
-App::$strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Red top folder."] = "Au terme de cette procédure, nous vous transmettrons un texte à sauvegarder dans un fichier nommé .htconfig.php, à la racine de votre installation de \$Projectname.";
-App::$strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"install/INSTALL.txt\" for instructions."] = "Autrement, vous pouvez contourner toute cette procédure et réaliser l'installation manuellement. Merci de consulter le fichier \"install/INSTALL.txt\" pour les instructions détaillées.";
-App::$strings[".htconfig.php is writable"] = "Le fichier .htconfig.php est accessible en écriture";
+App::$strings["Please see install/INSTALL.txt for additional information."] = "Merci de vous reporter à install/INSTALL.txt pour des informations supplémentaires.";
App::$strings["This software uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Ce logiciel utilise Smarty3 comme moteur de modèles pour afficher ses vues Web. Smarty3 compile ses modèles en PHP pour accélérer le rendu.";
App::$strings["In order to store these compiled templates, the web server needs to have write access to the directory %s under the top level web folder."] = "Afin de stocker ces modèles compilés, le serveur Web doit disposer d'un accès en écriture au répertoire %s selon le dossier Web racine.";
App::$strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Merci de vous assurer que l'utilisateur sous lequel le serveur web tourne (le plus souvent, www-data) a bien l'autorisation d'écrire dans ce répertoire.";
@@ -551,8 +551,6 @@ App::$strings["Publicly visible description of this site. Displayed on siteinfo
App::$strings["System language"] = "Langue du système";
App::$strings["System theme"] = "Thème du système";
App::$strings["Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"] = "Thème par défaut - il peut être changé pour chaque profil utilisateur - <a href='#' id='cnftheme'>modifier le thème</a>";
-App::$strings["Mobile system theme"] = "Thème par défaut pour les mobiles";
-App::$strings["Theme for mobile devices"] = "Thème pour les mobiles";
App::$strings["Allow Feeds as Connections"] = "Autoriser les Flux (RSS) comme contacts";
App::$strings["(Heavy system resource usage)"] = "(Impact important sur les ressources)";
App::$strings["Maximum image size"] = "Taille maximale des images";
@@ -612,6 +610,7 @@ App::$strings["Maximum Load Average"] = "Charge maximale moyenne";
App::$strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Charge système maximale au-delà de laquelle distribution et scrutation sont reportées - par défaut 50.";
App::$strings["Expiration period in days for imported (grid/network) content"] = "Délai d'expiration pour le contenu importé (réseau)";
App::$strings["0 for no expiration of imported content"] = "0 pour ne pas expirer le contenu importé";
+App::$strings["Do not expire any posts which have comments less than this many days ago"] = "Ne pas considérer comme expirés les messages qui ont reçu des commentaires depuis moins de ce nombre de jours";
App::$strings["Public servers: Optional landing (marketing) webpage for new registrants"] = "Serveurs publics : page Web facultative d'atterrissage (marketing) pour les nouveaux inscrits.";
App::$strings["Create this page first. Default is %s/register"] = "Créez d'abord cette page. La valeur par défaut est %s /register";
App::$strings["Page to display after creating a new channel"] = "Page à afficher après la création d'un nouveau canal";
@@ -763,9 +762,10 @@ App::$strings["New connections"] = "Nouveaux contacts";
App::$strings["System Registrations"] = "Inscriptions système";
App::$strings["Unseen shared files"] = "Fichiers partagés non vus";
App::$strings["Unseen public activity"] = "Activité publique non vue";
+App::$strings["Unseen likes and dislikes"] = "Aime et n'aime pas non consultés";
App::$strings["Email notification hub (hostname)"] = "Concentrateur de notification par courriel (nom d'hôte)";
App::$strings["If your channel is mirrored to multiple hubs, set this to your preferred location. This will prevent duplicate email notifications. Example: %s"] = "Si votre canal est dupliqué sur plusieurs hubs, définissez cet emplacement comme votre emplacement préféré. Cela empêchera les notifications par courriel en double. Exemple : %s";
-App::$strings["Also show new wall posts, private messages and connections under Notices"] = "Afficher également les nouvelles publications sur le mur, les messages privés et les contacts dans Notifications";
+App::$strings["Show new wall posts, private messages and connections under Notices"] = "Montrer les nouveaux envois, messages privés et les nouvelles connexions dans Notifications";
App::$strings["Notify me of events this many days in advance"] = "Me prévenir d’événements à venir tant de jours en avance";
App::$strings["Must be greater than 0"] = "Doit être supérieur à 0";
App::$strings["Advanced Account/Page Type Settings"] = "Paramètres avancés de compte/type de page";
@@ -779,6 +779,8 @@ App::$strings["Remove this channel."] = "Supprimer ce canal";
App::$strings["Firefox Share \$Projectname provider"] = "Connecteur \$Projectname pour Firefox Share";
App::$strings["Start calendar week on Monday"] = "Commencer la semaine du calendrier le lundi";
App::$strings["Additional Features"] = "Fonctionnalités additionnelles";
+App::$strings["Your technical skill level"] = "Votre niveau technique";
+App::$strings["Used to provide a member experience and additional features consistent with your comfort level"] = "Utilisé pour offrir une expérience de membre et des fonctions supplémentaires compatibles avec votre niveau de confort.";
App::$strings["This channel is limited to %d tokens"] = "Ce canal est limité à %d jetons";
App::$strings["Name and Password are required."] = "Le nom et le mot de passe sont requis";
App::$strings["Token saved."] = "Jeton sauvegardé";
@@ -789,6 +791,22 @@ App::$strings["Login Name"] = "Nom d'utilisateur";
App::$strings["Login Password"] = "Mot de passe";
App::$strings["Expires (yyyy-mm-dd)"] = "Date d'expiration sous la forme année mois jour (AAAA-MM-JJ)";
App::$strings["Their Settings"] = "Leurs paramètres";
+App::$strings["Name and Secret are required"] = "Un nom et un secret sont requis";
+App::$strings["Add OAuth2 application"] = "Ajouter une application OAuth2";
+App::$strings["Name of application"] = "Nom de l'application";
+App::$strings["Consumer Secret"] = "Secret client";
+App::$strings["Automatically generated - change if desired. Max length 20"] = "Généré automatiquement - à changer si besoin. Longueur maximale 20 caractères.";
+App::$strings["Redirect"] = "Redirection";
+App::$strings["Redirect URI - leave blank unless your application specifically requires this"] = "URI de redirection - laissez vide, sauf si votre application le requiert spécifiquement";
+App::$strings["Grant Types"] = "Types de bourses";
+App::$strings["leave blank unless your application sepcifically requires this"] = "Laisser vide, sauf si votre application le requiert spécifiquement";
+App::$strings["Authorization scope"] = "Portée de l'autorisation";
+App::$strings["OAuth2 Application not found."] = "Application OAuth2 introuvable";
+App::$strings["Add application"] = "Ajouter une application";
+App::$strings["Connected OAuth2 Apps"] = "Applications OAuth2 connectées";
+App::$strings["Client key starts with"] = "La clef partagée commence par";
+App::$strings["No name"] = "Sans nom";
+App::$strings["Remove authorization"] = "Révoquer l'autorisation";
App::$strings["Not valid email."] = "Adresse de courriel non valide.";
App::$strings["Protected email address. Cannot change to that email."] = "Adresse de courriel protégée. Impossible de l'utiliser.";
App::$strings["System failure storing new email. Please try again."] = "Défaillance système lors du stockage de la nouvelle adresse de courriel. Merci d'essayer à nouveau.";
@@ -803,8 +821,6 @@ App::$strings["Current Password"] = "Mot de passe actuel";
App::$strings["Enter New Password"] = "Entrez votre nouveau mot de passe";
App::$strings["Confirm New Password"] = "Confirmez le nouveau mot de passe";
App::$strings["Leave password fields blank unless changing"] = "Laissez les mots de passe vides si vous ne voulez pas les modifier";
-App::$strings["Your technical skill level"] = "Votre niveau technique";
-App::$strings["Used to provide a member experience and additional features consistent with your comfort level"] = "Utilisé pour offrir une expérience de membre et des fonctions supplémentaires compatibles avec votre niveau de confort.";
App::$strings["Remove Account"] = "Supprimer le compte";
App::$strings["Remove this account including all its channels"] = "Supprimer ce compte et tous ses canaux";
App::$strings["Affinity Slider settings updated."] = "Paramètres de la réglette d'affinité mis à jour.";
@@ -845,20 +861,11 @@ App::$strings["click to expand content exceeding this height"] = "cliquer pour d
App::$strings["Grid page max height of content (in pixels)"] = "Hauteur maximale du contenu sur la page du réseau (en pixels)";
App::$strings["Name is required"] = "Le nom est requis";
App::$strings["Key and Secret are required"] = "Clef et secret sont requis";
-App::$strings["Add application"] = "Ajouter une application";
-App::$strings["Name of application"] = "Nom de l'application";
App::$strings["Consumer Key"] = "Clef client";
-App::$strings["Automatically generated - change if desired. Max length 20"] = "Généré automatiquement - à changer si besoin. Longueur maximale 20 caractères.";
-App::$strings["Consumer Secret"] = "Secret client";
-App::$strings["Redirect"] = "Redirection";
-App::$strings["Redirect URI - leave blank unless your application specifically requires this"] = "URI de redirection - laissez vide, sauf si votre application le requiert spécifiquement";
App::$strings["Icon url"] = "URL de l'icône";
App::$strings["Optional"] = "Facultatif";
App::$strings["Application not found."] = "Application introuvable.";
App::$strings["Connected Apps"] = "Applications connectées";
-App::$strings["Client key starts with"] = "La clef partagée commence par";
-App::$strings["No name"] = "Sans nom";
-App::$strings["Remove authorization"] = "Révoquer l'autorisation";
App::$strings["View Photo"] = "Voir la photo";
App::$strings["Edit Album"] = "Modifier l'album";
App::$strings["Upload"] = "Envoyer";
@@ -880,7 +887,7 @@ App::$strings["Permissions"] = "Droits d'accès";
App::$strings["Add Thing to your Profile"] = "Ajouter l'élément à votre profil";
App::$strings["No more system notifications."] = "Pas d'autre notification du système.";
App::$strings["System Notifications"] = "Notifications du système";
-App::$strings["Channel added."] = "Canal ajouté.";
+App::$strings["Connection added."] = "Connexion ajoutée.";
App::$strings["Your service plan only allows %d channels."] = "Votre forfait n'autorise que %d canaux.";
App::$strings["No channel. Import failed."] = "Pas de canal. Echec de l'import.";
App::$strings["Import completed."] = "L'import est terminé.";
@@ -915,19 +922,22 @@ App::$strings["Create new app"] = "Créer une application";
App::$strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s est %2\$s";
App::$strings["Mood"] = "Humeur";
App::$strings["Set your current mood and tell your friends"] = "Indiquez votre humeur du moment à vos amis";
+App::$strings["Active"] = "Active";
App::$strings["Blocked"] = "Bloqué(e)";
App::$strings["Ignored"] = "Ignoré(e)";
App::$strings["Hidden"] = "Caché";
App::$strings["Archived/Unreachable"] = "Archivé/Injoignable";
App::$strings["New"] = "Nouveautés";
App::$strings["All"] = "Tous";
+App::$strings["Active Connections"] = "Connexions actives";
+App::$strings["Show active connections"] = "Voir les connexions actives";
App::$strings["New Connections"] = "Nouveaux contacts";
App::$strings["Show pending (new) connections"] = "Voir les (nouveaux) contacts en attente";
-App::$strings["Show all connections"] = "Voir tous les contacts";
App::$strings["Only show blocked connections"] = "Ne montrer que les contacts bloqués";
App::$strings["Only show ignored connections"] = "Ne montrer que les contacts ignorés";
App::$strings["Only show archived/unreachable connections"] = "Ne montrer que les contacts archivés/injoignables";
App::$strings["Only show hidden connections"] = "Ne montrer que les contacts cachés";
+App::$strings["Show all connections"] = "Voir tous les contacts";
App::$strings["Pending approval"] = "En attente de validation";
App::$strings["Archived"] = "Archivé";
App::$strings["Not connected at this location"] = "Contact introuvable à cette adresse";
@@ -969,10 +979,10 @@ App::$strings["Upload Photos"] = "Téléverser des photos";
App::$strings["Enter an album name"] = "Entrer un nom d'album";
App::$strings["or select an existing album (doubleclick)"] = "ou sélectionner un album existant (double-clic)";
App::$strings["Create a status post for this upload"] = "Créer une publication de statut pour cet envoi";
-App::$strings["Caption (optional):"] = "Légende (facultative)";
-App::$strings["Description (optional):"] = "Description (facultative)";
+App::$strings["Description (optional)"] = "Description (facultative)";
App::$strings["Show Newest First"] = "Les plus récent(e)s en premier";
App::$strings["Show Oldest First"] = "Les moins récent(e)s en premier";
+App::$strings["Add Photos"] = "Ajouter des photos";
App::$strings["Permission denied. Access to this item may be restricted."] = "Accès refusé. L'accès à cet élément peut avoir été restreint.";
App::$strings["Photo not available"] = "Photo non disponible";
App::$strings["Use as profile photo"] = "Utiliser comme photo du profil";
@@ -985,7 +995,6 @@ App::$strings["Rotate CCW (left)"] = "Rotation anti-horaire (gauche)";
App::$strings["Move photo to album"] = "Déplacer la photo dans l'album";
App::$strings["Enter a new album name"] = "Entrer un nouveau nom d'album";
App::$strings["or select an existing one (doubleclick)"] = "ou en sélectionner un existant (double-clic)";
-App::$strings["Caption"] = "Titre/légende";
App::$strings["Add a Tag"] = "Ajouter une étiquette";
App::$strings["Example: @bob, @Barbara_Jensen, @jim@example.com"] = "Exemple&nbsp;: @marc, @Barbara_Jensen, @charles@exemple.com, #Ile_de_France, #marathon";
App::$strings["Flag as adult in album view"] = "Marquer comme \"adulte\" dans l'affichage de l'album";
@@ -1260,6 +1269,10 @@ App::$strings["Warning: Changing some settings could render your channel inopera
App::$strings["If enabled, connection requests will be approved without your interaction"] = "Si cette option est activée, les demandes de connexion seront approuvées sans votre intervention.";
App::$strings["Automatic approval settings"] = "Paramètres d'approbation automatique";
App::$strings["Some individual permissions may have been preset or locked based on your channel type and privacy settings."] = "Certaines permissions individuelles peuvent avoir été prédéfinies ou verrouillées en fonction de votre type de canal et de vos paramètres de confidentialité.";
+App::$strings["Unknown App"] = "App inconnue";
+App::$strings["Authorize"] = "Autoriser";
+App::$strings["Do you authorize the app %s to access your channel data?"] = "Autorisez vous l'app %s à accéder aux données de votre canal&nbsp;?";
+App::$strings["Allow"] = "Permettre";
App::$strings["Privacy group created."] = "Groupe de contacts créé.";
App::$strings["Could not create privacy group."] = "Impossible de créer le groupe de contacts.";
App::$strings["Privacy group not found."] = "Groupe de contacts introuvable.";
@@ -1296,7 +1309,7 @@ App::$strings["Hide your connections list from viewers of this profile"] = "Cach
App::$strings["Edit Profile Details"] = "Modifier les détails du profil";
App::$strings["View this profile"] = "Voir ce profil";
App::$strings["Edit visibility"] = "Changer la visibilité";
-App::$strings["Profile Tools"] = "Ouitls pour votre profile";
+App::$strings["Profile Tools"] = "Outils pour votre profil";
App::$strings["Change cover photo"] = "Modifier votre bannière";
App::$strings["Change profile photo"] = "Changer la photo du profil";
App::$strings["Create a new profile using these settings"] = "Créer un nouveau profil avec ces paramètres";
@@ -1304,14 +1317,14 @@ App::$strings["Clone this profile"] = "Cloner ce profil";
App::$strings["Delete this profile"] = "Supprimer ce profil";
App::$strings["Add profile things"] = "Ajouter des éléments de profil";
App::$strings["Personal"] = "Me concernant";
-App::$strings["Relation"] = "Contacts";
+App::$strings["Relationship"] = "Relation";
App::$strings["Miscellaneous"] = "Divers";
App::$strings["Import profile from file"] = "Importer le profil à partir d'un fichier";
App::$strings["Export profile to file"] = "Exporter le profil vers un fichier.";
App::$strings["Your gender"] = "Votre genre";
App::$strings["Marital status"] = "Etat civil";
App::$strings["Sexual preference"] = "préférence sexuelle";
-App::$strings["Profile name"] = "Nom du profile";
+App::$strings["Profile name"] = "Nom du profil";
App::$strings["This is your default profile."] = "Ceci est votre profil par défaut.";
App::$strings["Your full name"] = "Votre nom complet";
App::$strings["Title/Description"] = "Titre/description";
@@ -1458,6 +1471,7 @@ App::$strings["%1\$s is not attending %2\$s's %3\$s"] = "%1\$s ne participe pas
App::$strings["%1\$s may attend %2\$s's %3\$s"] = "%1\$s participe peut-être à %3\$s de %2\$s";
App::$strings["Action completed."] = "Action terminée.";
App::$strings["Thank you."] = "Merci.";
+App::$strings["No default suggestions were found."] = "Aucune suggestion par défaut n'a été trouvée.";
App::$strings["%d rating"] = array(
0 => "%d évaluation",
1 => "%d évaluations",
@@ -1729,44 +1743,44 @@ App::$strings["To stop receiving these messages, please adjust your Notification
App::$strings["To stop receiving these messages, please adjust your %s."] = "Pour ne plus recevoir ces messages, veuillez ajuster votre %s.";
App::$strings["%s <!item_type!>"] = "%s <!item_type!>";
App::$strings["[\$Projectname:Notify] New mail received at %s"] = "[\$Projectname:Notify] Nouveau mail reçu sur %s";
-App::$strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, vous avez reçu un message privé sur %3\$s, de la part de %2\$s.";
+App::$strings["%1\$s sent you a new private message at %2\$s."] = "%1\$s vous a envoyé un nouveau message privé à %2\$s.";
App::$strings["%1\$s sent you %2\$s."] = "%1\$s vous a envoyé %2\$s.";
App::$strings["a private message"] = "un message privé";
App::$strings["Please visit %s to view and/or reply to your private messages."] = "Merci de visiter %s pour voir et/ou répondre à vos messages privés.";
App::$strings["commented on"] = "commenté";
App::$strings["liked"] = "aimé";
App::$strings["disliked"] = "pas aimé";
-App::$strings["%1\$s, %2\$s %3\$s [zrl=%4\$s]a %5\$s[/zrl]"] = "%1\$s, %2\$s %3\$s [zrl=%4\$s]a %5\$s[/zrl]";
-App::$strings["%1\$s, %2\$s %3\$s [zrl=%4\$s]%5\$s's %6\$s[/zrl]"] = "%1\$s, %2\$s %3\$s [zrl=%4\$s]%5\$s's %6\$s[/zrl]";
-App::$strings["%1\$s, %2\$s %3\$s [zrl=%4\$s]your %5\$s[/zrl]"] = "%1\$s, %2\$s %3\$s [zrl=%4\$s]votre %5\$s[/zrl]";
+App::$strings["%1\$s %2\$s [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s %2\$s [zrl=%3\$s]a %4\$s[/zrl]";
+App::$strings["%1\$s %2\$s [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s %2\$s [zrl=%3\$s]%4\$s de %5\$s[/zrl]";
+App::$strings["%1\$s %2\$s [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s %2\$s [zrl=%3\$s]votre %4\$s[/zrl]";
App::$strings["[\$Projectname:Notify] Moderated Comment to conversation #%1\$d by %2\$s"] = "[\$Projectname:Notification] Commentaire modéré pour la conversation n°%1\$d par %2\$s";
App::$strings["[\$Projectname:Notify] Comment to conversation #%1\$d by %2\$s"] = "[\$Projectname:Notify] Commentaire effectué sur la conversation #%1\$d par %2\$s";
-App::$strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "%1\$s, %2\$s a commenté un élément de conversation que vous suivez.";
+App::$strings["%1\$s commented on an item/conversation you have been following."] = "%1\$sa commenté un élément ou une conversation que vous suivez.";
App::$strings["Please visit %s to view and/or reply to the conversation."] = "Merci de visiter %s pour voir et/ou répondre sur cette conversation.";
App::$strings["Please visit %s to approve or reject this comment."] = "Merci de visiter %spour valider ou rejeter ce commentaire.";
-App::$strings["%1\$s, %2\$s liked [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s aiment [zrl=%3\$s]votre %4\$s[/zrl]";
+App::$strings["%1\$s liked [zrl=%2\$s]your %3\$s[/zrl]"] = "%1\$s aime [zrl=%2\$s]votre %3\$s[/zrl]";
App::$strings["[\$Projectname:Notify] Like received to conversation #%1\$d by %2\$s"] = "[\$Projectname:Notify] Aime reçu à la convesation #%1\$d par %2\$s";
-App::$strings["%1\$s, %2\$s liked an item/conversation you created."] = "%1\$s, %2\$s a aimé un élément ou une conversation que vous avez créée.";
+App::$strings["%1\$s liked an item/conversation you created."] = "%1\$sa commenté un élément ou une conversation que vous avez créée ";
App::$strings["[\$Projectname:Notify] %s posted to your profile wall"] = "[\$Projectname:Notify] %s a publié sur le mur de votre profil";
-App::$strings["%1\$s, %2\$s posted to your profile wall at %3\$s"] = "%1\$s, %2\$s a publié sur votre profil à %3\$s";
-App::$strings["%1\$s, %2\$s posted to [zrl=%3\$s]your wall[/zrl]"] = "%1\$s, %2\$s a publié sur [zrl=%3\$s]votre profil[/zrl]";
+App::$strings["%1\$s posted to your profile wall at %2\$s"] = "%1\$s a posté sur le mur de votre profil à %2\$s";
+App::$strings["%1\$s posted to [zrl=%2\$s]your wall[/zrl]"] = "%1\$s envoyé à [zrl=%2\$s]votre mur[/zrl]";
App::$strings["[\$Projectname:Notify] %s tagged you"] = "[\$Projectname:Notify] %s vous a étiquetté";
-App::$strings["%1\$s, %2\$s tagged you at %3\$s"] = "%1\$s, vous avez été étiqueté sur %3\$s par %2\$s";
-App::$strings["%1\$s, %2\$s [zrl=%3\$s]tagged you[/zrl]."] = "%1\$s, %2\$s [zrl=%3\$s]vous a étiqueté[/zrl].";
+App::$strings["%1\$s tagged you at %2\$s"] = "%1\$s vous a étiqueté à %2\$s";
+App::$strings["%1\$s [zrl=%2\$s]tagged you[/zrl]."] = "%1\$s [zrl=%2\$s]vous a étiqueté[/zrl].";
App::$strings["[\$Projectname:Notify] %1\$s poked you"] = "[\$Projectname:Notify] %1\$s vous a poké";
-App::$strings["%1\$s, %2\$s poked you at %3\$s"] = "%1\$s, %2\$s vous a tapoté sur %3\$s";
-App::$strings["%1\$s, %2\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s, %2\$s [zrl=%2\$s]vous a tapoté[/zrl].";
+App::$strings["%1\$s poked you at %2\$s"] = "%1\$s vous a tapoté à %2\$s";
+App::$strings["%1\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s [zrl=%2\$s]vous a tapoté[/zrl].";
App::$strings["[\$Projectname:Notify] %s tagged your post"] = "[\$Projectname:Notify] %s a étiquetté votre publication";
-App::$strings["%1\$s, %2\$s tagged your post at %3\$s"] = "%1\$s, %2\$s a étiqueté votre publication sur %3\$s";
-App::$strings["%1\$s, %2\$s tagged [zrl=%3\$s]your post[/zrl]"] = "%1\$s, %2\$s a étiqueté [zrl=%3\$s]votre publication[/zrl]";
+App::$strings["%1\$s tagged your post at %2\$s"] = "%1\$s a étiqueté votre message à %2\$s";
+App::$strings["%1\$s tagged [zrl=%2\$s]your post[/zrl]"] = "%1\$s a étiqueté [zrl=%2\$s]votre message[/zrl]";
App::$strings["[\$Projectname:Notify] Introduction received"] = "[\$Projectname:Notify] Demande de relation reçue";
-App::$strings["%1\$s, you've received an new connection request from '%2\$s' at %3\$s"] = "%1\$s, vous avez reçu une demande de contact de '%2\$s' sur %3\$s";
-App::$strings["%1\$s, you've received [zrl=%2\$s]a new connection request[/zrl] from %3\$s."] = "%1\$s, vous avez reçu [zrl=%2\$s]une demande de contact[/zrl] de %3\$s.";
+App::$strings["You've received an new connection request from '%1\$s' at %2\$s"] = "Vous avez reçu une nouvelle demande de connexion de la part de '%1\$s' à %2\$s";
+App::$strings["You've received [zrl=%1\$s]a new connection request[/zrl] from %2\$s."] = "Vous avez reçu [zrl=%1\$s]une nouvelle demande de connexion[/zrl] de la part de %2\$s.";
App::$strings["You may visit their profile at %s"] = "Vous pouvez visiter leur profil sur %s";
App::$strings["Please visit %s to approve or reject the connection request."] = "Merci de visiter %s pour valider (ou non) cette demande de contact.";
App::$strings["[\$Projectname:Notify] Friend suggestion received"] = "[\$Projectname:Notify] Suggestion d'amitié reçue";
-App::$strings["%1\$s, you've received a friend suggestion from '%2\$s' at %3\$s"] = "%1\$s, vous avez reçu une suggestion d'ami(e) de '%2\$s' à %3\$s";
-App::$strings["%1\$s, you've received [zrl=%2\$s]a friend suggestion[/zrl] for %3\$s from %4\$s."] = "%1\$s, avez reçu %3\$s comme [zrl=%2\$s]une suggestion d'ami(e)[/zrl] de %4\$s.";
+App::$strings["You've received a friend suggestion from '%1\$s' at %2\$s"] = "Vous avez reçu une suggestion d'ami de la part de '%1\$s' à %2\$s";
+App::$strings["You've received [zrl=%1\$s]a friend suggestion[/zrl] for %2\$s from %3\$s."] = "Vous avez reçu [zrl=%1\$s]une suggestion d'ami[/zrl] pour %2\$s de %3\$s.";
App::$strings["Name:"] = "Nom&nbsp;:";
App::$strings["Photo:"] = "Photo&nbsp;:";
App::$strings["Please visit %s to approve or reject the suggestion."] = "Merci de visiter %s pour valider ou rejeter cette suggestion.";
@@ -1842,6 +1856,7 @@ App::$strings["Schedule Inbox"] = "Calendrier - Messages entrants";
App::$strings["Schedule Outbox"] = "Calendrier - Messages sortants";
App::$strings["Total"] = "Total";
App::$strings["Shared"] = "Partagé";
+App::$strings["Add Files"] = "Ajouter des fichiers";
App::$strings["You are using %1\$s of your available file storage."] = "Vous utilisez %1\$s de votre espace de stockage.";
App::$strings["You are using %1\$s of %2\$s available file storage. (%3\$s&#37;)"] = "Vous utilisez %1\$s sur %2\$s d'espace disponible. (%3\$s&#37;)";
App::$strings["WARNING:"] = "AVERTISSEMENT&nbsp;:";
@@ -1913,17 +1928,19 @@ App::$strings["Suggestions"] = "Suggestions";
App::$strings["See more..."] = "Voir plus...";
App::$strings["Saved Folders"] = "Dossiers sauvegardés";
App::$strings["Click to show more"] = "Cliquer pour voir plus";
+App::$strings["Tags"] = "Étiquettes";
App::$strings["Profile Creation"] = "Création de profil";
App::$strings["Upload profile photo"] = "Téléverser la photo du profil";
App::$strings["Upload cover photo"] = "Téléverser la photo de couverture";
App::$strings["Edit your profile"] = "Modifier votre profil";
App::$strings["Find and Connect with others"] = "Trouver et connecter avec des autres personnes";
+App::$strings["View the directory"] = "Voir l'annuaire";
App::$strings["Manage your connections"] = "Gérez vos connexions";
App::$strings["Communicate"] = "Communiquer";
App::$strings["View your channel homepage"] = "Voir la page d'accueil de votre canal";
App::$strings["View your network stream"] = "Visualisez votre flux réseau";
App::$strings["Documentation"] = "Documentation";
-App::$strings["View public stream. Warning: not moderated"] = "Voir le flux public. Avertissement : non modéré";
+App::$strings["View public stream"] = "Voir le flux public";
App::$strings["New Member Links"] = "Liens pour les nouveaux membres";
App::$strings["Member registrations waiting for confirmation"] = "Inscriptions en attente d'approbation";
App::$strings["Inspect queue"] = "Analyser la file d'attente";
@@ -1937,7 +1954,8 @@ App::$strings["Addon settings"] = "Paramètres de greffon";
App::$strings["Display settings"] = "Paramètres d'affichage";
App::$strings["Manage locations"] = "Gérer les emplacements";
App::$strings["Export channel"] = "Exporter le canal";
-App::$strings["Connected apps"] = "Applications connectées";
+App::$strings["OAuth1 apps"] = "OAuth1 applications";
+App::$strings["OAuth2 apps"] = "OAuth2 applications";
App::$strings["Permission Groups"] = "Groupes d'accès";
App::$strings["Premium Channel Settings"] = "Paramètres de canal VIP";
App::$strings["Bookmarked Chatrooms"] = "Salons favoris";
@@ -2032,6 +2050,7 @@ App::$strings["Reminder note"] = "Note de rappel";
App::$strings["Enter a note to be displayed when you are within the specified proximity..."] = "Saisissez une note à afficher quand vous serez à la distance indiquée...";
App::$strings["Add new rendezvous"] = "Ajouter un nouveau rendezvous";
App::$strings["Create a new rendezvous and share the access link with those you wish to invite to the group. Those who open the link become members of the rendezvous. They can view other member locations, add markers to the map, or share their own locations with the group."] = "Créez un nouveau rendez-vous et partagez le lien d'accès avec les gens que vous souhaitez inviter au groupe. Ceux qui ouvrent le lien deviennent membres du rendez-vous. Ils peuvent afficher les emplacements des autres membres, ajouter des marqueurs à la carte ou partager leurs propres emplacements avec le groupe.";
+App::$strings["You have no rendezvous. Press the button above to create a rendezvous!"] = "Vous n'avez pas de rendez-vous. Appuyez sur le bouton ci-dessus pour créer un rendez-vous !";
App::$strings["Some setting"] = "Un certain paramètre";
App::$strings["A setting"] = "Un paramètre";
App::$strings["Skeleton Settings"] = "Paramètres du squelette";
@@ -2305,7 +2324,7 @@ App::$strings["Configuration Help"] = "Aide pour la configuration";
App::$strings["Jappix Mini Settings"] = "Paramètres de Jappix mini";
App::$strings["Currently blocked"] = "Actuellement bloqué";
App::$strings["No channels currently blocked"] = "Aucun canal n'est actuellement bloqué";
-App::$strings["\"Superblock\" Settings"] = "Paramètres \"Superblock\"";
+App::$strings["Superblock Settings"] = "Paramètres de Superblock";
App::$strings["Block Completely"] = "Bloquer complètement";
App::$strings["superblock settings updated"] = "Les paramètres du superblock ont été mis à jour";
App::$strings["Federate"] = "Fédérer";
@@ -2404,7 +2423,7 @@ App::$strings["Cancel Connection Process"] = "Annuler le processus de prise de c
App::$strings["Current GNU social API is"] = "L'API GNU-social courante est";
App::$strings["Cancel GNU social Connection"] = "Annuler la connexion GNU-social";
App::$strings["Currently connected to: "] = "Actuellement connecté à :";
-App::$strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to GNU social will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Remarque : en raison de vos paramètres de confidentialité (masquer les détails de votre profil aux visiteurs inconnus? ), le lien potentiellement inclus dans les annonces publiques relayées sur GNU-social amènera le visiteur à une page vierge informant le visiteur que l'accès à votre profil a été restreint.";
+App::$strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to GNU social will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Remarque</strong>&nbsp;: en raison de vos paramètres de confidentialité (<em>masquer les détails de votre profil aux visiteurs inconnus&nbsp;?</em>), le lien potentiellement inclus dans les annonces publiques relayées sur GNU-social amènera le visiteur à une page vierge informant le visiteur que l'accès à votre profil a été restreint.";
App::$strings["Allow posting to GNU social"] = "Autoriser la publication sur GNU-social";
App::$strings["If enabled your public postings can be posted to the associated GNU-social account"] = "Si cette option est activée, vos publications publiques peuvent être publiées sur le compte GNU-social associé.";
App::$strings["Post to GNU social by default"] = "Par défaut, publier sur GNU-social";
@@ -2442,6 +2461,24 @@ App::$strings["Twitter Post Settings"] = "Paramètres des publications Twitter";
App::$strings["Deactivate the feature"] = "Désactiver la fonctionnalité";
App::$strings["Hide the button and show the smilies directly."] = "Cacher le bouton et afficher les émoticônes directement.";
App::$strings["Smileybutton Settings"] = "Paramètres du bouton des émoticônes";
+App::$strings["Order Not Found"] = "Commande introuvable";
+App::$strings["Order cannot be checked out."] = "La commande ne peut pas être finalisée.";
+App::$strings["Enable Shopping Cart"] = "Activer le panier d'achats";
+App::$strings["Enable Test Catalog"] = "Activer le catalogue de test";
+App::$strings["Enable Manual Payments"] = "Activer les paiements manuels";
+App::$strings["Base Cart Settings"] = "Paramètres de base du panier";
+App::$strings["Add Item"] = "Ajouter un article";
+App::$strings["Call cart_post_"] = "Appeler cart_post_";
+App::$strings["Cart Not Enabled (profile: "] = "Panier non activé (profile:";
+App::$strings["Order not found."] = "Commande introuvable.";
+App::$strings["No Order Found"] = "Aucune commande trouvée";
+App::$strings["call: "] = "appel:";
+App::$strings["An unknown error has occurred Please start again."] = "Une erreur inconnue s'est produite. Veuillez recommencer.";
+App::$strings["Invalid Payment Type. Please start again."] = "Type de paiement non valable. Recommencez, s'il vous plaît.";
+App::$strings["Order not found"] = "Commande non trouvée";
+App::$strings["Error: order mismatch. Please try again."] = "Erreur : non-appariement de commande. Veuillez réessayer.";
+App::$strings["Manual payments are not enabled."] = "Les paiements manuels ne sont pas activés.";
+App::$strings["Finished"] = "Terminé.";
App::$strings["This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> analytics tool."] = "Ce site web est surveillé grâce à l'outil d'analyse <a href='http://www.piwik.org'>Piwik</a>.";
App::$strings["If you do not want that your visits are logged this way you <a href='%s'>can set a cookie to prevent Piwik from tracking further visits of the site</a> (opt-out)."] = "Si vous ne souhaitez pas que vos visites soient enregistrées de cette façon, <a href='%s'>vous pouvez\ndéfinir un cookie pour empêcher Piwik de suivre davantage de visites du site</a> (opt-out).";
App::$strings["Piwik Base URL"] = "URL de base Piwik";
@@ -2626,8 +2663,8 @@ App::$strings["Uncertain"] = "Incertain";
App::$strings["It's complicated"] = "C'est compliqué";
App::$strings["Don't care"] = "S'en fiche";
App::$strings["Ask me"] = "Me demander";
-App::$strings["likes %1\$s's %2\$s"] = "aime %1\$s's %2\$s";
-App::$strings["doesn't like %1\$s's %2\$s"] = "n'aime pas %1\$s's %2\$s";
+App::$strings["likes %1\$s's %2\$s"] = "aime le %2\$s de %1\$s";
+App::$strings["doesn't like %1\$s's %2\$s"] = "n'aime pas le %2\$s de%1\$s ";
App::$strings["%1\$s is now connected with %2\$s"] = "%1\$s ajoute %2\$s à ses contacts";
App::$strings["%1\$s poked %2\$s"] = "%1\$s a tapoté %2\$s";
App::$strings["poked"] = "a tapoté";
@@ -2641,7 +2678,6 @@ App::$strings["Delete Selected Items"] = "Supprimer les éléments selectionnés
App::$strings["View Source"] = "Voir source";
App::$strings["Follow Thread"] = "Suivre la discussion";
App::$strings["Unfollow Thread"] = "Ne plus suivre la discussion";
-App::$strings["Activity/Posts"] = "Activité/Publications";
App::$strings["Edit Connection"] = "Modifier le contact";
App::$strings["Message"] = "Message";
App::$strings["%s likes this."] = "%s aime ça.";
@@ -2664,7 +2700,7 @@ App::$strings["%s don't like this."] = "%s n'aime pas ça.";
App::$strings["Set your location"] = "Spécifier votre emplacement géographique";
App::$strings["Clear browser location"] = "Supprimer l'emplacement géographique du navigateur";
App::$strings["Tag term:"] = "Étiquette&nbsp;:";
-App::$strings["Where are you right now?"] = "Où êtes-vous en ce moment&nbsp;?";
+App::$strings["Where are you right now?"] = "Où êtes-vous en ce moment ?";
App::$strings["Choose a different album..."] = "Choisissez un autre album";
App::$strings["Comments enabled"] = "Commentaires activés";
App::$strings["Comments disabled"] = "Commentaires désactivés";
@@ -2725,6 +2761,7 @@ App::$strings["Safe Mode"] = "Mode sûr";
App::$strings["Public Forums Only"] = "Les forums publics uniquement";
App::$strings["This Website Only"] = "Ce site uniquement";
App::$strings["%1\$s's bookmarks"] = "Favoris de %1\$s";
+App::$strings["Unable to import a removed channel."] = "Impossible d'importer un canal supprimé.";
App::$strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "L'import a échoué. Un canal existe déjà avec ce nom";
App::$strings["Cloned channel not found. Import failed."] = "Canal cloné non trouvé. Echec de l'import.";
App::$strings["prev"] = "préc.";
@@ -2739,7 +2776,7 @@ App::$strings["poke"] = "tapoter";
App::$strings["ping"] = "ping";
App::$strings["pinged"] = "pingé";
App::$strings["prod"] = "encourager";
-App::$strings["prodded"] = "encouragé";
+App::$strings["prodded"] = "à encouragé";
App::$strings["slap"] = "giffler";
App::$strings["slapped"] = "gifflé(e)";
App::$strings["finger"] = "pointer";
@@ -2834,6 +2871,7 @@ App::$strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s a écrit %2\$s q
App::$strings["Channel is blocked on this site."] = "Ce canal est bloqué sur ce site.";
App::$strings["Channel location missing."] = "Emplacement du canal introuvable.";
App::$strings["Response from remote channel was incomplete."] = "La réponse du canal distant était incomplète.";
+App::$strings["Premium channel - please visit:"] = "Canal Premium - s'il vous plaît visitez :";
App::$strings["Channel was deleted and no longer exists."] = "Le canal a été supprimé et n'existe plus.";
App::$strings["Remote channel or protocol unavailable."] = "Canal distant ou protocole indisponible.";
App::$strings["Channel discovery failed."] = "La tentative d'accéder au canal a échoué.";
@@ -2958,8 +2996,8 @@ App::$strings["j F, Y"] = "j F, Y";
App::$strings["j F"] = "j F";
App::$strings["Birthday:"] = "Date de naissance&nbsp;:";
App::$strings["for %1\$d %2\$s"] = "depuis %1\$d %2\$s";
-App::$strings["Sexual Preference:"] = "Orientation sexuelle&nbsp;:";
App::$strings["Tags:"] = "Étiquettes&nbsp;:";
+App::$strings["Sexual Preference:"] = "Orientation sexuelle&nbsp;:";
App::$strings["Political Views:"] = "Opinions politiques&nbsp;:";
App::$strings["Religion:"] = "Religion&nbsp;:";
App::$strings["Hobbies/Interests:"] = "Occupations/Centres d'intérêt&nbsp;:";
@@ -3024,9 +3062,10 @@ App::$strings["Embedded content"] = "Contenu imbriqué";
App::$strings["Embedding disabled"] = "Imbrication désactivée";
App::$strings["OpenWebAuth: %1\$s welcomes %2\$s"] = "OpenWebAuth: %1\$s accueille favorablement %2\$s";
App::$strings["General Features"] = "Fonctionnalités générales";
-App::$strings["Advanced Profiles"] = "Profils Avancés";
+App::$strings["Display new member quick links menu"] = "Afficher le menu des liens rapides pour les nouveaux membres";
+App::$strings["Advanced Profiles"] = "Profils avancés";
App::$strings["Additional profile sections and selections"] = "Sections et sélections supplémentaires du profil";
-App::$strings["Profile Import/Export"] = "Importer/Exporter le profil";
+App::$strings["Profile Import/Export"] = "Importer/exporter le profil";
App::$strings["Save and load profile details across sites/channels"] = "Sauvegarder et charger les détails d'un profil entre sites/canaux";
App::$strings["Web Pages"] = "Pages web";
App::$strings["Provide managed web pages on your channel"] = "Fournir des pages web, sous votre contrôle, sur votre canal";
@@ -3057,8 +3096,10 @@ App::$strings["Enable management and selection of privacy groups"] = "Active la
App::$strings["Multiple Profiles"] = "Profils multiples";
App::$strings["Ability to create multiple profiles"] = "Possibilité de créer plusieurs profils";
App::$strings["Provide alternate connection permission roles."] = "Fournir des rôles d'accès différents pour ce contact.";
-App::$strings["OAuth Clients"] = "Clients OAuth";
-App::$strings["Manage authenticatication tokens for mobile and remote apps."] = "Gérer les jetons d'authentification pour les applications mobiles et distantes.";
+App::$strings["OAuth1 Clients"] = "Clients OAuth1";
+App::$strings["Manage OAuth1 authenticatication tokens for mobile and remote apps."] = "Gérer les jetons d'authentification OAuth1 pour les applications mobiles et distantes.";
+App::$strings["OAuth2 Clients"] = "Clients OAuth2";
+App::$strings["Manage OAuth2 authenticatication tokens for mobile and remote apps."] = "Gérer les jetons d'authentification OAuth2 pour les applications mobiles et distantes.";
App::$strings["Access Tokens"] = "Jetons d'accès.";
App::$strings["Create access tokens so that non-members can access private content."] = "Créez des jetons d'accès pour que les non-membres puissent accéder au contenu privé.";
App::$strings["Post Composition Features"] = "Fonctionnalités de composition";
@@ -3077,6 +3118,8 @@ App::$strings["Content Expiration"] = "Expiration du contenu";
App::$strings["Remove posts/comments and/or private messages at a future time"] = "Supprimer les contributions/commentaires et/ou messages privés plus tard";
App::$strings["Suppress Duplicate Posts/Comments"] = "Supprimer les publications/commentaires en doublon";
App::$strings["Prevent posts with identical content to be published with less than two minutes in between submissions."] = "Empêcher des messages aux contenus identiques d'être publiés à moins de deux minutes d'intervalle";
+App::$strings["Auto-save drafts of posts and comments"] = "Sauvegarde automatique des brouillons de messages et commentaires";
+App::$strings["Automatically saves post and comment drafts in local browser storage to help prevent accidental loss of compositions"] = "Enregistre automatiquement les brouillons de messages et de commentaires dans le stockage local du navigateur pour aider à prévenir la perte accidentelle de compositions.";
App::$strings["Network and Stream Filtering"] = "Filtrage du réseau et des flux";
App::$strings["Search by Date"] = "Chercher par date";
App::$strings["Ability to select posts by date ranges"] = "Pouvoir choisir des publications par date";
@@ -3104,7 +3147,6 @@ App::$strings["Star Posts"] = "Pouvoir mettre en avant les publications";
App::$strings["Ability to mark special posts with a star indicator"] = "Pouvoir marquer certaines publications d'une étoile";
App::$strings["Tag Cloud"] = "Nuage de tags";
App::$strings["Provide a personal tag cloud on your channel page"] = "Afficher un nuage de vos tags sur votre canal";
-App::$strings["Tags"] = "Étiquettes";
App::$strings["Keywords"] = "Mots-clefs";
App::$strings["have"] = "ont";
App::$strings["has"] = "a";
@@ -3200,6 +3242,7 @@ App::$strings["Add privacy group"] = "Créer un groupe de contacts";
App::$strings["Channels not in any privacy group"] = "Contacts n'étant dans aucun groupe de contacts";
App::$strings["New window"] = "Nouvelle fenêtre";
App::$strings["Open the selected location in a different window or browser tab"] = "Ouvrir l'emplacement dans une fenêtre ou un onglet différent";
+App::$strings["Delegation session ended."] = "La séance de délégation a pris fin.";
App::$strings["Logged out."] = "Deconnecté.";
App::$strings["Email validation is incomplete. Please check your email."] = "La validation du courriel est incomplète. Veuillez vérifier l'adresse courriel.";
App::$strings["Failed authentication"] = "Échec de l'authentification";
diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js
index e92de17c4..be632a07e 100644
--- a/view/js/autocomplete.js
+++ b/view/js/autocomplete.js
@@ -60,7 +60,7 @@ function contact_format(item) {
var desc = ((item.label) ? item.nick + ' ' + item.label : item.nick);
if(typeof desc === 'undefined') desc = '';
if(desc) desc = ' ('+desc+')';
- return "<div class='{0} dropdown-item dropdown-notification clearfix' title='{4}'><img class='menu-img-2' src='{1}'><span class='contactname'>{2}</span><span class='dropdown-sub-text'>{3}</span></div>".format(item.taggable, item.photo, item.name, desc, item.link);
+ return "<div class='{0} dropdown-item dropdown-notification clearfix' title='{4}'><img class='menu-img-2' src='{1}'><span class='contactname'>{2}</span><span class='dropdown-sub-text'>{3}</span></div>".format(item.taggable, item.photo, item.name, desc, typeof(item.link) !== 'undefined' ? item.link : desc.replace('(','').replace(')',''));
}
else
return "<div>" + item.text + "</div>";