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

diff --git a/boot.php b/boot.php
index ba9e2b6e44081b274fb5b855531777911c0857fa..f12ec0d8d8d4091b6efa202e422ec057a613b3dc 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -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   );
 

diff --git a/mod/network.php b/mod/network.php
index 17d36dfb28d4609316c8091cfe315b5473cf33c4..2ff15a29b780fe8fc4541b3c7cb0f0adacd52aff 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -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>';
 
 

diff --git a/util/README b/util/README
index cb2fd9b55b7e72a4232fadc8c4e01308465348be..a6f7e59a6f50a118c176848fdc06b44f48ea5991 100644 (file)
--- a/util/README
+++ b/util/README
@@ -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>"

diff --git a/util/typo.php b/util/typo.php
index 84a50e15e236b0d68b6c08557d94884cb609b618..e20cce86a5a3c68cc74ef7b7399b1d8abecaaca5 100644 (file)
--- a/util/typo.php
+++ b/util/typo.php
@@ -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);
        }

diff --git a/util/typohelper.php b/util/typohelper.php
new file mode 100644 (file)
index 0000000..589702a
--- /dev/null
+++ b/util/typohelper.php
@@ -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);

diff --git a/view/de/settings.tpl b/view/de/settings.tpl
index 170939991e15b3741af2a04322ec21d57b084f39..1924fc8e15ed9ada5e4d99ccd39402a5ce4ae697 100644 (file)
--- a/view/de/settings.tpl
+++ b/view/de/settings.tpl
@@ -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>

diff --git a/view/en/settings.tpl b/view/en/settings.tpl
index 134fffaf92b55f56d78e7f59360736dce07bb4a1..9822291c1e0ca8732735c11532e95c901da05ffb 100644 (file)
--- a/view/en/settings.tpl
+++ b/view/en/settings.tpl
@@ -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>

diff --git a/view/fr/install_db.tpl b/view/fr/install_db.tpl
index c413689c25e5bc410f07efe4e3aba1b82673e4d5..b6aea3e49109f864e1424f7bef1cafd2e01c0ca3 100644 (file)
--- a/view/fr/install_db.tpl
+++ b/view/fr/install_db.tpl
@@ -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

diff --git a/view/fr/intro_complete_eml.tpl b/view/fr/intro_complete_eml.tpl
index a60745ec5549783104cf7141f2f0b00b0f5debfc..b8a7a345741b0488158ae28eff5ffae7eef15c93 100644 (file)
--- a/view/fr/intro_complete_eml.tpl
+++ b/view/fr/intro_complete_eml.tpl
@@ -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

diff --git a/view/fr/intros-top.tpl b/view/fr/intros-top.tpl
index d8b7394a4a0cca44a6f9a73da84170c3a210fe43..85dd628b66b2d5ae04a7e260b2386bd27e6759eb 100644 (file)
--- a/view/fr/intros-top.tpl
+++ b/view/fr/intros-top.tpl
@@ -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>

diff --git a/view/fr/lostpass.tpl b/view/fr/lostpass.tpl
index a7040c1493d20424255789f0313aa6825916b177..245b024845a0278a2cd74e953116031fc00c23ce 100644 (file)
--- a/view/fr/lostpass.tpl
+++ b/view/fr/lostpass.tpl
@@ -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>

diff --git a/view/fr/lostpass_eml.tpl b/view/fr/lostpass_eml.tpl
index c350236a43891d22a7db102ff31239a62ae9ea16..168e9a5e22c39043c7aea7908befc7db7e3aff21 100644 (file)
--- a/view/fr/lostpass_eml.tpl
+++ b/view/fr/lostpass_eml.tpl
@@ -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
 
  

diff --git a/view/fr/messages.po b/view/fr/messages.po
index 6759f311b505537b899ce13b2c255bf92116465e..81cc8b9fccb50d77f003b1053acec1593cea6ca2 100644 (file)
--- a/view/fr/messages.po
+++ b/view/fr/messages.po
@@ -6,18 +6,17 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.1.924\n"
+"Project-Id-Version: 2.1.931\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-21 08:22+0000\n"
+"POT-Creation-Date: 2011-03-28 19:42+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Olivier Migeot <olivier+translate@migeot.org>\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-"X-Language: fr_FR\n"
 
 #: ../../include/auth.php:27
 msgid "Logged out."
@@ -51,6 +50,7 @@ msgstr "Groupes"
 
 #: ../../include/acl_selectors.php:140 ../../include/acl_selectors.php:155
 #: ../../include/nav.php:111 ../../mod/contacts.php:306 ../../boot.php:2022
+#: ../../mod/contacts.php:311
 msgid "Contacts"
 msgstr "Contacts"
 
@@ -417,7 +417,8 @@ msgstr "Vous avez un nouvel abonné à "
 #: ../../mod/lostpass.php:39 ../../mod/item.php:475 ../../mod/item.php:498
 #: ../../mod/regmod.php:93 ../../mod/dfrn_notify.php:177
 #: ../../mod/dfrn_notify.php:389 ../../mod/dfrn_notify.php:475
-#: ../../mod/dfrn_request.php:545
+#: ../../mod/dfrn_request.php:545 ../../mod/register.php:329
+#: ../../mod/register.php:366
 msgid "Administrator"
 msgstr "Administrateur"
 
@@ -441,6 +442,7 @@ msgid "Home"
 msgstr "Accueil"
 
 #: ../../include/nav.php:61 ../../mod/register.php:445 ../../boot.php:809
+#: ../../mod/register.php:463
 msgid "Register"
 msgstr "S'inscrire"
 
@@ -450,6 +452,7 @@ msgid "Apps"
 msgstr "Applications"
 
 #: ../../include/nav.php:67 ../../mod/search.php:17 ../../boot.php:2055
+#: ../../boot.php:2056
 msgid "Search"
 msgstr "Recherche"
 
@@ -499,13 +502,16 @@ msgstr ""
 #: ../../mod/dfrn_confirm.php:53 ../../mod/display.php:308
 #: ../../mod/message.php:8 ../../mod/message.php:116 ../../mod/settings.php:14
 #: ../../mod/settings.php:19 ../../mod/settings.php:210 ../../mod/item.php:57
-#: ../../mod/item.php:668 ../../mod/group.php:19 ../../mod/profile_photo.php:19
-#: ../../mod/profile_photo.php:133 ../../mod/profile_photo.php:139
-#: ../../mod/profile_photo.php:150 ../../mod/viewcontacts.php:13
-#: ../../mod/regmod.php:16 ../../mod/invite.php:13 ../../mod/invite.php:50
-#: ../../mod/manage.php:75 ../../mod/follow.php:8 ../../mod/photos.php:85
-#: ../../mod/photos.php:773 ../../mod/notifications.php:56
-#: ../../mod/contacts.php:101 ../../mod/editpost.php:10 ../../index.php:251
+#: ../../mod/item.php:668 ../../mod/group.php:19
+#: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:133
+#: ../../mod/profile_photo.php:139 ../../mod/profile_photo.php:150
+#: ../../mod/viewcontacts.php:13 ../../mod/regmod.php:16
+#: ../../mod/invite.php:13 ../../mod/invite.php:50 ../../mod/manage.php:75
+#: ../../mod/follow.php:8 ../../mod/photos.php:85 ../../mod/photos.php:773
+#: ../../mod/notifications.php:56 ../../mod/contacts.php:101
+#: ../../mod/editpost.php:10 ../../index.php:251 ../../mod/install.php:93
+#: ../../mod/settings.php:15 ../../mod/settings.php:20
+#: ../../mod/settings.php:211 ../../mod/contacts.php:106
 msgid "Permission denied."
 msgstr "Permission refusée."
 
@@ -546,6 +552,7 @@ msgstr "Poster sur Facebook par défaut"
 #: ../../addon/statusnet/statusnet.php:207 ../../mod/install.php:109
 #: ../../mod/invite.php:64 ../../mod/manage.php:106 ../../mod/photos.php:801
 #: ../../mod/photos.php:858 ../../mod/photos.php:1066
+#: ../../mod/install.php:123
 msgid "Submit"
 msgstr "Envoyer"
 
@@ -769,8 +776,8 @@ msgid ""
 "and submit the form. Only your <strong>public</strong> posts will be posted "
 "to StatusNet."
 msgstr ""
-"Pour vous connecter à votre compte StatusNet, cliquez sur le bouton "
-"ci-dessous pour obtenir un code de sécurité de StatusNet, que vous aurez à "
+"Pour vous connecter à votre compte StatusNet, cliquez sur le bouton ci-"
+"dessous pour obtenir un code de sécurité de StatusNet, que vous aurez à "
 "coller dans la boîte ci-dessous. Ensuite, validez le formulaire. Seuls vos "
 "articles <strong>publics</strong> seront postés sur StatusNet."
 
@@ -884,7 +891,7 @@ msgstr ""
 "Ceci est votre profil <strong>public</strong>.<br />Il <strong>peut</strong> "
 "être visible par n'importe quel utilisateur d'Internet."
 
-#: ../../mod/profiles.php:380
+#: ../../mod/profiles.php:380 ../../mod/directory.php:89
 msgid "Age: "
 msgstr "Age: "
 
@@ -903,7 +910,8 @@ msgid "Unable to process image."
 msgstr "Impossible de traiter l'image."
 
 #: ../../mod/wall_upload.php:79 ../../mod/wall_upload.php:88
-#: ../../mod/wall_upload.php:95 ../../mod/message.php:93 ../../mod/item.php:212
+#: ../../mod/wall_upload.php:95 ../../mod/message.php:93
+#: ../../mod/item.php:212
 msgid "Wall Photos"
 msgstr "Photos du mur"
 
@@ -954,10 +962,10 @@ msgid ""
 "Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
 "must also begin with a letter."
 msgstr ""
-"Votre \"pseudo\" peut seulement contenir les caractères \"a-z\", \"0-9\", "
-"\"-\", and \"_\", et doit commencer par une lettre."
+"Votre \"pseudo\" peut seulement contenir les caractères \"a-z\", \"0-9\", \"-"
+"\", and \"_\", et doit commencer par une lettre."
 
-#: ../../mod/register.php:112
+#: ../../mod/register.php:112 ../../mod/register.php:212
 msgid "Nickname is already registered. Please choose another."
 msgstr "Pseudo déjà utilisé. Merci d'en choisir un autre."
 
@@ -969,7 +977,7 @@ msgstr "ERREUR SÉRIEUSE: La génération des clés de sécurité a échoué."
 msgid "An error occurred during registration. Please try again."
 msgstr "Une erreur est survenue lors de l'inscription. Merci de recommencer."
 
-#: ../../mod/register.php:216
+#: ../../mod/register.php:216 ../../mod/register.php:234
 msgid "An error occurred creating your default profile. Please try again."
 msgstr ""
 "Une erreur est survenue lors de la création de votre profil par défaut. "
@@ -981,38 +989,41 @@ msgstr ""
 #: ../../mod/profile_photo.php:155 ../../mod/profile_photo.php:225
 #: ../../mod/profile_photo.php:234 ../../mod/photos.php:106
 #: ../../mod/photos.php:531 ../../mod/photos.php:850 ../../mod/photos.php:865
+#: ../../mod/register.php:285 ../../mod/register.php:292
+#: ../../mod/register.php:299
 msgid "Profile Photos"
 msgstr "Photos du profil"
 
 #: ../../mod/register.php:310 ../../mod/regmod.php:92
+#: ../../mod/register.php:328
 #, fuzzy, php-format
 msgid "Registration details for %s"
 msgstr "Détails d'inscription pour %s"
 
-#: ../../mod/register.php:315
+#: ../../mod/register.php:315 ../../mod/register.php:333
 msgid ""
 "Registration successful. Please check your email for further instructions."
 msgstr ""
 "Inscription réussie. Vérifiez vos emails pour la suite des instructions."
 
-#: ../../mod/register.php:319
+#: ../../mod/register.php:319 ../../mod/register.php:337
 msgid "Failed to send email message. Here is the message that failed."
 msgstr "Impossible d'envoyer un email. Voici le message qui a échoué."
 
-#: ../../mod/register.php:324
+#: ../../mod/register.php:324 ../../mod/register.php:342
 msgid "Your registration can not be processed."
 msgstr "Votre inscription ne peut être traitée."
 
-#: ../../mod/register.php:347
+#: ../../mod/register.php:347 ../../mod/register.php:365
 #, fuzzy, php-format
 msgid "Registration request at %s"
 msgstr "Demande d'inscription à %s"
 
-#: ../../mod/register.php:351
+#: ../../mod/register.php:351 ../../mod/register.php:369
 msgid "Your registration is pending approval by the site owner."
 msgstr "Votre inscription attend une validation du propriétaire du site."
 
-#: ../../mod/register.php:399
+#: ../../mod/register.php:399 ../../mod/register.php:417
 #, fuzzy
 msgid ""
 "You may (optionally) fill in this form via OpenID by supplying your OpenID "
@@ -1021,7 +1032,7 @@ msgstr ""
 "Vous pouvez (si vous le souhaitez) remplir ce formulaire via OpenID. "
 "Fournissez votre OpenID et cliquez \"S'inscrire\"."
 
-#: ../../mod/register.php:400
+#: ../../mod/register.php:400 ../../mod/register.php:418
 msgid ""
 "If you are not familiar with OpenID, please leave that field blank and fill "
 "in the rest of the items."
@@ -1029,59 +1040,61 @@ msgstr ""
 "Si vous n'êtes pas familier avec OpenID, laissez ce champ vide et remplissez "
 "le reste."
 
-#: ../../mod/register.php:401
+#: ../../mod/register.php:401 ../../mod/register.php:419
 msgid "Your OpenID (optional): "
 msgstr "Votre OpenID (facultatif): "
 
-#: ../../mod/register.php:415
+#: ../../mod/register.php:415 ../../mod/register.php:433
 #, fuzzy
 msgid "Include your profile in member directory?"
 msgstr "Inclure votre profil dans l'annuaire des membres?"
 
 #: ../../mod/register.php:418 ../../mod/dfrn_request.php:618
+#: ../../mod/register.php:436
 msgid "Yes"
 msgstr "Oui"
 
 #: ../../mod/register.php:419 ../../mod/dfrn_request.php:619
+#: ../../mod/register.php:437
 msgid "No"
 msgstr "Non"
 
 #: ../../mod/register.php:424 ../../mod/network.php:484
 #: ../../mod/display.php:317 ../../mod/profile.php:435
+#: ../../mod/register.php:442 ../../mod/network.php:554
+#: ../../mod/profile.php:490
 msgid ""
-"Shared content is covered by the <a "
-"href=\"http://creativecommons.org/licenses/by/3.0/\">Creative Commons "
-"Attribution 3.0</a> license."
+"Shared content is covered by the <a href=\"http://creativecommons.org/"
+"licenses/by/3.0/\">Creative Commons Attribution 3.0</a> license."
 msgstr ""
-"Le contenu est partagé suivant les termes de la licence <a "
-"href=\"http://creativecommons.org/licenses/by/3.0/\">Creative Commons "
-"Attribution 3.0</a>."
+"Le contenu est partagé suivant les termes de la licence <a href=\"http://"
+"creativecommons.org/licenses/by/3.0/\">Creative Commons Attribution 3.0</a>."
 
-#: ../../mod/register.php:431
+#: ../../mod/register.php:431 ../../mod/register.php:449
 msgid "Registration"
 msgstr "Inscription"
 
-#: ../../mod/register.php:439
+#: ../../mod/register.php:439 ../../mod/register.php:457
 #, fuzzy
 msgid "Your Full Name (e.g. Joe Smith): "
 msgstr "Votre nom complet (p.ex. Michel Dupont): "
 
-#: ../../mod/register.php:440
+#: ../../mod/register.php:440 ../../mod/register.php:458
 #, fuzzy
 msgid "Your Email Address: "
 msgstr "Votre adresse courriel: "
 
-#: ../../mod/register.php:441
+#: ../../mod/register.php:441 ../../mod/register.php:459
 #, fuzzy
 msgid ""
 "Choose a profile nickname. This must begin with a text character. Your "
-"profile address on this site will then be "
-"'<strong>nickname@$sitename</strong>'."
+"profile address on this site will then be '<strong>nickname@$sitename</"
+"strong>'."
 msgstr ""
 "Choisissez un pseudo. Celui devra commencer par une lettre. L'adresse de "
 "votre profil en découlera sous la forme '<strong>pseudo@$sitename</strong>'."
 
-#: ../../mod/register.php:442
+#: ../../mod/register.php:442 ../../mod/register.php:460
 msgid "Choose a nickname: "
 msgstr "Choisir un pseudo: "
 
@@ -1098,68 +1111,83 @@ msgstr "Vue normale"
 msgid "New Item View"
 msgstr "Vue des nouveautés"
 
-#: ../../mod/network.php:69 ../../mod/message.php:172 ../../mod/profile.php:134
+#: ../../mod/network.php:69 ../../mod/message.php:172
+#: ../../mod/profile.php:134 ../../mod/profile.php:137
 #, fuzzy
 msgid "Please enter a link URL:"
 msgstr "Entrez un lien web:"
 
 #: ../../mod/network.php:70 ../../mod/profile.php:135
+#: ../../mod/profile.php:138
 #, fuzzy
 msgid "Please enter a YouTube link:"
 msgstr "Entrez un lien Youtube:"
 
 #: ../../mod/network.php:71 ../../mod/profile.php:136
+#: ../../mod/profile.php:139
 #, fuzzy
 msgid "Please enter a video(.ogg) link/URL:"
 msgstr "Entrez un lien vidéo (.ogg):"
 
 #: ../../mod/network.php:72 ../../mod/profile.php:137
+#: ../../mod/profile.php:140
 #, fuzzy
 msgid "Please enter an audio(.ogg) link/URL:"
 msgstr "Entrez un lien audio (.ogg):"
 
 #: ../../mod/network.php:73 ../../mod/profile.php:138
+#: ../../mod/profile.php:141
 #, fuzzy
 msgid "Where are you right now?"
 msgstr "Où êtes-vous présentemment?"
 
-#: ../../mod/network.php:96 ../../mod/network.php:375 ../../mod/display.php:158
-#: ../../mod/profile.php:161 ../../mod/profile.php:322 ../../mod/photos.php:1086
+#: ../../mod/network.php:96 ../../mod/network.php:375
+#: ../../mod/display.php:158 ../../mod/profile.php:161
+#: ../../mod/profile.php:322 ../../mod/photos.php:1086
+#: ../../mod/network.php:441 ../../mod/profile.php:164
+#: ../../mod/profile.php:377
 #, fuzzy
 msgid "Share"
 msgstr "Partager"
 
-#: ../../mod/network.php:97 ../../mod/message.php:186 ../../mod/message.php:320
-#: ../../mod/profile.php:162 ../../mod/editpost.php:63
+#: ../../mod/network.php:97 ../../mod/message.php:186
+#: ../../mod/message.php:320 ../../mod/profile.php:162
+#: ../../mod/editpost.php:63 ../../mod/profile.php:165
 msgid "Upload photo"
 msgstr "Joindre photo"
 
-#: ../../mod/network.php:98 ../../mod/message.php:187 ../../mod/message.php:321
-#: ../../mod/profile.php:163 ../../mod/editpost.php:64
+#: ../../mod/network.php:98 ../../mod/message.php:187
+#: ../../mod/message.php:321 ../../mod/profile.php:163
+#: ../../mod/editpost.php:64 ../../mod/profile.php:166
 msgid "Insert web link"
 msgstr "Insérer lien web"
 
-#: ../../mod/network.php:99 ../../mod/profile.php:164 ../../mod/editpost.php:65
+#: ../../mod/network.php:99 ../../mod/profile.php:164
+#: ../../mod/editpost.php:65 ../../mod/profile.php:167
 #, fuzzy
 msgid "Insert YouTube video"
 msgstr "Insérer une vidéo Youtube"
 
-#: ../../mod/network.php:100 ../../mod/profile.php:165 ../../mod/editpost.php:66
+#: ../../mod/network.php:100 ../../mod/profile.php:165
+#: ../../mod/editpost.php:66 ../../mod/profile.php:168
 #, fuzzy
 msgid "Insert Vorbis [.ogg] video"
 msgstr "Insérer un lien vidéo Vorbis [.ogg]"
 
-#: ../../mod/network.php:101 ../../mod/profile.php:166 ../../mod/editpost.php:67
+#: ../../mod/network.php:101 ../../mod/profile.php:166
+#: ../../mod/editpost.php:67 ../../mod/profile.php:169
 #, fuzzy
 msgid "Insert Vorbis [.ogg] audio"
 msgstr "Insérer un lien audio Vorbis [.ogg]"
 
-#: ../../mod/network.php:102 ../../mod/profile.php:167 ../../mod/editpost.php:68
+#: ../../mod/network.php:102 ../../mod/profile.php:167
+#: ../../mod/editpost.php:68 ../../mod/profile.php:170
 #, fuzzy
 msgid "Set your location"
 msgstr "Définir votre localisation"
 
-#: ../../mod/network.php:103 ../../mod/profile.php:168 ../../mod/editpost.php:69
+#: ../../mod/network.php:103 ../../mod/profile.php:168
+#: ../../mod/editpost.php:69 ../../mod/profile.php:171
 #, fuzzy
 msgid "Clear browser location"
 msgstr "Effacer la localisation du navigateur"
@@ -1167,21 +1195,26 @@ msgstr "Effacer la localisation du navigateur"
 #: ../../mod/network.php:104 ../../mod/network.php:376
 #: ../../mod/display.php:159 ../../mod/message.php:188
 #: ../../mod/message.php:322 ../../mod/profile.php:169
-#: ../../mod/profile.php:323 ../../mod/photos.php:1087 ../../mod/editpost.php:70
+#: ../../mod/profile.php:323 ../../mod/photos.php:1087
+#: ../../mod/editpost.php:70 ../../mod/network.php:442
+#: ../../mod/profile.php:172 ../../mod/profile.php:378
 msgid "Please wait"
 msgstr "Patientez"
 
-#: ../../mod/network.php:105 ../../mod/profile.php:170 ../../mod/editpost.php:71
+#: ../../mod/network.php:105 ../../mod/profile.php:170
+#: ../../mod/editpost.php:71 ../../mod/profile.php:173
 #, fuzzy
 msgid "Permission settings"
 msgstr "Réglages des permissions"
 
-#: ../../mod/network.php:111 ../../mod/profile.php:177 ../../mod/editpost.php:77
+#: ../../mod/network.php:111 ../../mod/profile.php:177
+#: ../../mod/editpost.php:77 ../../mod/profile.php:180
 #, fuzzy
 msgid "CC: email addresses"
 msgstr "CC: adresse de courriel"
 
-#: ../../mod/network.php:113 ../../mod/profile.php:179 ../../mod/editpost.php:79
+#: ../../mod/network.php:113 ../../mod/profile.php:179
+#: ../../mod/editpost.php:79 ../../mod/profile.php:182
 #, fuzzy
 msgid "Example: bob@example.com, mary@example.com"
 msgstr "Exemple: bob@exemple.com, mary@exemple.com"
@@ -1199,27 +1232,33 @@ msgid "Group: "
 msgstr "Groupe: "
 
 #: ../../mod/network.php:280 ../../mod/network.php:446
-#: ../../mod/display.php:262 ../../mod/profile.php:402 ../../mod/search.php:116
+#: ../../mod/display.php:262 ../../mod/profile.php:402
+#: ../../mod/search.php:116 ../../mod/network.php:303
+#: ../../mod/network.php:512 ../../mod/profile.php:457
 msgid "View $name's profile"
 msgstr "Voir le profil de $name"
 
 #: ../../mod/network.php:295 ../../mod/search.php:131
+#: ../../mod/network.php:318
 msgid "View in context"
 msgstr "Voir dans le contexte"
 
 #: ../../mod/network.php:329 ../../mod/display.php:149
 #: ../../mod/profile.php:313 ../../mod/photos.php:962
+#: ../../mod/network.php:395 ../../mod/profile.php:368
 msgid "Private Message"
 msgstr "Message privé"
 
 #: ../../mod/network.php:373 ../../mod/display.php:156
 #: ../../mod/profile.php:320 ../../mod/photos.php:1084
+#: ../../mod/network.php:439 ../../mod/profile.php:375
 #, fuzzy
 msgid "I like this (toggle)"
 msgstr "I like this (bascule)"
 
 #: ../../mod/network.php:374 ../../mod/display.php:157
 #: ../../mod/profile.php:321 ../../mod/photos.php:1085
+#: ../../mod/network.php:440 ../../mod/profile.php:376
 #, fuzzy
 msgid "I don't like this (toggle)"
 msgstr "I don't like this (bascule)"
@@ -1227,37 +1266,44 @@ msgstr "I don't like this (bascule)"
 #: ../../mod/network.php:389 ../../mod/display.php:171
 #: ../../mod/profile.php:335 ../../mod/photos.php:1106
 #: ../../mod/photos.php:1146 ../../mod/photos.php:1175
+#: ../../mod/network.php:455 ../../mod/profile.php:390
 msgid "This is you"
 msgstr "C'est vous"
 
 #: ../../mod/network.php:397 ../../mod/display.php:222
 #: ../../mod/profile.php:359 ../../mod/editpost.php:62
+#: ../../mod/network.php:463 ../../mod/profile.php:414
 #, fuzzy
 msgid "Edit"
 msgstr "Éditer"
 
 #: ../../mod/network.php:398 ../../mod/display.php:238 ../../mod/group.php:137
 #: ../../mod/profile.php:381 ../../mod/photos.php:1203
+#: ../../mod/network.php:464 ../../mod/profile.php:436
 #, fuzzy
 msgid "Delete"
 msgstr "Supprimer"
 
 #: ../../mod/network.php:447 ../../mod/display.php:263
+#: ../../mod/network.php:513
 #, fuzzy
 msgid "View $owner_name's profile"
 msgstr "Voir le profil de $owner_name"
 
 #: ../../mod/network.php:448 ../../mod/display.php:264
+#: ../../mod/network.php:514
 #, fuzzy
 msgid "to"
 msgstr "à"
 
 #: ../../mod/network.php:449 ../../mod/display.php:265
+#: ../../mod/network.php:515
 #, fuzzy
 msgid "Wall-to-Wall"
 msgstr "Inter-mur"
 
 #: ../../mod/network.php:450 ../../mod/display.php:266
+#: ../../mod/network.php:516
 #, fuzzy
 msgid "via Wall-To-Wall:"
 msgstr "en Inter-mur:"
@@ -1283,6 +1329,7 @@ msgid "%1$s doesn't like %2$s's %3$s"
 msgstr "%1$s n'aime pas %3$s de %2$s"
 
 #: ../../mod/dfrn_confirm.php:114 ../../mod/contacts.php:209
+#: ../../mod/contacts.php:214
 msgid "Contact not found."
 msgstr "Contact introuvable."
 
@@ -1442,11 +1489,11 @@ msgstr "Effacer message"
 msgid "Send Reply"
 msgstr "Répondre"
 
-#: ../../mod/install.php:30
+#: ../../mod/install.php:30 ../../mod/install.php:33
 msgid "Could not create/connect to database."
 msgstr "Impossible de créer/atteindre la base de données."
 
-#: ../../mod/install.php:35
+#: ../../mod/install.php:35 ../../mod/install.php:38
 msgid "Connected to database."
 msgstr "Connecté à la base de données."
 
@@ -1454,7 +1501,7 @@ msgstr "Connecté à la base de données."
 msgid "Database import succeeded."
 msgstr "Import de base achevé avec succès."
 
-#: ../../mod/install.php:67
+#: ../../mod/install.php:67 ../../mod/install.php:75
 msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
 msgstr ""
@@ -1462,14 +1509,15 @@ msgstr ""
 "'poller'."
 
 #: ../../mod/install.php:68 ../../mod/install.php:75 ../../mod/install.php:175
+#: ../../mod/install.php:76 ../../mod/install.php:86 ../../mod/install.php:189
 msgid "Please see the file \"INSTALL.txt\"."
 msgstr "Référez-vous au fichier \"INSTALL.txt\"."
 
-#: ../../mod/install.php:73
+#: ../../mod/install.php:73 ../../mod/install.php:84
 msgid "Database import failed."
 msgstr "Import de base échoué."
 
-#: ../../mod/install.php:74
+#: ../../mod/install.php:74 ../../mod/install.php:85
 msgid ""
 "You may need to import the file \"database.sql\" manually using phpmyadmin "
 "or mysql."
@@ -1477,25 +1525,25 @@ msgstr ""
 "Vous pourriez avoir besoin d'importer le fichier \"database.sql\" "
 "manuellement au moyen de phpmyadmin ou de la commande mysql."
 
-#: ../../mod/install.php:84
+#: ../../mod/install.php:84 ../../mod/install.php:98
 msgid "Welcome to Friendika."
 msgstr "Bienvenue sur Friendika."
 
-#: ../../mod/install.php:124
+#: ../../mod/install.php:124 ../../mod/install.php:138
 msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr ""
 "Impossible de trouver la version \"ligne de commande\" de PHP dans le PATH "
 "du serveur web."
 
-#: ../../mod/install.php:125
+#: ../../mod/install.php:125 ../../mod/install.php:139
 msgid ""
 "This is required. Please adjust the configuration file .htconfig.php "
 "accordingly."
 msgstr ""
-"Ceci est requis. Merci d'ajuster la configuration dans le fichier "
-".htconfig.php en conséquence."
+"Ceci est requis. Merci d'ajuster la configuration dans le fichier .htconfig."
+"php en conséquence."
 
-#: ../../mod/install.php:132
+#: ../../mod/install.php:132 ../../mod/install.php:146
 msgid ""
 "The command line version of PHP on your system does not have "
 "\"register_argc_argv\" enabled."
@@ -1503,11 +1551,11 @@ msgstr ""
 "La version \"ligne de commande\" de PHP de votre système n'a pas "
 "\"register_argc_argv\" d'activé."
 
-#: ../../mod/install.php:133
+#: ../../mod/install.php:133 ../../mod/install.php:147
 msgid "This is required for message delivery to work."
 msgstr "Ceci est requis pour que la livraison des messages fonctionne."
 
-#: ../../mod/install.php:155
+#: ../../mod/install.php:155 ../../mod/install.php:169
 msgid ""
 "Error: the \"openssl_pkey_new\" function on this system is not able to "
 "generate encryption keys"
@@ -1515,41 +1563,41 @@ msgstr ""
 "Erreur: la fonction \"openssl_pkey_new\" de ce système ne permet pas de "
 "générer des clés de chiffrement"
 
-#: ../../mod/install.php:156
+#: ../../mod/install.php:156 ../../mod/install.php:170
 msgid ""
-"If running under Windows, please see "
-"\"http://www.php.net/manual/en/openssl.installation.php\"."
+"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
+"installation.php\"."
 msgstr ""
-"Si vous utilisez Windows, merci de vous réferer à "
-"\"http://www.php.net/manual/en/openssl.installation.php\"."
+"Si vous utilisez Windows, merci de vous réferer à \"http://www.php.net/"
+"manual/en/openssl.installation.php\"."
 
-#: ../../mod/install.php:165
+#: ../../mod/install.php:165 ../../mod/install.php:179
 msgid ""
 "Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr ""
 "Erreur: Le module \"rewrite\" du serveur web Apache est requis mais pas "
 "installé."
 
-#: ../../mod/install.php:167
+#: ../../mod/install.php:167 ../../mod/install.php:181
 msgid "Error: libCURL PHP module required but not installed."
 msgstr "Erreur: Le module PHP \"libCURL\" est requis mais pas installé."
 
-#: ../../mod/install.php:169
+#: ../../mod/install.php:169 ../../mod/install.php:183
 msgid ""
 "Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr ""
 "Erreur: Le module PHP \"GD\" disposant du support JPEG est requis mais pas "
 "installé."
 
-#: ../../mod/install.php:171
+#: ../../mod/install.php:171 ../../mod/install.php:185
 msgid "Error: openssl PHP module required but not installed."
 msgstr "Erreur: Le module PHP \"openssl\" est requis mais pas installé."
 
-#: ../../mod/install.php:173
+#: ../../mod/install.php:173 ../../mod/install.php:187
 msgid "Error: mysqli PHP module required but not installed."
 msgstr "Erreur: Le module PHP \"mysqli\" est requis mais pas installé."
 
-#: ../../mod/install.php:184
+#: ../../mod/install.php:184 ../../mod/install.php:198
 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."
@@ -1557,7 +1605,7 @@ msgstr ""
 "L'installeur web doit être en mesure de créer un fichier \".htconfig.php\" à "
 "la racine de votre serveur web, mais il en est incapable."
 
-#: ../../mod/install.php:185
+#: ../../mod/install.php:185 ../../mod/install.php:199
 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."
@@ -1566,7 +1614,7 @@ msgstr ""
 "ne pas être capable d'écrire dans votre répertoire - alors que vous-même le "
 "pouvez."
 
-#: ../../mod/install.php:186
+#: ../../mod/install.php:186 ../../mod/install.php:200
 msgid ""
 "Please check with your site documentation or support people to see if this "
 "situation can be corrected."
@@ -1574,7 +1622,7 @@ msgstr ""
 "Merci de vérifier - avec la documentation ou le support de votre hébergement "
 "- que la situation peut être corrigée."
 
-#: ../../mod/install.php:187
+#: ../../mod/install.php:187 ../../mod/install.php:201
 msgid ""
 "If not, you may be required to perform a manual installation. Please see the "
 "file \"INSTALL.txt\" for instructions."
@@ -1582,7 +1630,7 @@ msgstr ""
 "Dans le cas contraire, vous pouvez pratiquer une installation manuelle. "
 "Référez-vous au fichier \"INSTALL.txt\" pour les instructions."
 
-#: ../../mod/install.php:196
+#: ../../mod/install.php:196 ../../mod/install.php:210
 msgid ""
 "The database configuration file \".htconfig.php\" could not be written. "
 "Please use the enclosed text to create a configuration file in your web "
@@ -1592,71 +1640,71 @@ msgstr ""
 "créé. Merci d'utiliser le texte ci-joint pour créer ce fichier à la racine "
 "de votre hébergement."
 
-#: ../../mod/install.php:211
+#: ../../mod/install.php:211 ../../mod/install.php:225
 msgid "Errors encountered creating database tables."
 msgstr "Des erreurs ont été signalées lors de la création des tables."
 
-#: ../../mod/settings.php:37
+#: ../../mod/settings.php:37 ../../mod/settings.php:38
 msgid "Passwords do not match. Password unchanged."
 msgstr "Les mots de passe ne correspondent pas. Aucun changement appliqué."
 
-#: ../../mod/settings.php:42
+#: ../../mod/settings.php:42 ../../mod/settings.php:43
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr "Les mots de passe vides sont interdits. Aucun changement appliqué."
 
-#: ../../mod/settings.php:53
+#: ../../mod/settings.php:53 ../../mod/settings.php:54
 msgid "Password changed."
 msgstr "Mots de passe changés."
 
-#: ../../mod/settings.php:55
+#: ../../mod/settings.php:55 ../../mod/settings.php:56
 msgid "Password update failed. Please try again."
 msgstr "Le changement de mot de passe a échoué. Merci de recommencer."
 
-#: ../../mod/settings.php:97
+#: ../../mod/settings.php:97 ../../mod/settings.php:98
 msgid " Please use a shorter name."
 msgstr " Merci d'utiliser un nom plus court."
 
-#: ../../mod/settings.php:99
+#: ../../mod/settings.php:99 ../../mod/settings.php:100
 msgid " Name too short."
 msgstr " Nom trop court."
 
-#: ../../mod/settings.php:105
+#: ../../mod/settings.php:105 ../../mod/settings.php:106
 msgid " Not valid email."
 msgstr " Email invalide."
 
-#: ../../mod/settings.php:107
+#: ../../mod/settings.php:107 ../../mod/settings.php:108
 msgid " Cannot change to that email."
 msgstr " Impossible de changer pour cet email."
 
-#: ../../mod/settings.php:165
+#: ../../mod/settings.php:165 ../../mod/settings.php:166
 msgid "Settings updated."
 msgstr "Réglages mis à jour."
 
-#: ../../mod/settings.php:215
+#: ../../mod/settings.php:215 ../../mod/settings.php:216
 msgid "Plugin Settings"
 msgstr "Réglages des extensions"
 
-#: ../../mod/settings.php:216
+#: ../../mod/settings.php:216 ../../mod/settings.php:217
 msgid "Account Settings"
 msgstr "Réglages du compte"
 
-#: ../../mod/settings.php:222
+#: ../../mod/settings.php:222 ../../mod/settings.php:223
 msgid "No Plugin settings configured"
 msgstr "Pas de réglages d'extensions configurés"
 
-#: ../../mod/settings.php:269
+#: ../../mod/settings.php:269 ../../mod/settings.php:270
 msgid "OpenID: "
 msgstr "OpenID: "
 
-#: ../../mod/settings.php:269
+#: ../../mod/settings.php:269 ../../mod/settings.php:270
 msgid "&nbsp;(Optional) Allow this OpenID to login to this account."
 msgstr "&nbsp;(Facultatif) Autoriser cet OpenID à se connecter à ce compte."
 
-#: ../../mod/settings.php:301
+#: ../../mod/settings.php:301 ../../mod/settings.php:302
 msgid "Profile is <strong>not published</strong>."
 msgstr "Ce profil n'est <strong>pas publié</strong>."
 
-#: ../../mod/settings.php:358
+#: ../../mod/settings.php:358 ../../mod/settings.php:363
 msgid "Default Post Permissions"
 msgstr "Permissions par défaut sur les articles"
 
@@ -1784,10 +1832,11 @@ msgid "Global Directory"
 msgstr "Annuaire global"
 
 #: ../../mod/directory.php:38 ../../mod/contacts.php:310
+#: ../../mod/contacts.php:315
 msgid "Finding: "
 msgstr "Trouvé: "
 
-#: ../../mod/viewcontacts.php:17 ../../boot.php:2038
+#: ../../mod/viewcontacts.php:17 ../../boot.php:2038 ../../boot.php:2039
 msgid "View Contacts"
 msgstr "Voir les contacts"
 
@@ -1796,11 +1845,12 @@ msgid "No contacts."
 msgstr "Aucun contact."
 
 #: ../../mod/viewcontacts.php:44 ../../mod/contacts.php:371
+#: ../../mod/contacts.php:376
 #, fuzzy
 msgid "Visit $username's profile"
 msgstr "Visiter le profil de %s"
 
-#: ../../mod/profile.php:8 ../../boot.php:2210
+#: ../../mod/profile.php:8 ../../boot.php:2210 ../../boot.php:2211
 msgid "No profile"
 msgstr "Aucun profil"
 
@@ -1995,6 +2045,7 @@ msgid "Disallowed profile URL."
 msgstr "URL de profil interdite."
 
 #: ../../mod/dfrn_request.php:402 ../../mod/contacts.php:85
+#: ../../mod/contacts.php:90
 msgid "Failed to update contact record."
 msgstr "Échec de mise-à-jour du contact."
 
@@ -2008,8 +2059,8 @@ msgstr "Connectez-vous pour confirmer l'introduction."
 
 #: ../../mod/dfrn_request.php:491
 msgid ""
-"Incorrect identity currently logged in. Please login to "
-"<strong>this</strong> profile."
+"Incorrect identity currently logged in. Please login to <strong>this</"
+"strong> profile."
 msgstr ""
 "Identité incorrecte actuellement connectée. Merci de vous connecter à "
 "<strong>ce</strong> profil."
@@ -2281,163 +2332,167 @@ msgstr "Pas d'inscriptions."
 msgid "Invite Friends"
 msgstr "Inviter des amis"
 
-#: ../../mod/contacts.php:16
+#: ../../mod/contacts.php:16 ../../mod/contacts.php:19
 #, fuzzy
 msgid "Connect/Follow"
 msgstr "Connecter/Suivre"
 
-#: ../../mod/contacts.php:17
+#: ../../mod/contacts.php:17 ../../mod/contacts.php:20
 msgid "Example: bob@example.com, http://example.com/barbara"
 msgstr "Exemple: bob@example.com, http://example.com/barbara"
 
-#: ../../mod/contacts.php:18
+#: ../../mod/contacts.php:18 ../../mod/contacts.php:21
 msgid "Follow"
 msgstr "Suivre"
 
 #: ../../mod/contacts.php:38 ../../mod/contacts.php:119
+#: ../../mod/contacts.php:43 ../../mod/contacts.php:124
 msgid "Could not access contact record."
 msgstr "Impossible d'accéder à l'enregistrement du contact."
 
-#: ../../mod/contacts.php:52
+#: ../../mod/contacts.php:52 ../../mod/contacts.php:57
 msgid "Could not locate selected profile."
 msgstr "Impossible de localiser le profil séléctionné."
 
-#: ../../mod/contacts.php:83
+#: ../../mod/contacts.php:83 ../../mod/contacts.php:88
 msgid "Contact updated."
 msgstr "Contact mis-à-jour."
 
-#: ../../mod/contacts.php:141
+#: ../../mod/contacts.php:141 ../../mod/contacts.php:146
 msgid "Contact has been blocked"
 msgstr "Le contact a été bloqué"
 
-#: ../../mod/contacts.php:141
+#: ../../mod/contacts.php:141 ../../mod/contacts.php:146
 msgid "Contact has been unblocked"
 msgstr "Le contact n'est plus bloqué"
 
-#: ../../mod/contacts.php:155
+#: ../../mod/contacts.php:155 ../../mod/contacts.php:160
 #, fuzzy
 msgid "Contact has been ignored"
 msgstr "Le contact a été ignoré"
 
-#: ../../mod/contacts.php:155
+#: ../../mod/contacts.php:155 ../../mod/contacts.php:160
 #, fuzzy
 msgid "Contact has been unignored"
 msgstr "Le contact n'est plus ignoré"
 
-#: ../../mod/contacts.php:176
+#: ../../mod/contacts.php:176 ../../mod/contacts.php:181
 msgid "stopped following"
 msgstr "retiré de la liste de suivi"
 
-#: ../../mod/contacts.php:195
+#: ../../mod/contacts.php:195 ../../mod/contacts.php:200
 msgid "Contact has been removed."
 msgstr "Ce contact a été retiré."
 
 #: ../../mod/contacts.php:223 ../../mod/contacts.php:347
+#: ../../mod/contacts.php:228 ../../mod/contacts.php:352
 msgid "Mutual Friendship"
 msgstr "Relation réciproque"
 
 #: ../../mod/contacts.php:227 ../../mod/contacts.php:351
+#: ../../mod/contacts.php:232 ../../mod/contacts.php:356
 msgid "is a fan of yours"
 msgstr "est un fan de vous"
 
 #: ../../mod/contacts.php:232 ../../mod/contacts.php:355
+#: ../../mod/contacts.php:237 ../../mod/contacts.php:360
 msgid "you are a fan of"
 msgstr "vous êtes un fan de"
 
-#: ../../mod/contacts.php:247
+#: ../../mod/contacts.php:247 ../../mod/contacts.php:252
 #, fuzzy
 msgid "Privacy Unavailable"
 msgstr "Protection de la vie privée indisponible"
 
-#: ../../mod/contacts.php:248
+#: ../../mod/contacts.php:248 ../../mod/contacts.php:253
 #, fuzzy
 msgid "Private communications are not available for this contact."
 msgstr "Les communications privées ne sont pas disponibles pour ce contact."
 
-#: ../../mod/contacts.php:251
+#: ../../mod/contacts.php:251 ../../mod/contacts.php:256
 msgid "Never"
 msgstr "Jamais"
 
-#: ../../mod/contacts.php:255
+#: ../../mod/contacts.php:255 ../../mod/contacts.php:260
 #, fuzzy
 msgid "(Update was successful)"
 msgstr "(Mise à jour effectuée avec succès)"
 
-#: ../../mod/contacts.php:255
+#: ../../mod/contacts.php:255 ../../mod/contacts.php:260
 #, fuzzy
 msgid "(Update was not successful)"
 msgstr "(Mise à jour échouée)"
 
-#: ../../mod/contacts.php:258
+#: ../../mod/contacts.php:258 ../../mod/contacts.php:263
 msgid "Contact Editor"
 msgstr "Éditeur de contact"
 
-#: ../../mod/contacts.php:259
+#: ../../mod/contacts.php:259 ../../mod/contacts.php:264
 msgid "Visit $name's profile"
 msgstr "Visiter le profil de $name"
 
-#: ../../mod/contacts.php:260
+#: ../../mod/contacts.php:260 ../../mod/contacts.php:265
 msgid "Block/Unblock contact"
 msgstr "Bloquer/débloquer ce contact"
 
-#: ../../mod/contacts.php:261
+#: ../../mod/contacts.php:261 ../../mod/contacts.php:266
 msgid "Ignore contact"
 msgstr "Ignorer ce contact"
 
-#: ../../mod/contacts.php:262
+#: ../../mod/contacts.php:262 ../../mod/contacts.php:267
 msgid "Delete contact"
 msgstr "Effacer ce contact"
 
-#: ../../mod/contacts.php:264
+#: ../../mod/contacts.php:264 ../../mod/contacts.php:269
 msgid "Last updated: "
 msgstr "Dernière mise-à-jour: "
 
-#: ../../mod/contacts.php:265
+#: ../../mod/contacts.php:265 ../../mod/contacts.php:270
 msgid "Update public posts: "
 msgstr "Met ses entrées publiques à jour: "
 
-#: ../../mod/contacts.php:267
+#: ../../mod/contacts.php:267 ../../mod/contacts.php:272
 #, fuzzy
 msgid "Update now"
 msgstr "Mettre-à-jour immédiatement"
 
-#: ../../mod/contacts.php:270
+#: ../../mod/contacts.php:270 ../../mod/contacts.php:275
 msgid "Unblock this contact"
 msgstr "Débloquer ce contact"
 
-#: ../../mod/contacts.php:270
+#: ../../mod/contacts.php:270 ../../mod/contacts.php:275
 msgid "Block this contact"
 msgstr "Bloquer ce contact"
 
-#: ../../mod/contacts.php:271
+#: ../../mod/contacts.php:271 ../../mod/contacts.php:276
 msgid "Unignore this contact"
 msgstr "Cesser d'ignorer ce contact"
 
-#: ../../mod/contacts.php:271
+#: ../../mod/contacts.php:271 ../../mod/contacts.php:276
 msgid "Ignore this contact"
 msgstr "Ignorer ce contact"
 
-#: ../../mod/contacts.php:274
+#: ../../mod/contacts.php:274 ../../mod/contacts.php:279
 msgid "Currently blocked"
 msgstr "Actuellement bloqué"
 
-#: ../../mod/contacts.php:275
+#: ../../mod/contacts.php:275 ../../mod/contacts.php:280
 msgid "Currently ignored"
 msgstr "Actuellement ignoré"
 
-#: ../../mod/contacts.php:308
+#: ../../mod/contacts.php:308 ../../mod/contacts.php:313
 msgid "Show Blocked Connections"
 msgstr "Montrer les connexions bloquées"
 
-#: ../../mod/contacts.php:308
+#: ../../mod/contacts.php:308 ../../mod/contacts.php:313
 msgid "Hide Blocked Connections"
 msgstr "Cacher les connexion bloquées"
 
-#: ../../mod/contacts.php:311
+#: ../../mod/contacts.php:311 ../../mod/contacts.php:316
 msgid "Find"
 msgstr "Trouver"
 
-#: ../../mod/contacts.php:372
+#: ../../mod/contacts.php:372 ../../mod/contacts.php:377
 msgid "Edit contact"
 msgstr "Éditer le contact"
 
@@ -2505,187 +2560,187 @@ msgstr "Mot de passe oublié?"
 msgid "Password Reset"
 msgstr "Réinitialiser le mot de passe"
 
-#: ../../boot.php:1077
+#: ../../boot.php:1077 ../../boot.php:1078
 #, fuzzy
 msgid "prev"
 msgstr "précédent"
 
-#: ../../boot.php:1079
+#: ../../boot.php:1079 ../../boot.php:1080
 #, fuzzy
 msgid "first"
 msgstr "premier"
 
-#: ../../boot.php:1108
+#: ../../boot.php:1108 ../../boot.php:1109
 #, fuzzy
 msgid "last"
 msgstr "dernier"
 
-#: ../../boot.php:1111
+#: ../../boot.php:1111 ../../boot.php:1112
 #, fuzzy
 msgid "next"
 msgstr "suivant"
 
-#: ../../boot.php:1837
+#: ../../boot.php:1837 ../../boot.php:1838
 #, fuzzy, php-format
 msgid "%s likes this."
 msgstr "%s aime ça."
 
-#: ../../boot.php:1837
+#: ../../boot.php:1837 ../../boot.php:1838
 #, fuzzy, php-format
 msgid "%s doesn't like this."
 msgstr "%s n'aime pas ça."
 
-#: ../../boot.php:1841
+#: ../../boot.php:1841 ../../boot.php:1842
 #, fuzzy, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgstr "<span  %1$s>%2$d personnes</span> aiment ça."
 
-#: ../../boot.php:1843
+#: ../../boot.php:1843 ../../boot.php:1844
 #, fuzzy, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgstr "<span  %1$s>%2$d personnes</span> ,n'aiment pas ça."
 
-#: ../../boot.php:1849
+#: ../../boot.php:1849 ../../boot.php:1850
 msgid "and"
 msgstr "et"
 
-#: ../../boot.php:1852
+#: ../../boot.php:1852 ../../boot.php:1853
 #, fuzzy, php-format
 msgid ", and %d other people"
 msgstr ", et %d autres personnes"
 
-#: ../../boot.php:1853
+#: ../../boot.php:1853 ../../boot.php:1854
 #, fuzzy, php-format
 msgid "%s like this."
 msgstr "%s aiment ça."
 
-#: ../../boot.php:1853
+#: ../../boot.php:1853 ../../boot.php:1854
 #, fuzzy, php-format
 msgid "%s don't like this."
 msgstr "%s n'aiment pas ça."
 
-#: ../../boot.php:2014
+#: ../../boot.php:2014 ../../boot.php:2015
 msgid "No contacts"
 msgstr "Aucun contact"
 
-#: ../../boot.php:2267
+#: ../../boot.php:2267 ../../boot.php:2268
 msgid "Connect"
 msgstr "Relier"
 
-#: ../../boot.php:2277
+#: ../../boot.php:2277 ../../boot.php:2278
 msgid "Location:"
 msgstr "Localisation:"
 
-#: ../../boot.php:2281
+#: ../../boot.php:2281 ../../boot.php:2282
 msgid ", "
 msgstr ", "
 
-#: ../../boot.php:2289
+#: ../../boot.php:2289 ../../boot.php:2290
 msgid "Gender:"
 msgstr "Genre:"
 
-#: ../../boot.php:2293
+#: ../../boot.php:2293 ../../boot.php:2294
 msgid "Status:"
 msgstr "Statut:"
 
-#: ../../boot.php:2295
+#: ../../boot.php:2295 ../../boot.php:2296
 msgid "Homepage:"
 msgstr "Page personnelle:"
 
-#: ../../boot.php:2386
+#: ../../boot.php:2386 ../../boot.php:2387
 msgid "Monday"
 msgstr "Lundi"
 
-#: ../../boot.php:2386
+#: ../../boot.php:2386 ../../boot.php:2387
 msgid "Tuesday"
 msgstr "Mardi"
 
-#: ../../boot.php:2386
+#: ../../boot.php:2386 ../../boot.php:2387
 msgid "Wednesday"
 msgstr "Mercredi"
 
-#: ../../boot.php:2386
+#: ../../boot.php:2386 ../../boot.php:2387
 msgid "Thursday"
 msgstr "Jeudi"
 
-#: ../../boot.php:2386
+#: ../../boot.php:2386 ../../boot.php:2387
 msgid "Friday"
 msgstr "Vendredi"
 
-#: ../../boot.php:2386
+#: ../../boot.php:2386 ../../boot.php:2387
 msgid "Saturday"
 msgstr "Samedi"
 
-#: ../../boot.php:2386
+#: ../../boot.php:2386 ../../boot.php:2387
 msgid "Sunday"
 msgstr "Dimanche"
 
-#: ../../boot.php:2390
+#: ../../boot.php:2390 ../../boot.php:2391
 msgid "January"
 msgstr "Janvier"
 
-#: ../../boot.php:2390
+#: ../../boot.php:2390 ../../boot.php:2391
 msgid "February"
 msgstr "Février"
 
-#: ../../boot.php:2390
+#: ../../boot.php:2390 ../../boot.php:2391
 msgid "March"
 msgstr "Mars"
 
-#: ../../boot.php:2390
+#: ../../boot.php:2390 ../../boot.php:2391
 msgid "April"
 msgstr "Avril"
 
-#: ../../boot.php:2390
+#: ../../boot.php:2390 ../../boot.php:2391
 msgid "May"
 msgstr "Mai"
 
-#: ../../boot.php:2390
+#: ../../boot.php:2390 ../../boot.php:2391
 msgid "June"
 msgstr "Juin"
 
-#: ../../boot.php:2390
+#: ../../boot.php:2390 ../../boot.php:2391
 msgid "July"
 msgstr "Juillet"
 
-#: ../../boot.php:2390
+#: ../../boot.php:2390 ../../boot.php:2391
 msgid "August"
 msgstr "Août"
 
-#: ../../boot.php:2390
+#: ../../boot.php:2390 ../../boot.php:2391
 msgid "September"
 msgstr "Septembre"
 
-#: ../../boot.php:2390
+#: ../../boot.php:2390 ../../boot.php:2391
 msgid "October"
 msgstr "Octobre"
 
-#: ../../boot.php:2390
+#: ../../boot.php:2390 ../../boot.php:2391
 msgid "November"
 msgstr "Novembre"
 
-#: ../../boot.php:2390
+#: ../../boot.php:2390 ../../boot.php:2391
 msgid "December"
 msgstr "Décembre"
 
-#: ../../boot.php:2424
+#: ../../boot.php:2424 ../../boot.php:2425
 #, fuzzy
 msgid "Birthday Reminders"
 msgstr "Rappels d'anniversaires"
 
-#: ../../boot.php:2425
+#: ../../boot.php:2425 ../../boot.php:2426
 msgid "Birthdays this week:"
 msgstr "Anniversaires cette semaine:"
 
-#: ../../boot.php:2426
+#: ../../boot.php:2426 ../../boot.php:2427
 msgid "(Adjusted for local time)"
 msgstr "(Ajustés pour le fuseau horaire local)"
 
-#: ../../boot.php:2437
+#: ../../boot.php:2437 ../../boot.php:2438
 msgid "[today]"
 msgstr "[aujourd'hui]"
 
-#: ../../boot.php:2634
+#: ../../boot.php:2634 ../../boot.php:2635
 #, fuzzy
 msgid "link to source"
 msgstr "lien original"
@@ -2697,3 +2752,112 @@ msgstr "Non trouvé"
 #: ../../index.php:195
 msgid "Page not found."
 msgstr "Page introuvable."
+
+#: ../../mod/friendika.php:12
+msgid "This is Friendika version"
+msgstr "Motorisé par Friendika version"
+
+#: ../../mod/friendika.php:13
+msgid "running at web location"
+msgstr "hébergé sur"
+
+#: ../../mod/friendika.php:15
+msgid ""
+"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>"
+msgstr ""
+"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>"
+
+#: ../../mod/friendika.php:17
+msgid ""
+"Please visit <a href=\"http://project.friendika.com\">Project.Friendika.com</"
+"a> to learn more about the Friendika project."
+msgstr "Pour en savoir plus, vous pouvez nous rendre visite sur <a href="
+"\"http://project.friendika.com\">Project.Friendika.com</a>"
+
+#: ../../mod/friendika.php:19
+msgid "Bug reports and issues: please visit"
+msgstr "Pour les rapports de bugs: rendez vous sur"
+
+#: ../../mod/friendika.php:20
+msgid ""
+"Suggestions, praise, donations, etc. - please email \"Info\" at Friendika - "
+"dot com"
+msgstr ""
+"Suggestions, remerciements, donations, etc. - écrivez à \"Info\" arob. Friendika - "
+"point com"
+
+#: ../../mod/friendika.php:25
+msgid "Installed plugins/addons/apps"
+msgstr "Extensions/greffons/applications installées"
+
+#: ../../mod/friendika.php:33
+msgid "No installed plugins/addons/apps"
+msgstr "Aucune extension/greffon/application installée"
+
+#: ../../mod/match.php:10
+msgid "Profile Match"
+msgstr "Correpondance de profils"
+
+#: ../../mod/match.php:50
+msgid "No matches"
+msgstr "Aucune correspondance"
+
+#: ../../mod/network.php:363
+msgid "See more posts like this"
+msgstr "Davantage de publications similaires"
+
+#: ../../mod/network.php:382 ../../mod/profile.php:357
+#, php-format
+msgid "See all %d comments"
+msgstr "Voir les %d commentaires"
+
+#: ../../mod/install.php:72
+msgid "Proceed with Installation"
+msgstr "Commencer l'installation"
+
+#: ../../mod/install.php:74
+msgid "Your Friendika site database has been installed."
+msgstr "La base de données de votre site Friendika a été installée."
+
+#: ../../mod/install.php:78
+msgid "Proceed to registration"
+msgstr "Commencer l'inscription"
+
+#: ../../mod/settings.php:345
+msgid "Export Personal Data"
+msgstr "Exporter les données personnelles"
+
+#: ../../mod/directory.php:92
+msgid "Gender: "
+msgstr "Genre: "
+
+#: ../../mod/directory.php:118
+msgid "No entries (some entries may be hidden)."
+msgstr "Aucune entrée (certaines peuvent être cachées)."
+
+#: ../../mod/profile.php:102
+msgid "Status"
+msgstr "Statut"
+
+#: ../../mod/profile.php:103
+msgid "Profile"
+msgstr "Profil"
+
+#: ../../mod/profile.php:104
+msgid "Photos"
+msgstr "Photos"
+
+#: ../../mod/contacts.php:15
+msgid "Find People With Shared Interests"
+msgstr "Trouver des gens d'intérêts communs"
+
+#: ../../boot.php:2023
+#, php-format
+msgid "%d Contact"
+msgid_plural "%d Contacts"
+msgstr[0] "%d contact"
+msgstr[1] "%d contacts"

diff --git a/view/fr/pagetypes.tpl b/view/fr/pagetypes.tpl
index 92b7bbce52fe420b43833dbac6a4328244d81b31..c655d353fb79597a53c9fa3e50616488bcf28281 100644 (file)
--- a/view/fr/pagetypes.tpl
+++ b/view/fr/pagetypes.tpl
@@ -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>

diff --git a/view/fr/passchanged_eml.tpl b/view/fr/passchanged_eml.tpl
index 9692159e1851bcf9c9855297332f91c523284e0f..c1881b13e62f576c9373c9aec2a12187e311c797 100644 (file)
--- a/view/fr/passchanged_eml.tpl
+++ b/view/fr/passchanged_eml.tpl
@@ -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).
+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:
 
-Your login details are as follows:
+Site:                  $siteurl
+Pseudo/Courriel:       $email
+Mot de passe:          $new_password
 
-Site Location: $siteurl
-Login Name:    $email
-Password:      $new_password
+Vous pouvez changer ce mot de passe depuis la page des réglages de votre compte, 
+après connexion
 
-You may change that password from your account settings page after logging in.
-
-
-Sincerely,
-       $sitename Administrator
+Sincèrement votre,
+       l'administrateur de $sitename
 
  

diff --git a/view/fr/profile-hide-friends.tpl b/view/fr/profile-hide-friends.tpl
index 54ade00fec6c46fb28a42e6753f15b4ac8c6e02e..857e049bb54a3e65cb43704660645db58e5e60cf 100644 (file)
--- a/view/fr/profile-hide-friends.tpl
+++ b/view/fr/profile-hide-friends.tpl
@@ -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>

diff --git a/view/fr/profile-in-directory.tpl b/view/fr/profile-in-directory.tpl
index 98af3e59a9eb0f588719deb05fd651c79fe224a4..1189e3f9f5a116781e858a31ec8eca40d5afbf74 100644 (file)
--- a/view/fr/profile-in-directory.tpl
+++ b/view/fr/profile-in-directory.tpl
@@ -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>

diff --git a/view/fr/profile-in-netdir.tpl b/view/fr/profile-in-netdir.tpl
index be111aa67f80d924b8031c65223054bd96ef1e84..9b94f302a9d9ca0ef6527f92c6bd667618a22870 100644 (file)
--- a/view/fr/profile-in-netdir.tpl
+++ b/view/fr/profile-in-netdir.tpl
@@ -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>

diff --git a/view/fr/profile.php b/view/fr/profile.php
index fa7372668cf76e8f2166b7e1723be16686754121..9c5d6dce6dfbeccee20388ba2067eebee6393d90 100644 (file)
--- a/view/fr/profile.php
+++ b/view/fr/profile.php
@@ -32,7 +32,7 @@
                || (strlen($profile['region'])) \r
                || (strlen($profile['postal-code'])) \r
                || (strlen($profile['country-name']))) { ?>\r
-               <div class="location">Location:\r
+               <div class="location">Localisation:\r
                        <div class="adr">\r
                                <div class="street-address"><?php if(strlen($profile['address'])) echo $profile['address']; ?></div>\r
                                <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>\r
@@ -43,7 +43,7 @@
        <?php } ?>\r
 \r
        <?php if(strlen($profile['gender'])) { ?>\r
-               <div class="mf">Gender: <span class="x-gender"><?php echo $profile['gender']; ?></span></div>\r
+               <div class="mf">Genre: <span class="x-gender"><?php echo $profile['gender']; ?></span></div>\r
 \r
        <?php } ?>\r
 \r

diff --git a/view/fr/profile_entry_default.tpl b/view/fr/profile_entry_default.tpl
index 6511999184ba6aec4352a57d5b5b662ca22c48c8..b7f94b0b072d37997652fee015c4c79f37f0b1fb 100644 (file)
--- a/view/fr/profile_entry_default.tpl
+++ b/view/fr/profile_entry_default.tpl
@@ -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>

diff --git a/view/fr/profile_photo.tpl b/view/fr/profile_photo.tpl
index 30e51210a8ff4aae71caf512c538b667f7a70f8f..e506b206639c48e07d556e051dbf8c6652da4ec6 100644 (file)
--- a/view/fr/profile_photo.tpl
+++ b/view/fr/profile_photo.tpl
@@ -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>
-</div>
\ No newline at end of file
+ou <a href='photos/$user'>choisissez une photo dans vos albums</a>
+</div>

diff --git a/view/fr/pwdreset.tpl b/view/fr/pwdreset.tpl
index dd609f0610758f71bdcc28d1b694d7fbe97b0048..502d0d447411131abda5af27c08e72dd4dfd3952 100644 (file)
--- a/view/fr/pwdreset.tpl
+++ b/view/fr/pwdreset.tpl
@@ -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.
\ No newline at end of file
+Votre mot de passe pourra être changé, après connexion, dans la page 'Réglages'.
+

diff --git a/view/fr/register_open_eml.tpl b/view/fr/register_open_eml.tpl
index 8a00f21e972ba386778275ede91e56176fcbdf17..d61a5996df022394ffb55bd0996afd9c9e24a40e 100644 (file)
--- a/view/fr/register_open_eml.tpl
+++ b/view/fr/register_open_eml.tpl
@@ -1,21 +1,21 @@
 
-Dear $username,
-       Thank you for registering at $sitename. Your account has been created. 
-The login details are as follows:
+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
 
-Site Location: $siteurl
-Login Name:    $email
-Password:      $password
+Vous pouvez changer de mot de passe dans la page des "Réglages" de votre compte,
+après connexion.
 
-You may change your password from your account "Settings" page after logging 
-in.
+Merci de prendre quelques minutes pour découvrir les autres réglages disponibles
+sur cette page.
 
-Please take a few moments to review the other account settings on that page. 
+Merci, et bienvenue sur $sitename.
 
-Thank you and welcome to $sitename.
-
-Sincerely,
-       $sitename Administrator
+Sincèrement votre,
+       l'administrateur de $sitename
 
  

diff --git a/view/fr/register_verify_eml.tpl b/view/fr/register_verify_eml.tpl
index 60c38d8000257b35dbec297cfd0b179d605c8433..54362ce1826ab15ace1df8e1ee4f96a081921b33 100644 (file)
--- a/view/fr/register_verify_eml.tpl
+++ b/view/fr/register_verify_eml.tpl
@@ -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 
+$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.
 

diff --git a/view/fr/registrations-top.tpl b/view/fr/registrations-top.tpl
index d8faf3439e27b6db7d8f468971105b22ef8097ff..3988f78220f02da3acf6344b108152ae25bbd84b 100644 (file)
--- a/view/fr/registrations-top.tpl
+++ b/view/fr/registrations-top.tpl
@@ -1,3 +1,3 @@
-<h1>User registrations waiting for confirm</h1>
+<h1>Inscriptions d'utilisateurs en attente de confirmation</h1>
 
 

diff --git a/view/fr/request_notify_eml.tpl b/view/fr/request_notify_eml.tpl
index 9eef7a61ebfff215d4f1d1ecffbc74022943816d..afbb2ab7ea5e530b7228c3cd302095d9ddcec490 100644 (file)
--- a/view/fr/request_notify_eml.tpl
+++ b/view/fr/request_notify_eml.tpl
@@ -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
\ No newline at end of file
+       l'administrateur de $sitename

diff --git a/view/fr/settings.tpl b/view/fr/settings.tpl
index 9846219ed7ea80b66d8cc8db652fc76b5a77e4c4..fc9b6d65b1ce140e34b51a774581094fdd749726 100644 (file)
--- a/view/fr/settings.tpl
+++ b/view/fr/settings.tpl
@@ -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>
 
 

diff --git a/view/fr/settings_nick_set.tpl b/view/fr/settings_nick_set.tpl
index a36b3b9a20dab0c780daa5b25f94e8e23347f61d..761b089f1f6edfafa2e8fa5a9d026209c75a856a 100644 (file)
--- a/view/fr/settings_nick_set.tpl
+++ b/view/fr/settings_nick_set.tpl
@@ -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
 

diff --git a/view/fr/settings_nick_subdir.tpl b/view/fr/settings_nick_subdir.tpl
index 303c24df71def64cc83a114faaa9b74014701296..2a367f8dadca623db318b92d31e5f20ffd8e1664 100644 (file)
--- a/view/fr/settings_nick_subdir.tpl
+++ b/view/fr/settings_nick_subdir.tpl
@@ -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>Si vous avez le moindre problème, essayez d'utiliser l'adresse <br />
+de profil suivante : '<strong>$baseurl/profile/$nickname</strong>'.
 </p>
-<p>If you have any issues, you may have better results using the profile<br /> address '<strong>$baseurl/profile/$nickname</strong>'.
-</p>
\ No newline at end of file

diff --git a/view/fr/settings_nick_unset.tpl b/view/fr/settings_nick_unset.tpl
index 903768b5943680443f4907d94a3f010d9d6e58ba..60c7a4a45d04015be81c07b62e4c3375ce2c0c6a 100644 (file)
--- a/view/fr/settings_nick_unset.tpl
+++ b/view/fr/settings_nick_unset.tpl
@@ -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>

diff --git a/view/fr/strings.php b/view/fr/strings.php
index 564b9065d87750a7d3e493c7ec3f8f30e12ee08e..33aa01b5357903add65fadcf2b75c11c4b39ef24 100644 (file)
--- a/view/fr/strings.php
+++ b/view/fr/strings.php
@@ -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",
+);

diff --git a/view/fr/wall_received_eml.tpl b/view/fr/wall_received_eml.tpl
index c296de78516da3de2b0486f54988a2d77fff1e36..adfb91dd81f2e0fcb11eb360fe407e47e19c77c8 100644 (file)
--- a/view/fr/wall_received_eml.tpl
+++ b/view/fr/wall_received_eml.tpl
@@ -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
 
  
 

diff --git a/view/it/settings.tpl b/view/it/settings.tpl
index 6679e28fe35b61a57f5b8dcd7e1bbb2627e05562..abaee5b9d86d43bf0953edea0d4f6ee1ac2b1b7f 100644 (file)
--- a/view/it/settings.tpl
+++ b/view/it/settings.tpl
@@ -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>

diff --git a/view/sv/settings.tpl b/view/sv/settings.tpl
index a1fff52eb40107849263a2a078a69e6b3ae2cc26..5c776c3a352803765192e373d098f30d10f78d73 100644 (file)
--- a/view/sv/settings.tpl
+++ b/view/sv/settings.tpl
@@ -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>