mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Merge remote-tracking branch 'friendika-master/master'

Browse source
This commit is contained in:
Fabio Comuni 2011-03-29 14:12:50 +02:00
parent 2a23147042 920396e402
commit e2b975065c
34 changed files with 608 additions and 353 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -2,7 +2,7 @@
set_time_limit(0);
define ( 'FRIENDIKA_VERSION', '2.1.931' );
define ( 'FRIENDIKA_VERSION', '2.1.932' );
define ( 'DFRN_PROTOCOL_VERSION', '2.1' );
define ( 'DB_UPDATE_VERSION', 1045 );

47
mod/network.php
View file

@ -114,7 +114,7 @@ function network_content(&$a, $update = 0) {
'$lockstate' => $lockstate,
'$acl' => populate_acl((($group) ? $group_acl : $a->user), $celeb),
'$bang' => (($group) ? '!' : ''),
'$profile_uid' => $_SESSION['uid']
'$profile_uid' => local_user()
));
@ -190,6 +190,9 @@ function network_content(&$a, $update = 0) {
if($nouveau) {
// "New Item View" - show all items unthreaded in reverse created date order
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
@ -206,6 +209,10 @@ function network_content(&$a, $update = 0) {
);
}
else {
// Normal conversation view
// First fetch a known number of parent items
$r = q("SELECT `item`.`id` AS `item_id`, `contact`.`uid` AS `contact_uid`
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
@ -218,6 +225,9 @@ function network_content(&$a, $update = 0) {
intval($a->pager['itemspage'])
);
// Then fetch all the children of the parents that are on this page
$parents_arr = array();
$parents_str = '';
@ -243,6 +253,10 @@ function network_content(&$a, $update = 0) {
}
}
// find all the authors involved in remote conversations
// We will use a local profile photo if they are one of our contacts
// otherwise we have to get the photo from the item owner's site
$author_contacts = extract_item_authors($r,local_user());
$cmnt_tpl = load_view_file('view/comment_item.tpl');
@ -258,6 +272,8 @@ function network_content(&$a, $update = 0) {
if($nouveau) {
// "New Item View" - just loop through the items and format them minimally for display
$tpl = load_view_file('view/search_item.tpl');
$droptpl = load_view_file('view/wall_fake_drop.tpl');
@ -325,6 +341,12 @@ function network_content(&$a, $update = 0) {
}
// Normal View
// Figure out how many comments each parent has
// (Comments all have gravity of 6)
// Store the result in the $comments array
$comments = array();
foreach($r as $rr) {
@ -336,6 +358,9 @@ function network_content(&$a, $update = 0) {
}
}
// map all the like/dislike activities for each parent item
// Store these in the $alike and $dlike arrays
foreach($r as $item) {
like_puller($a,$item,$alike,'like');
like_puller($a,$item,$dlike,'dislike');
@ -353,9 +378,18 @@ function network_content(&$a, $update = 0) {
$sparkle = '';
$owner_url = $owner_photo = $owner_name = '';
if(((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE))) && ($item['id'] != $item['parent']))
// We've already parsed out like/dislike for special treatment. We can ignore them now
if(((activity_match($item['verb'],ACTIVITY_LIKE))
|| (activity_match($item['verb'],ACTIVITY_DISLIKE)))
&& ($item['id'] != $item['parent']))
continue;
// Take care of author collapsing and comment collapsing
// If a single author has more than 3 consecutive top-level posts, squash the remaining ones.
// If there are more than two comments, squash all but the last 2.
if($item['id'] == $item['parent']) {
if($blowhard == $item['cid'] && (! $item['self'])) {
$blowhard_count ++;
@ -365,7 +399,7 @@ function network_content(&$a, $update = 0) {
}
else {
$blowhard = $item['cid'];
if($blowhard_count > 3)
if($blowhard_count >= 3)
$o .= '</div>';
$blowhard_count = 0;
}
@ -388,6 +422,8 @@ function network_content(&$a, $update = 0) {
$o .= '</div>';
}
$redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
$lock = ((($item['private']) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid'])
@ -546,7 +582,10 @@ function network_content(&$a, $update = 0) {
}
if(! $update) {
if($blowhard_count > 3)
// if author collapsing is in force but didn't get closed, close it off now.
if($blowhard_count >= 3)
$o .= '</div>';

5
util/README
View file

@ -81,6 +81,11 @@ Xgettext and .po workflow
1. Run util/run_xgettext.sh script (on *unix sistems, with GNU xgettext installed)
This script runs xgettext on source tree, extracting strings from t() and tt()
functions, and creates a util/messages.po file.
% cd util; ./run_xgettext.sh ../view/{language}/messages.po
Replace {language} with the language you are working on - e.g. 'es', 'fr', 'de', etc.
2. copy util/messages.po to view/<langauage>/messages.po
3. open view/<langauage>/messages.po with a text editor and fill in infos in
"Last-Translator: FULL NAME <EMAIL@ADDRESS>"

8
util/typo.php
View file

@ -37,6 +37,11 @@
}
}
if(x($a->config,'php_path'))
$phpath = $a->config['php_path'];
else
$phpath = 'php';
echo "String files\n";
echo 'util/strings.php' . "\n";
@ -47,5 +52,6 @@
foreach($files as $file) {
echo $file . "\n";
include_once($file);
passthru($phpath . ' util/typohelper.php ' . $file);
// include_once($file);
}

11
util/typohelper.php Normal file
View file

@ -0,0 +1,11 @@
<?php
$str = <<< EOT
error_reporting(E_ERROR | E_WARNING | E_PARSE );
ini_set('display_errors', '1');
ini_set('log_errors','0');
EOT;
$str .= str_replace('<?php', '', file_get_contents($argv[1]));
eval($str);

2
view/de/settings.tpl
View file

@ -92,7 +92,7 @@ $profile_in_net_dir
<div id="settings-default-perms-end"></div>
<div id="settings-blockw-wrapper" >
<label id="settings-blockw-label" for="settings-blockw" >Allow friends to post to your profile: </label>
<label id="settings-blockw-label" for="settings-blockw" >Allow friends to post to your profile page: </label>
<input type="checkbox" name="blockwall" id="settings-blockw" value="1" $blockw_checked />
</div>
<div id="settings-blockw-end" ></div>

2
view/en/settings.tpl
View file

@ -91,7 +91,7 @@ $profile_in_net_dir
<div id="settings-default-perms-end"></div>
<div id="settings-blockw-wrapper" >
<label id="settings-blockw-label" for="settings-blockw" >Allow friends to post to your profile: </label>
<label id="settings-blockw-label" for="settings-blockw" >Allow friends to post to your profile page: </label>
<input type="checkbox" name="blockwall" id="settings-blockw" value="1" $blockw_checked />
</div>
<div id="settings-blockw-end" ></div>

14
view/fr/install_db.tpl
View file

@ -1,33 +1,33 @@
<h3>Friendika Social Network</h3>
<h3>Réseau Social Friendika</h3>
<h3>Installation</h3>
<p>
In order to install Friendika we need to know how to contact your database. Please contact your hosting provider or site administrator if you have questions about these settings. The database you specify below must already exist. If it does not, please create it before continuing.
Pour pouvoir installer Friendika, nous avons besoin de contacter votre base de données. Merci de contacter votre hébergeur et/ou administrateur si vous avez des questions à ce sujet. La base que vous spécifierez ci-dessous doit exister. Si ce n'est pas le cas, merci de la créer avant toute chose.
</p>
<form id="install-form" action="$baseurl/install" method="post">
<input type="hidden" name="phpath" value="$phpath" />
<label for="install-dbhost" id="install-dbhost-label">Database Server Name</label>
<label for="install-dbhost" id="install-dbhost-label">Nom du serveur</label>
<input type="text" name="dbhost" id="install-dbhost" value="$dbhost" />
<div id="install-dbhost-end"></div>
<label for="install-dbuser" id="install-dbuser-label">Database Login Name</label>
<label for="install-dbuser" id="install-dbuser-label">Nom d'utilisateur</label>
<input type="text" name="dbuser" id="install-dbuser" value="$dbuser" />
<div id="install-dbuser-end"></div>
<label for="install-dbpass" id="install-dbpass-label">Database Login Password</label>
<label for="install-dbpass" id="install-dbpass-label">Mot de passe</label>
<input type="password" name="dbpass" id="install-dbpass" value="$dbpass" />
<div id="install-dbpass-end"></div>
<label for="install-dbdata" id="install-dbdata-label">Database Name</label>
<label for="install-dbdata" id="install-dbdata-label">Nom de la base</label>
<input type="text" name="dbdata" id="install-dbdata" value="$dbdata" />
<div id="install-dbdata-end"></div>
<div id="install-tz-desc">
Please select a default timezone for your website
Merci de choisir un fuseau horaire par défaut
</div>
$tzselect

26
view/fr/intro_complete_eml.tpl
View file

@ -1,22 +1,22 @@
Dear $username,
Chèr(e) $username,
'$fn' at '$dfrn_url' has accepted
your connection request at '$sitename'.
'$fn' du site '$dfrn_url' a accepté votre
demande de mise en relation sur '$sitename'.
'$fn' has chosen to accept you a "fan", which restricts
some forms of communication - such as private messaging and some profile
interactions. If this is a celebrity or community page, these settings were
applied automatically.
'$fn' a décidé de vous accepter comme "fan", ce qui restreint
certains de vos moyens de communication - tels que les messages privés et
certaines interactions avec son profil. S'il s'agit de la page d'une
célébrité et/ou communauté, ces réglages ont été définis automatiquement.
'$fn' may choose to extend this into a two-way or more permissive
relationship in the future.
'$fn' pourra choisir d'étendre votre relation à quelque-chose de
plus permissif dans l'avenir.
You will start receiving public status updates from '$fn',
which will appear on your 'Network' page at
Vous allez commencer à recevoir les mises-à-jour publiques du
statut de '$fn', lesquelles apparaîtront sur votre page 'Réseau' sur
$siteurl
Sincerely,
Sincèrement votre,
$sitename Administrator
l'administrateur de $sitename

2
view/fr/intros-top.tpl
View file

@ -1,4 +1,4 @@
<h1>Pending Friend/Connect Notifications</h1>
<h1>Demandes d'amitié/mise en relation en attente</h1>
<div id="notification-show-hide-wrapper" >
<a href="$hide_url" id="notification-show-hide-link">$hide_text</a>

8
view/fr/lostpass.tpl
View file

@ -1,17 +1,17 @@
<h3>Forgot your Password?</h3>
<h3>Mot de passe oublié?</h3>
<p id="lostpass-desc">
Enter your email address and submit to have your password reset. Then check your email for further instructions.
Entrez votre adresse de courriel et demandez un nouveau mot de passe. Puis, vérifiez votre courriel pour de plus amples informations.
</p>
<form action="lostpass" method="post" >
<div id="login-name-wrapper">
<label for="login-name" id="label-login-name">Nickname or Email: </label>
<label for="login-name" id="label-login-name">Pseudo ou Courriel: </label>
<input type="text" maxlength="60" name="login-name" id="login-name" value="" />
</div>
<div id="login-extra-end"></div>
<div id="login-submit-wrapper" >
<input type="submit" name="submit" id="lostpass-submit-button" value="Reset" />
<input type="submit" name="submit" id="lostpass-submit-button" value="Nouveau mot de passe" />
</div>
<div id="login-submit-end"></div>
</form>

35
view/fr/lostpass_eml.tpl
View file

@ -1,32 +1,33 @@
Dear $username,
A request was recently received at $sitename to reset your account
password. In order to confirm this request, please select the verification link
below or paste it into your web browser address bar.
Chèr(e) $username,
Nous avons récemment reçu, chez $sitename, un demande de remise
à zéro du mot de passe protégeant votre compte. Pour confirmer cette
demande, merci de cliquer sur le lien de vérification suivant, ou de le
coller dans la barre d'adresse de votre navigateur web.
If you did NOT request this change, please DO NOT follow the link
provided and ignore and/or delete this email.
Si vous n'êtes PAS à l'origine de cette demande, merci de NE PAS suivre
le lien en question, et d'ignorer/supprimer ce courriel.
Your password will not be changed unless we can verify that you
issued this request.
Votre mot de passe ne sera réinitialisé qu'une fois que nous aurons pu
nous assurer que vous êtes bien à l'origine de cette demande.
Follow this link to verify your identity:
Merci de suivre le lien suivant pour confirmer votre identité:
$reset_link
You will then receive a follow-up message containing the new password.
Vous recevrez en retour un message avec votre nouveau mot de passe.
You may change that password from your account settings page after logging in.
Vous pourrez ensuite changer ce mot de passe, après connexion, dans la
page des réglages du compte.
The login details are as follows:
Les informations du compte concerné sont:
Site Location: $siteurl
Login Name: $email
Site: $siteurl
Pseudo/Courriel: $email
Sincerely,
$sitename Administrator
Sincèrement votre,
l'administrateur de $sitename

534
view/fr/messages.po
View file

File diff suppressed because it is too large Load diff

8
view/fr/pagetypes.tpl
View file

@ -1,24 +1,24 @@
<div id="settings-normal-wrapper">
<label id="settings-normal-label" for="settings-normal">Normal Profile</label>
<label id="settings-normal-label" for="settings-normal">Profil normal</label>
<input type="radio" name="page-flags" id="settings-normal" $normal_selected value="$page_normal" />
<span id="settings-normal-desc">Ce compte est un profil personnel normal</span>
</div>
<div id="settings-normal-break" ></div>
<div id="settings-soapbox-wrapper">
<label id="settings-soapbox-label" for="settings-soapbox">Soapbox Profile</label>
<label id="settings-soapbox-label" for="settings-soapbox">Profil 'page de réclame'</label>
<input type="radio" name="page-flags" id="settings-soapbox" $soapbox_selected value="$page_soapbox" />
<span id="settings-soapbox-desc">Approbation automatique de toutes les requêtes de connexion comme étant des fans en lecture seule</span>
</div>
<div id="settings-soapbox-break" ></div>
<div id="settings-community-wrapper">
<label id="settings-community-label" for="settings-community">Community/Celebrity Profile</label>
<label id="settings-community-label" for="settings-community">Profil de communauté/célébrité</label>
<input type="radio" name="page-flags" id="settings-community" $community_selected value="$page_community" />
<span id="settings-community-desc">Approbation automatique de toutes les requêtes de connexion comme étant des fans en lecture-écriture</span>
</div>
<div id="settings-community-break" ></div>
<div id="settings-freelove-wrapper">
<label id="settings-freelove-label" for="settings-freelove">Automatic Friend Profile</label>
<label id="settings-freelove-label" for="settings-freelove">Profil 'amitié automatique'</label>
<input type="radio" name="page-flags" id="settings-freelove" $freelove_selected value="$page_freelove" />
<span id="settings-freelove-desc">Approbation automatique de toutes les requêtes de connexion comme étant des amis</span>
</div>

33
view/fr/passchanged_eml.tpl
View file

@ -1,20 +1,19 @@
Dear $username,
Your password has been changed as requested. Please retain this
information for your records (or change your password immediately to
something that you will remember).
Your login details are as follows:
Site Location: $siteurl
Login Name: $email
Password: $new_password
You may change that password from your account settings page after logging in.
Sincerely,
$sitename Administrator
Chèr(e) $username,
Votre mot de passe a été changé, comme demandé. Merci de conserver
cette information pour un usage ultérieur (ou bien de changer votre mot de
passe immédiatement en quelque-chose dont vous vous souviendrez).
Vos informations de connexion sont désormais:
Site: $siteurl
Pseudo/Courriel: $email
Mot de passe: $new_password
Vous pouvez changer ce mot de passe depuis la page des réglages de votre compte,
après connexion
Sincèrement votre,
l'administrateur de $sitename

6
view/fr/profile-hide-friends.tpl
View file

@ -1,15 +1,15 @@
<p id="hide-friends-text">
Hide my contact/friend list from viewers of this profile?
Cacher ma liste de contacts/amis des visiteurs de ce profil?
</p>
<div id="hide-friends-yes-wrapper">
<label id="hide-friends-yes-label" for="hide-friends-yes">Yes</label>
<label id="hide-friends-yes-label" for="hide-friends-yes">Oui</label>
<input type="radio" name="hide-friends" id="hide-friends-yes" $yes_selected value="1" />
<div id="hide-friends-break" ></div>
</div>
<div id="hide-friends-no-wrapper">
<label id="hide-friends-no-label" for="hide-friends-no">No</label>
<label id="hide-friends-no-label" for="hide-friends-no">Non</label>
<input type="radio" name="hide-friends" id="hide-friends-no" $no_selected value="0" />
<div id="hide-friends-end"></div>

6
view/fr/profile-in-directory.tpl
View file

@ -1,15 +1,15 @@
<p id="profile-in-directory">
Publish your default profile in site directory?
Publier votre profil par défaut dans l'annuaire local?
</p>
<div id="profile-in-dir-yes-wrapper">
<label id="profile-in-dir-yes-label" for="profile-in-dir-yes">Yes</label>
<label id="profile-in-dir-yes-label" for="profile-in-dir-yes">Oui</label>
<input type="radio" name="profile_in_directory" id="profile-in-dir-yes" $yes_selected value="1" />
<div id="profile-in-dir-break" ></div>
</div>
<div id="profile-in-dir-no-wrapper">
<label id="profile-in-dir-no-label" for="profile-in-dir-no">No</label>
<label id="profile-in-dir-no-label" for="profile-in-dir-no">Non</label>
<input type="radio" name="profile_in_directory" id="profile-in-dir-no" $no_selected value="0" />
<div id="profile-in-dir-end"></div>

6
view/fr/profile-in-netdir.tpl
View file

@ -1,15 +1,15 @@
<p id="profile-in-directory">
Publish your default profile in global social directory?
Publier votre profil par défaut dans l'annuaire global?
</p>
<div id="profile-in-netdir-yes-wrapper">
<label id="profile-in-netdir-yes-label" for="profile-in-netdir-yes">Yes</label>
<label id="profile-in-netdir-yes-label" for="profile-in-netdir-yes">Oui</label>
<input type="radio" name="profile_in_netdirectory" id="profile-in-netdir-yes" $yes_selected value="1" />
<div id="profile-in-netdir-break" ></div>
</div>
<div id="profile-in-netdir-no-wrapper">
<label id="profile-in-netdir-no-label" for="profile-in-netdir-no">No</label>
<label id="profile-in-netdir-no-label" for="profile-in-netdir-no">Non</label>
<input type="radio" name="profile_in_netdirectory" id="profile-in-netdir-no" $no_selected value="0" />
<div id="profile-in-netdir-end"></div>

4
view/fr/profile.php
View file

@ -32,7 +32,7 @@
|| (strlen($profile['region']))
|| (strlen($profile['postal-code']))
|| (strlen($profile['country-name']))) { ?>
<div class="location">Location:
<div class="location">Localisation:
<div class="adr">
<div class="street-address"><?php if(strlen($profile['address'])) echo $profile['address']; ?></div>
<span class="city-state-zip"><span class="locality"><?php echo $profile['locality']; ?></span><?php if(strlen($profile['locality'])) echo ', '; ?><span class="region"><?php echo $profile['region'] ?></span><?php if(strlen($profile['postal-code'])) { ?> <span class="postal-code"><?php echo $profile['postal-code']; ?></span><?php } ?></span>
@ -43,7 +43,7 @@
<?php } ?>
<?php if(strlen($profile['gender'])) { ?>
<div class="mf">Gender: <span class="x-gender"><?php echo $profile['gender']; ?></span></div>
<div class="mf">Genre: <span class="x-gender"><?php echo $profile['gender']; ?></span></div>
<?php } ?>

2
view/fr/profile_entry_default.tpl
View file

@ -1,7 +1,7 @@
<div class="profile-listing" >
<div class="profile-listing-photo-wrapper" >
<a href="profiles/$id" class="profile-listing-edit-link" ><img class="profile-listing-photo" id="profile-listing-photo-$id" src="$photo" alt="Profile Image" /></a>
<a href="profiles/$id" class="profile-listing-edit-link" ><img class="profile-listing-photo" id="profile-listing-photo-$id" src="$photo" alt="Image du profil" /></a>
</div>
<div class="profile-listing-photo-end" ></div>
<div class="profile-listing-name" id="profile-listing-name-$id"><a href="profiles/$id" class="profile-listing-edit-link" >$profile_name</a></div>

8
view/fr/profile_photo.tpl
View file

@ -1,18 +1,18 @@
<h1>Upload Profile Photo</h1>
<h1>Téléverser une photo de profil</h1>
<form enctype="multipart/form-data" action="profile_photo" method="post">
<div id="profile-photo-upload-wrapper">
<label id="profile-photo-upload-label" for="profile-photo-upload">Upload File: </label>
<label id="profile-photo-upload-label" for="profile-photo-upload">Fichier à téléverser: </label>
<input name="userfile" type="file" id="profile-photo-upload" size="48" />
</div>
<div id="profile-photo-submit-wrapper">
<input type="submit" name="submit" id="profile-photo-submit" value="Upload">
<input type="submit" name="submit" id="profile-photo-submit" value="Envoyer">
</div>
</form>
<div id="profile-photo-link-select-wrapper">
or <a href='photos/$user'>select a photo from albums</a>
ou <a href='photos/$user'>choisissez une photo dans vos albums</a>
</div>

12
view/fr/pwdreset.tpl
View file

@ -1,16 +1,18 @@
<h3>Password Reset</h3>
<h3>Mot de passe réinitialisé</h3>
<p>
Your password has been reset as requested.
Votre mot de passe a été changé, comme demandé.
</p>
<p>
Your new password is
Votre nouveau mot de passe est
</p>
<p>
$newpass
</p>
<p>
Save or copy your new password - and then <a href="$baseurl" >click here to login</a>.
Sauvez ou copiez ce nouveau mot de passe - puis <a href="$baseurl" >connectez-vous</a>.
</p>
<p>
Your password may be changed from the 'Settings' page after successful login.
Votre mot de passe pourra être changé, après connexion, dans la page 'Réglages'.

36
view/fr/register_open_eml.tpl
View file

@ -1,21 +1,21 @@
Dear $username,
Thank you for registering at $sitename. Your account has been created.
The login details are as follows:
Site Location: $siteurl
Login Name: $email
Password: $password
You may change your password from your account "Settings" page after logging
in.
Please take a few moments to review the other account settings on that page.
Thank you and welcome to $sitename.
Sincerely,
$sitename Administrator
Chèr(e) $username,
Merci de votre inscription à $sitename. Votre compte a été créé.
Les informations de connexion sont comme suit:
Site: $siteurl
Pseudo/Courriel: $email
Mot de passe: $password
Vous pouvez changer de mot de passe dans la page des "Réglages" de votre compte,
après connexion.
Merci de prendre quelques minutes pour découvrir les autres réglages disponibles
sur cette page.
Merci, et bienvenue sur $sitename.
Sincèrement votre,
l'administrateur de $sitename

19
view/fr/register_verify_eml.tpl
View file

@ -1,26 +1,27 @@
A new user registration request was received at $sitename which requires
your approval.
Une nouvelle demande d'inscription a été reçue sur $sitename, et elle
nécessite votre approbation.
The login details are as follows:
Les informations de connexion sont comme suit:
Full Name: $username
Site Location: $siteurl
Login Name: $email
Nom complet: $username
Site: $siteurl
Pseudo/Courriel: $email
To approve this request please visit the following link:
Pour approuver cette demande, merci de suivre le lien:
$siteurl/regmod/allow/$hash
To deny the request and remove the account, please visit:
Pour rejeter cette demande et supprimer le compte associé,
merci de suivre le lien:
$siteurl/regmod/deny/$hash
Thank you.
En vous remerçiant.

2
view/fr/registrations-top.tpl
View file

@ -1,3 +1,3 @@
<h1>User registrations waiting for confirm</h1>
<h1>Inscriptions d'utilisateurs en attente de confirmation</h1>

16
view/fr/request_notify_eml.tpl
View file

@ -1,17 +1,17 @@
Dear $myname,
Chèr(e) $myname,
You have just received a connection request at $sitename
Vous venez de recevoir une demande de mise en relation sur $sitename
from '$requestor'.
venant de '$requestor'.
You may visit their profile at $url.
Vous pouvez visiter son profil sur $url.
Please login to your site to view the complete introduction
and approve or ignore/cancel the request.
Vous pouvez vous connecter à votre site pour voir la demande
complète et l'approuver ou l'ignorer/annuler.
$siteurl
Regards,
Cordialement,
$sitename administrator
l'administrateur de $sitename

62
view/fr/settings.tpl
View file

@ -1,6 +1,6 @@
<h1>Account Settings</h1>
<h1>Réglages du compte</h1>
<div id="plugin-settings-link"><a href="settings/addon">Plugin Settings</a></div>
<div id="plugin-settings-link"><a href="settings/addon">Réglages des extensions</a></div>
$uexport
@ -10,16 +10,16 @@ $nickname_block
<form action="settings" id="settings-form" method="post" autocomplete="off" >
<h3 class="settings-heading">Basic Settings</h3>
<h3 class="settings-heading">Réglages basiques</h3>
<div id="settings-username-wrapper" >
<label id="settings-username-label" for="settings-username" >Full Name: </label>
<label id="settings-username-label" for="settings-username" >Nom complet: </label>
<input type="text" name="username" id="settings-username" value="$username" />
</div>
<div id="settings-username-end" ></div>
<div id="settings-email-wrapper" >
<label id="settings-email-label" for="settings-email" >Email Address: </label>
<label id="settings-email-label" for="settings-email" >Adresse de courriel: </label>
<input type="text" name="email" id="settings-email" value="$email" />
</div>
<div id="settings-email-end" ></div>
@ -27,19 +27,19 @@ $nickname_block
<div id="settings-timezone-wrapper" >
<label id="settings-timezone-label" for="timezone_select" >Your Timezone: </label>
<label id="settings-timezone-label" for="timezone_select" >Votre fuseau horaire: </label>
$zoneselect
</div>
<div id="settings-timezone-end" ></div>
<div id="settings-defloc-wrapper" >
<label id="settings-defloc-label" for="settings-defloc" >Default Post Location: </label>
<label id="settings-defloc-label" for="settings-defloc" >Localisation par défaut: </label>
<input type="text" name="defloc" id="settings-defloc" value="$defloc" />
</div>
<div id="settings-defloc-end" ></div>
<div id="settings-allowloc-wrapper" >
<label id="settings-allowloc-label" for="settings-allowloc" >Use Browser Location: </label>
<label id="settings-allowloc-label" for="settings-allowloc" >Utiliser les informations géographiques du navigateur: </label>
<input type="checkbox" name="allow_location" id="settings-allowloc" value="1" $loc_checked />
</div>
<div id="settings-allowloc-end" ></div>
@ -48,25 +48,25 @@ $zoneselect
<div id="settings-theme-select">
<label id="settings-theme-label" for="theme-select" >Display Theme: </label>
<label id="settings-theme-label" for="theme-select" >Thème affiché: </label>
$theme
</div>
<div id="settings-theme-end"></div>
<div class="settings-submit-wrapper" >
<input type="submit" name="submit" class="settings-submit" value="Submit" />
<input type="submit" name="submit" class="settings-submit" value="Sauver" />
</div>
<h3 class="settings-heading">Security and Privacy Settings</h3>
<h3 class="settings-heading">Sécurité et vie privée</h3>
<input type="hidden" name="visibility" value="$visibility" />
<div id="settings-maxreq-wrapper">
<label id="settings-maxreq-label" for="settings-maxreq" >Maximum Friend Requests/Day</label>
<label id="settings-maxreq-label" for="settings-maxreq" >Nombre maximum de demandes d'amitié par jour</label>
<input id="settings-maxreq" name="maxreq" value="$maxreq" />
<div id="settings-maxreq-desc">(to prevent spam abuse)</div>
<div id="settings-maxreq-desc">(pour limiter le spam)</div>
</div>
<div id="settings-maxreq-end"></div>
@ -92,63 +92,63 @@ $profile_in_net_dir
<div id="settings-default-perms-end"></div>
<div id="settings-blockw-wrapper" >
<label id="settings-blockw-label" for="settings-blockw" >Allow friends to post to your profile: </label>
<label id="settings-blockw-label" for="settings-blockw" >Autoriser les amis à publier sur votre profil: </label>
<input type="checkbox" name="blockwall" id="settings-blockw" value="1" $blockw_checked />
</div>
<div id="settings-blockw-end" ></div>
<div id="settings-expire-desc">Automatically expire (delete) posts older than <input type="text" size="3" name="expire" value="$expire" /> days</div>
<div id="settings-expire-desc">Faire automatiquement expirer (supprimer) les publications de plus de <input type="text" size="3" name="expire" value="$expire" /> jours</div>
<div id="settings-expire-end"></div>
<div class="settings-submit-wrapper" >
<input type="submit" name="submit" class="settings-submit" value="Submit" />
<input type="submit" name="submit" class="settings-submit" value="Sauver" />
</div>
<h3 class="settings-heading">Notification Settings</h3>
<h3 class="settings-heading">Notifications</h3>
<div id="settings-notify-wrapper">
<div id="settings-notify-desc">Send a notification email when: </div>
<label for="notify1" id="settings-label-notify1">You receive an introduction</label>
<div id="settings-notify-desc">Envoyer un courriel d'alerte quand: </div>
<label for="notify1" id="settings-label-notify1">Vous recevez une introduction</label>
<input id="notify1" type="checkbox" $sel_notify1 name="notify1" value="1" />
<div id="notify1-end"></div>
<label for="notify2" id="settings-label-notify2">Your introductions are confirmed</label>
<label for="notify2" id="settings-label-notify2">Une de vos introductions est validée</label>
<input id="notify2" type="checkbox" $sel_notify2 name="notify2" value="2" />
<div id="notify2-end"></div>
<label for="notify3" id="settings-label-notify3">Someone writes on your profile wall</label>
<label for="notify3" id="settings-label-notify3">Quelqu'un a écrit sur votre mur</label>
<input id="notify3" type="checkbox" $sel_notify3 name="notify3" value="4" />
<div id="notify3-end"></div>
<label for="notify4" id="settings-label-notify4">Someone writes a followup comment</label>
<label for="notify4" id="settings-label-notify4">Quelqu'un a commenté</label>
<input id="notify4" type="checkbox" $sel_notify4 name="notify4" value="8" />
<div id="notify4-end"></div>
<label for="notify5" id="settings-label-notify5">You receive a private message</label>
<label for="notify5" id="settings-label-notify5">Vous avez reçu un message privée</label>
<input id="notify5" type="checkbox" $sel_notify5 name="notify5" value="16" />
<div id="notify5-end"></div>
</div>
<div id="settings=notify-end"></div>
<div class="settings-submit-wrapper" >
<input type="submit" name="submit" class="settings-submit" value="Submit" />
<input type="submit" name="submit" class="settings-submit" value="Sauver" />
</div>
<h3 class="settings-heading">Password Settings</h3>
<h3 class="settings-heading">Mot de passe</h3>
<div id="settings-password-wrapper" >
<p id="settings-password-desc" >
Leave password fields blank unless changing
Laissez le champ vide, sauf si vous souhaitez le changer
</p>
<label id="settings-password-label" for="settings-password" >New Password: </label>
<label id="settings-password-label" for="settings-password" >Nouveau mot de passe: </label>
<input type="password" id="settings-password" name="npassword" />
</div>
<div id="settings-password-end" ></div>
<div id="settings-confirm-wrapper" >
<label id="settings-confirm-label" for="settings-confirm" >Confirm: </label>
<label id="settings-confirm-label" for="settings-confirm" >Confirmation: </label>
<input type="password" id="settings-confirm" name="confirm" />
</div>
<div id="settings-confirm-end" ></div>
@ -160,16 +160,16 @@ Leave password fields blank unless changing
<div class="settings-submit-wrapper" >
<input type="submit" name="submit" class="settings-submit" value="Submit" />
<input type="submit" name="submit" class="settings-submit" value="Sauver" />
</div>
<h3 class="settings-heading">Advanced Page Settings</h3>
<h3 class="settings-heading">Réglages avancés</h3>
$pagetype
<div class="settings-submit-wrapper" >
<input type="submit" name="submit" class="settings-submit" value="Submit" />
<input type="submit" name="submit" class="settings-submit" value="Sauver" />
</div>

2
view/fr/settings_nick_set.tpl
View file

@ -1,7 +1,7 @@
<div id="settings-nick-wrapper" >
<p id="settings-nickname-desc">
<span class="error-message">Your profile address is <strong>'$nickname@$basepath'</strong></span>
<span class="error-message">L'adresse de votre profil est <strong>'$nickname@$basepath'</strong></span>
</p>
$subdir

7
view/fr/settings_nick_subdir.tpl
View file

@ -1,6 +1,7 @@
<p>
It appears that your website is located in a subdirectory of the<br />
$hostname website, so this setting may not work reliably.<br />
Il semble que votre site soit situé dans un sous-répertoire du<br />
site $hostname, ce réglage pourrait donc ne pas marcher comme prévu.<br />
</p>
<p>If you have any issues, you may have better results using the profile<br /> address '<strong>$baseurl/profile/$nickname</strong>'.
<p>Si vous avez le moindre problème, essayez d'utiliser l'adresse <br />
de profil suivante : '<strong>$baseurl/profile/$nickname</strong>'.
</p>

8
view/fr/settings_nick_unset.tpl
View file

@ -1,13 +1,13 @@
<div id="settings-nick-wrapper" >
<p id="settings-nickname-desc">
Your profile URL is currently <strong>'$baseurl/profile/$uid'</strong>.
Setting a nickname will allow a friendly profile URL such as
Votre adresse (URL) de profil est actuellement <strong>'$baseurl/profile/$uid'</strong>.
Choisir un pseudo vous donnera une URL plus simple à retenir, comme
<strong>'nickname@$basepath'</strong>.
<br />
Once set, it can never be changed. The nickname <strong>must</strong> start with a letter; and only letters, numbers, dashes, and underscores are allowed.
Une fois défini, il ne pourra plus changer. Le pseudo <strong>doit</strong> débuter par une lettre; et seuls lettres, nombres, tirets et sous-tirets (_) sont autorisés.
</p>
<label id="settings-nick-label" for="settings-nick" >URL Nickname: </label>
<label id="settings-nick-label" for="settings-nick" >Pseudo: </label>
<input type="text" name="nick" id="settings-nick" value="$nickname" />
</div>
<div id="settings-nick-end" ></div>

26
view/fr/strings.php
View file

@ -579,3 +579,29 @@ $a->strings["[today]"] = "[aujourd'hui]";
$a->strings["link to source"] = "lien original";
$a->strings["Not Found"] = "Non trouvé";
$a->strings["Page not found."] = "Page introuvable.";
$a->strings["This is Friendika version"] = "Motorisé par Friendika version";
$a->strings["running at web location"] = "hébergé sur";
$a->strings["Shared content within the Friendika network is provided under the <a href=\"http://creativecommons.org/licenses/by/3.0/\">Creative Commons Attribution 3.0 license</a>"] = "Les contenus partagés au sein du réseau Friendika le sont sous la licence <a href=\"http://creativecommons.org/licenses/by/3.0/\">Creative Commons Attribution 3.0</a>";
$a->strings["Please visit <a href=\"http://project.friendika.com\">Project.Friendika.com</a> to learn more about the Friendika project."] = "Pour en savoir plus, vous pouvez nous rendre visite sur <a href=\"http://project.friendika.com\">Project.Friendika.com</a>";
$a->strings["Bug reports and issues: please visit"] = "Pour les rapports de bugs: rendez vous sur";
$a->strings["Suggestions, praise, donations, etc. - please email \"Info\" at Friendika - dot com"] = "Suggestions, remerciements, donations, etc. - écrivez à \"Info\" arob. Friendika - point com";
$a->strings["Installed plugins/addons/apps"] = "Extensions/greffons/applications installées";
$a->strings["No installed plugins/addons/apps"] = "Aucune extension/greffon/application installée";
$a->strings["Profile Match"] = "Correpondance de profils";
$a->strings["No matches"] = "Aucune correspondance";
$a->strings["See more posts like this"] = "Davantage de publications similaires";
$a->strings["See all %d comments"] = "Voir les %d commentaires";
$a->strings["Proceed with Installation"] = "Commencer l'installation";
$a->strings["Your Friendika site database has been installed."] = "La base de données de votre site Friendika a été installée.";
$a->strings["Proceed to registration"] = "Commencer l'inscription";
$a->strings["Export Personal Data"] = "Exporter les données personnelles";
$a->strings["Gender: "] = "Genre: ";
$a->strings["No entries (some entries may be hidden)."] = "Aucune entrée (certaines peuvent être cachées).";
$a->strings["Status"] = "Statut";
$a->strings["Profile"] = "Profil";
$a->strings["Photos"] = "Photos";
$a->strings["Find People With Shared Interests"] = "Trouver des gens d'intérêts communs";
$a->strings["%d Contact"] = array(
0 => "%d contact",
1 => "%d contacts",
);

10
view/fr/wall_received_eml.tpl
View file

@ -1,18 +1,18 @@
Dear $username,
Chèr(e) $username,
'$from' posted something to your profile wall.
'$from' a posté quelque-chose sur le mur de votre profil.
-----
$body
-----
Please login at $siteurl to view or delete the item:
Connectez-vous à $siteurl pour voir et/ou supprimer l'élément:
$display
Thank you,
$sitename administrator
Merci,
l'administrateur de $sitename

2
view/it/settings.tpl
View file

@ -92,7 +92,7 @@ $profile_in_net_dir
<div id="settings-default-perms-end"></div>
<div id="settings-blockw-wrapper" >
<label id="settings-blockw-label" for="settings-blockw" >Allow friends to post to your profile: </label>
<label id="settings-blockw-label" for="settings-blockw" >Allow friends to post to your profile page: </label>
<input type="checkbox" name="blockwall" id="settings-blockw" value="1" $blockw_checked />
</div>
<div id="settings-blockw-end" ></div>

2
view/sv/settings.tpl
View file

@ -92,7 +92,7 @@ $profile_in_net_dir
<div id="settings-default-perms-end"></div>
<div id="settings-blockw-wrapper" >
<label id="settings-blockw-label" for="settings-blockw" >Allow friends to post to your profile: </label>
<label id="settings-blockw-label" for="settings-blockw" >Allow friends to post to your profile page: </label>
<input type="checkbox" name="blockwall" id="settings-blockw" value="1" $blockw_checked />
</div>
<div id="settings-blockw-end" ></div>