From 19d7e7fefeb3d20697d6a7e0b1fc7a16d9127c64 Mon Sep 17 00:00:00 2001 From: Olivier Migeot Date: Tue, 22 Mar 2011 10:28:22 +0100 Subject: [PATCH 01/10] Defined plurals (as explained by Fabio) --- view/fr/messages.po | 2 +- view/fr/strings.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/view/fr/messages.po b/view/fr/messages.po index 6759f311b..04364193f 100644 --- a/view/fr/messages.po +++ b/view/fr/messages.po @@ -16,7 +16,7 @@ msgstr "" "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" +"Plural-Forms: nplurals=2; plural=(n!=0);\n" "X-Language: fr_FR\n" #: ../../include/auth.php:27 diff --git a/view/fr/strings.php b/view/fr/strings.php index 564b9065d..05fdd8b47 100644 --- a/view/fr/strings.php +++ b/view/fr/strings.php @@ -1,7 +1,7 @@ strings["Logged out."] = "Déconnecté."; From c8fb1008f5ec4fc9c886e362e76cf4005375bca0 Mon Sep 17 00:00:00 2001 From: Olivier Migeot Date: Mon, 28 Mar 2011 13:50:56 +0200 Subject: [PATCH 02/10] Some more templates translated to french. --- view/fr/install_db.tpl | 14 +++++++------- view/fr/intro_complete_eml.tpl | 26 +++++++++++++------------- view/fr/intros-top.tpl | 2 +- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/view/fr/install_db.tpl b/view/fr/install_db.tpl index c413689c2..b6aea3e49 100644 --- a/view/fr/install_db.tpl +++ b/view/fr/install_db.tpl @@ -1,33 +1,33 @@ -

Friendika Social Network

+

Réseau Social Friendika

Installation

-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.

- +
- +
- +
- +
-Please select a default timezone for your website +Merci de choisir un fuseau horaire par défaut
$tzselect diff --git a/view/fr/intro_complete_eml.tpl b/view/fr/intro_complete_eml.tpl index a60745ec5..b8a7a3457 100644 --- 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 d8b7394a4..85dd628b6 100644 --- a/view/fr/intros-top.tpl +++ b/view/fr/intros-top.tpl @@ -1,4 +1,4 @@ -

Pending Friend/Connect Notifications

+

Demandes d'amitié/mise en relation en attente

$hide_text From 10d44f2bb9780b2dca46d64dec3b5f91aec1318e Mon Sep 17 00:00:00 2001 From: Olivier Migeot Date: Mon, 28 Mar 2011 13:59:05 +0200 Subject: [PATCH 03/10] More french templates (except emails, everything should be ok now) --- view/fr/pagetypes.tpl | 8 ++++---- view/fr/profile-hide-friends.tpl | 6 +++--- view/fr/profile-in-directory.tpl | 6 +++--- view/fr/profile-in-netdir.tpl | 6 +++--- view/fr/profile.php | 4 ++-- view/fr/profile_entry_default.tpl | 2 +- view/fr/profile_photo.tpl | 10 +++++----- view/fr/registrations-top.tpl | 2 +- view/fr/wall_received_eml.tpl | 10 +++++----- 9 files changed, 27 insertions(+), 27 deletions(-) diff --git a/view/fr/pagetypes.tpl b/view/fr/pagetypes.tpl index 92b7bbce5..c655d353f 100644 --- a/view/fr/pagetypes.tpl +++ b/view/fr/pagetypes.tpl @@ -1,24 +1,24 @@
- + Ce compte est un profil personnel normal
- + Approbation automatique de toutes les requêtes de connexion comme étant des fans en lecture seule
- + Approbation automatique de toutes les requêtes de connexion comme étant des fans en lecture-écriture
- + Approbation automatique de toutes les requêtes de connexion comme étant des amis
diff --git a/view/fr/profile-hide-friends.tpl b/view/fr/profile-hide-friends.tpl index 54ade00fe..857e049bb 100644 --- a/view/fr/profile-hide-friends.tpl +++ b/view/fr/profile-hide-friends.tpl @@ -1,15 +1,15 @@

-Hide my contact/friend list from viewers of this profile? +Cacher ma liste de contacts/amis des visiteurs de ce profil?

- +
- +
diff --git a/view/fr/profile-in-directory.tpl b/view/fr/profile-in-directory.tpl index 98af3e59a..1189e3f9f 100644 --- a/view/fr/profile-in-directory.tpl +++ b/view/fr/profile-in-directory.tpl @@ -1,15 +1,15 @@

-Publish your default profile in site directory? +Publier votre profil par défaut dans l'annuaire local?

- +
- +
diff --git a/view/fr/profile-in-netdir.tpl b/view/fr/profile-in-netdir.tpl index be111aa67..9b94f302a 100644 --- a/view/fr/profile-in-netdir.tpl +++ b/view/fr/profile-in-netdir.tpl @@ -1,15 +1,15 @@

-Publish your default profile in global social directory? +Publier votre profil par défaut dans l'annuaire global?

- +
- +
diff --git a/view/fr/profile.php b/view/fr/profile.php index fa7372668..9c5d6dce6 100644 --- a/view/fr/profile.php +++ b/view/fr/profile.php @@ -32,7 +32,7 @@ || (strlen($profile['region'])) || (strlen($profile['postal-code'])) || (strlen($profile['country-name']))) { ?> -
Location: +
Localisation:
@@ -43,7 +43,7 @@ -
Gender:
+
Genre:
diff --git a/view/fr/profile_entry_default.tpl b/view/fr/profile_entry_default.tpl index 651199918..b7f94b0b0 100644 --- a/view/fr/profile_entry_default.tpl +++ b/view/fr/profile_entry_default.tpl @@ -1,7 +1,7 @@
-Profile Image +Image du profil
diff --git a/view/fr/profile_photo.tpl b/view/fr/profile_photo.tpl index 30e51210a..e506b2066 100644 --- a/view/fr/profile_photo.tpl +++ b/view/fr/profile_photo.tpl @@ -1,18 +1,18 @@ -

Upload Profile Photo

+

Téléverser une photo de profil

- +
- +
\ No newline at end of file +ou choisissez une photo dans vos albums +
diff --git a/view/fr/registrations-top.tpl b/view/fr/registrations-top.tpl index d8faf3439..3988f7822 100644 --- a/view/fr/registrations-top.tpl +++ b/view/fr/registrations-top.tpl @@ -1,3 +1,3 @@ -

User registrations waiting for confirm

+

Inscriptions d'utilisateurs en attente de confirmation

diff --git a/view/fr/wall_received_eml.tpl b/view/fr/wall_received_eml.tpl index c296de785..adfb91dd8 100644 --- 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 From 581349de59091ee2aa55398dd3b03b1d6f808af7 Mon Sep 17 00:00:00 2001 From: Olivier Migeot Date: Mon, 28 Mar 2011 14:31:57 +0200 Subject: [PATCH 04/10] Some more templates for french translation --- view/fr/lostpass.tpl | 8 ++++---- view/fr/lostpass_eml.tpl | 35 +++++++++++++++++----------------- view/fr/passchanged_eml.tpl | 25 ++++++++++++------------ view/fr/request_notify_eml.tpl | 16 ++++++++-------- 4 files changed, 42 insertions(+), 42 deletions(-) diff --git a/view/fr/lostpass.tpl b/view/fr/lostpass.tpl index a7040c149..245b02484 100644 --- a/view/fr/lostpass.tpl +++ b/view/fr/lostpass.tpl @@ -1,17 +1,17 @@ -

Forgot your Password?

+

Mot de passe oublié?

-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.

- +
- +
diff --git a/view/fr/lostpass_eml.tpl b/view/fr/lostpass_eml.tpl index c350236a4..168e9a5e2 100644 --- 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/passchanged_eml.tpl b/view/fr/passchanged_eml.tpl index 9692159e1..c1881b13e 100644 --- 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/request_notify_eml.tpl b/view/fr/request_notify_eml.tpl index 9eef7a61e..afbb2ab7e 100644 --- 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 From 3b709a074a373a42b1bf16d631cf34918ef9f83f Mon Sep 17 00:00:00 2001 From: Olivier Migeot Date: Mon, 28 Mar 2011 19:59:16 +0200 Subject: [PATCH 05/10] French translation considered done, yet not fully tested. --- view/fr/messages.po | 536 ++++++++++++++++++++----------- view/fr/pwdreset.tpl | 12 +- view/fr/register_open_eml.tpl | 26 +- view/fr/register_verify_eml.tpl | 21 +- view/fr/settings.tpl | 62 ++-- view/fr/settings_nick_set.tpl | 2 +- view/fr/settings_nick_subdir.tpl | 9 +- view/fr/settings_nick_unset.tpl | 8 +- view/fr/strings.php | 28 +- 9 files changed, 449 insertions(+), 255 deletions(-) diff --git a/view/fr/messages.po b/view/fr/messages.po index 04364193f..81cc8b9fc 100644 --- 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 \n" +"Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n!=0);\n" -"X-Language: fr_FR\n" +"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\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 public 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 publics seront postés sur StatusNet." @@ -884,7 +891,7 @@ msgstr "" "Ceci est votre profil public.
Il peut " "ê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 Creative Commons " -"Attribution 3.0 license." +"Shared content is covered by the Creative Commons Attribution 3.0 license." msgstr "" -"Le contenu est partagé suivant les termes de la licence Creative Commons " -"Attribution 3.0." +"Le contenu est partagé suivant les termes de la licence Creative Commons Attribution 3.0." -#: ../../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 " -"'nickname@$sitename'." +"profile address on this site will then be 'nickname@$sitename'." msgstr "" "Choisissez un pseudo. Celui devra commencer par une lettre. L'adresse de " "votre profil en découlera sous la forme 'pseudo@$sitename'." -#: ../../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 " (Optional) Allow this OpenID to login to this account." msgstr " (Facultatif) Autoriser cet OpenID à se connecter à ce compte." -#: ../../mod/settings.php:301 +#: ../../mod/settings.php:301 ../../mod/settings.php:302 msgid "Profile is not published." msgstr "Ce profil n'est pas publié." -#: ../../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 " -"this profile." +"Incorrect identity currently logged in. Please login to this profile." msgstr "" "Identité incorrecte actuellement connectée. Merci de vous connecter à " "ce 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 "%2$d people like this." msgstr "%2$d personnes aiment ça." -#: ../../boot.php:1843 +#: ../../boot.php:1843 ../../boot.php:1844 #, fuzzy, php-format msgid "%2$d people don't like this." msgstr "%2$d personnes ,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 Creative Commons Attribution " +"3.0 license" +msgstr "" +"Les contenus partagés au sein du réseau Friendika le sont sous la licence Creative Commons Attribution " +"3.0" + +#: ../../mod/friendika.php:17 +msgid "" +"Please visit Project.Friendika.com to learn more about the Friendika project." +msgstr "Pour en savoir plus, vous pouvez nous rendre visite sur Project.Friendika.com" + +#: ../../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/pwdreset.tpl b/view/fr/pwdreset.tpl index dd609f061..502d0d447 100644 --- a/view/fr/pwdreset.tpl +++ b/view/fr/pwdreset.tpl @@ -1,16 +1,18 @@ -

Password Reset

+

Mot de passe réinitialisé

-Your password has been reset as requested. +Votre mot de passe a été changé, comme demandé.

-Your new password is +Votre nouveau mot de passe est

$newpass

-Save or copy your new password - and then click here to login. +Sauvez ou copiez ce nouveau mot de passe - puis connectez-vous. +

-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 8a00f21e9..d61a5996d 100644 --- 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 60c38d800..54362ce18 100644 --- 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/settings.tpl b/view/fr/settings.tpl index 9846219ed..fc9b6d65b 100644 --- a/view/fr/settings.tpl +++ b/view/fr/settings.tpl @@ -1,6 +1,6 @@ -

Account Settings

+

Réglages du compte

- + $uexport @@ -10,16 +10,16 @@ $nickname_block
-

Basic Settings

+

Réglages basiques

- +
- +
@@ -27,19 +27,19 @@ $nickname_block
- + $zoneselect
- +
- +
@@ -48,25 +48,25 @@ $zoneselect
- + $theme
- +
-

Security and Privacy Settings

+

Sécurité et vie privée

- + -
(to prevent spam abuse)
+
(pour limiter le spam)
@@ -92,63 +92,63 @@ $profile_in_net_dir
- +
-
Automatically expire (delete) posts older than days
+
Faire automatiquement expirer (supprimer) les publications de plus de jours
- +
-

Notification Settings

+

Notifications

-
Send a notification email when:
- +
Envoyer un courriel d'alerte quand:
+
- +
- +
- +
- +
- +
-

Password Settings

+

Mot de passe

-Leave password fields blank unless changing +Laissez le champ vide, sauf si vous souhaitez le changer

- +
- +
@@ -160,16 +160,16 @@ Leave password fields blank unless changing
- +
-

Advanced Page Settings

+

Réglages avancés

$pagetype
- +
diff --git a/view/fr/settings_nick_set.tpl b/view/fr/settings_nick_set.tpl index a36b3b9a2..761b089f1 100644 --- a/view/fr/settings_nick_set.tpl +++ b/view/fr/settings_nick_set.tpl @@ -1,7 +1,7 @@

-Your profile address is '$nickname@$basepath' +L'adresse de votre profil est '$nickname@$basepath'

$subdir diff --git a/view/fr/settings_nick_subdir.tpl b/view/fr/settings_nick_subdir.tpl index 303c24df7..2a367f8da 100644 --- a/view/fr/settings_nick_subdir.tpl +++ b/view/fr/settings_nick_subdir.tpl @@ -1,6 +1,7 @@

-It appears that your website is located in a subdirectory of the
-$hostname website, so this setting may not work reliably.
+Il semble que votre site soit situé dans un sous-répertoire du
+site $hostname, ce réglage pourrait donc ne pas marcher comme prévu.
+

+

Si vous avez le moindre problème, essayez d'utiliser l'adresse
+de profil suivante : '$baseurl/profile/$nickname'.

-

If you have any issues, you may have better results using the profile
address '$baseurl/profile/$nickname'. -

\ No newline at end of file diff --git a/view/fr/settings_nick_unset.tpl b/view/fr/settings_nick_unset.tpl index 903768b59..60c7a4a45 100644 --- a/view/fr/settings_nick_unset.tpl +++ b/view/fr/settings_nick_unset.tpl @@ -1,13 +1,13 @@

-Your profile URL is currently '$baseurl/profile/$uid'. -Setting a nickname will allow a friendly profile URL such as +Votre adresse (URL) de profil est actuellement '$baseurl/profile/$uid'. +Choisir un pseudo vous donnera une URL plus simple à retenir, comme 'nickname@$basepath'.
-Once set, it can never be changed. The nickname must start with a letter; and only letters, numbers, dashes, and underscores are allowed. +Une fois défini, il ne pourra plus changer. Le pseudo doit débuter par une lettre; et seuls lettres, nombres, tirets et sous-tirets (_) sont autorisés.

- +
diff --git a/view/fr/strings.php b/view/fr/strings.php index 05fdd8b47..33aa01b53 100644 --- a/view/fr/strings.php +++ b/view/fr/strings.php @@ -1,7 +1,7 @@ strings["Logged out."] = "Déconnecté."; @@ -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 Creative Commons Attribution 3.0 license"] = "Les contenus partagés au sein du réseau Friendika le sont sous la licence Creative Commons Attribution 3.0"; +$a->strings["Please visit Project.Friendika.com to learn more about the Friendika project."] = "Pour en savoir plus, vous pouvez nous rendre visite sur Project.Friendika.com"; +$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", +); From 15b6792ca08fc09f62afc490da98a0f753bfab1c Mon Sep 17 00:00:00 2001 From: Friendika Date: Mon, 28 Mar 2011 15:41:08 -0700 Subject: [PATCH 06/10] revup --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot.php b/boot.php index ba9e2b6e4..f12ec0d8d 100644 --- 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 ); From 0f8bcacfdd6e724800e3fe2f0cf4ec300a6c289b Mon Sep 17 00:00:00 2001 From: Friendika Date: Mon, 28 Mar 2011 16:10:12 -0700 Subject: [PATCH 07/10] util/README updated --- util/README | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/util/README b/util/README index cb2fd9b55..a6f7e59a6 100644 --- 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//messages.po 3. open view//messages.po with a text editor and fill in infos in "Last-Translator: FULL NAME " From 00b5f6f8a1bdc004380fd75dd5e6dc52117dd6d7 Mon Sep 17 00:00:00 2001 From: Friendika Date: Mon, 28 Mar 2011 17:24:11 -0700 Subject: [PATCH 08/10] added comments, make typo checker work with redefined plural string functions --- mod/network.php | 43 +++++++++++++++++++++++++++++++++++++++++-- util/typo.php | 8 +++++++- util/typohelper.php | 11 +++++++++++ 3 files changed, 59 insertions(+), 3 deletions(-) create mode 100644 util/typohelper.php diff --git a/mod/network.php b/mod/network.php index 17d36dfb2..8e8fe8d1e 100644 --- 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 ++; @@ -388,6 +422,8 @@ function network_content(&$a, $update = 0) { $o .= '
'; } + + $redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ; $lock = ((($item['private']) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) @@ -546,6 +582,9 @@ function network_content(&$a, $update = 0) { } if(! $update) { + + // if author collapsing is in force but didn't get closed, close it off now. + if($blowhard_count > 3) $o .= '
'; diff --git a/util/typo.php b/util/typo.php index 84a50e15e..e20cce86a 100644 --- 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 index 000000000..589702a02 --- /dev/null +++ b/util/typohelper.php @@ -0,0 +1,11 @@ + Date: Mon, 28 Mar 2011 18:06:36 -0700 Subject: [PATCH 09/10] small wording change --- view/de/settings.tpl | 2 +- view/en/settings.tpl | 2 +- view/it/settings.tpl | 2 +- view/sv/settings.tpl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/view/de/settings.tpl b/view/de/settings.tpl index 170939991..1924fc8e1 100644 --- a/view/de/settings.tpl +++ b/view/de/settings.tpl @@ -92,7 +92,7 @@ $profile_in_net_dir
- +
diff --git a/view/en/settings.tpl b/view/en/settings.tpl index 134fffaf9..9822291c1 100644 --- a/view/en/settings.tpl +++ b/view/en/settings.tpl @@ -91,7 +91,7 @@ $profile_in_net_dir
- +
diff --git a/view/it/settings.tpl b/view/it/settings.tpl index 6679e28fe..abaee5b9d 100644 --- a/view/it/settings.tpl +++ b/view/it/settings.tpl @@ -92,7 +92,7 @@ $profile_in_net_dir
- +
diff --git a/view/sv/settings.tpl b/view/sv/settings.tpl index a1fff52eb..5c776c3a3 100644 --- a/view/sv/settings.tpl +++ b/view/sv/settings.tpl @@ -92,7 +92,7 @@ $profile_in_net_dir
- +
From 920396e4024e56c3e00f1f159268c2aba16e4609 Mon Sep 17 00:00:00 2001 From: Friendika Date: Mon, 28 Mar 2011 20:06:45 -0700 Subject: [PATCH 10/10] off by one --- mod/network.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mod/network.php b/mod/network.php index 8e8fe8d1e..2ff15a29b 100644 --- a/mod/network.php +++ b/mod/network.php @@ -399,7 +399,7 @@ function network_content(&$a, $update = 0) { } else { $blowhard = $item['cid']; - if($blowhard_count > 3) + if($blowhard_count >= 3) $o .= '
'; $blowhard_count = 0; } @@ -585,7 +585,7 @@ function network_content(&$a, $update = 0) { // if author collapsing is in force but didn't get closed, close it off now. - if($blowhard_count > 3) + if($blowhard_count >= 3) $o .= '
';