Merge branch 'omigeot-master'

This commit is contained in:
Friendika 2011-03-21 15:09:13 -07:00
commit 64e92f34d9
5 changed files with 3344 additions and 1109 deletions

2699
view/fr/messages.po Normal file

File diff suppressed because it is too large Load diff

View file

@ -2,24 +2,24 @@
<div id="settings-normal-wrapper">
<label id="settings-normal-label" for="settings-normal">Normal Profile</label>
<input type="radio" name="page-flags" id="settings-normal" $normal_selected value="$page_normal" />
<span id="settings-normal-desc">This account is a normal personal profile</span>
<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>
<input type="radio" name="page-flags" id="settings-soapbox" $soapbox_selected value="$page_soapbox" />
<span id="settings-soapbox-desc">Automatically approve all connection/friend requests as read-only fans</span>
<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>
<input type="radio" name="page-flags" id="settings-community" $community_selected value="$page_community" />
<span id="settings-community-desc">Automatically approve all connection/friend requests as read-write fans</span>
<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>
<input type="radio" name="page-flags" id="settings-freelove" $freelove_selected value="$page_freelove" />
<span id="settings-freelove-desc">Automatically approve all connection/friend requests as friends</span>
<span id="settings-freelove-desc">Approbation automatique de toutes les requêtes de connexion comme étant des amis</span>
</div>
<div id="settings-freelove-break" ></div>

View file

@ -4,7 +4,7 @@ $o .= '';
$o .= <<< EOT
<h2>Profile</h2>
<h2>Profil</h2>
EOT;
@ -12,7 +12,7 @@ EOT;
if($a->profile['name']) {
$o .= <<< EOT
<div id="advanced-profile-name-wrapper" >
<div id="advanced-profile-name-text">Full Name:</div>
<div id="advanced-profile-name-text">Nom complet:</div>
<div id="advanced-profile-name">{$a->profile['name']}</div>
</div>
<div id="advanced-profile-name-end"></div>
@ -22,7 +22,7 @@ EOT;
if($a->profile['gender']) {
$o .= <<< EOT
<div id="advanced-profile-gender-wrapper" >
<div id="advanced-profile-gender-text">Gender:</div>
<div id="advanced-profile-gender-text">Genre:</div>
<div id="advanced-profile-gender">{$a->profile['gender']}</div>
</div>
<div id="advanced-profile-gender-end"></div>
@ -32,14 +32,14 @@ EOT;
if(($a->profile['dob']) && ($a->profile['dob'] != '0000-00-00')) {
$o .= <<< EOT
<div id="advanced-profile-dob-wrapper" >
<div id="advanced-profile-dob-text">Birthday:</div>
<div id="advanced-profile-dob-text">Date de naissance/anniversaire:</div>
EOT;
// If no year, add an arbitrary one so just we can parse the month and day.
$o .= '<div id="advanced-profile-dob">'
. ((intval($a->profile['dob']))
? day_translate(datetime_convert('UTC','UTC',$a->profile['dob'],'j F, Y'))
? day_translate(datetime_convert('UTC','UTC',$a->profile['dob'],'j F Y'))
: day_translate(datetime_convert('UTC','UTC','2001-' . substr($a->profile['dob'],6),'j F')))
. "</div>\r\n</div>";
@ -60,7 +60,7 @@ EOT;
if($a->profile['marital']) {
$o .= <<< EOT
<div id="advanced-profile-marital-wrapper" >
<div id="advanced-profile-marital-text"><span class="heart">&hearts;</span> Status:</div>
<div id="advanced-profile-marital-text"><span class="heart">&hearts;</span> Statut:</div>
<div id="advanced-profile-marital">{$a->profile['marital']}</div>
EOT;
@ -75,7 +75,7 @@ EOT;
if($a->profile['sexual']) {
$o .= <<< EOT
<div id="advanced-profile-sexual-wrapper" >
<div id="advanced-profile-sexual-text">Sexual Preference:</div>
<div id="advanced-profile-sexual-text">Attirances sexuelles:</div>
<div id="advanced-profile-sexual">{$a->profile['sexual']}</div>
</div>
<div id="advanced-profile-sexual-end"></div>
@ -86,7 +86,7 @@ if($a->profile['homepage']) {
$homepage = linkify($a->profile['homepage']);
$o .= <<< EOT
<div id="advanced-profile-homepage-wrapper" >
<div id="advanced-profile-homepage-text">Homepage:</div>
<div id="advanced-profile-homepage-text">Site web:</div>
<div id="advanced-profile-homepage">$homepage</div>
</div>
<div id="advanced-profile-homepage-end"></div>
@ -96,7 +96,7 @@ EOT;
if($a->profile['politic']) {
$o .= <<< EOT
<div id="advanced-profile-politic-wrapper" >
<div id="advanced-profile-politic-text">Political Views:</div>
<div id="advanced-profile-politic-text">Opinions politiques:</div>
<div id="advanced-profile-politic">{$a->profile['politic']}</div>
</div>
<div id="advanced-profile-politic-end"></div>
@ -116,7 +116,7 @@ EOT;
if($txt = prepare_text($a->profile['about'])) {
$o .= <<< EOT
<div id="advanced-profile-about-wrapper" >
<div id="advanced-profile-about-text">About:</div>
<div id="advanced-profile-about-text">À propos:</div>
<br />
<div id="advanced-profile-about">$txt</div>
</div>
@ -127,7 +127,7 @@ EOT;
if($txt = prepare_text($a->profile['interest'])) {
$o .= <<< EOT
<div id="advanced-profile-interest-wrapper" >
<div id="advanced-profile-interest-text">Hobbies/Interests:</div>
<div id="advanced-profile-interest-text">Marottes/Centres d'intérêt:</div>
<br />
<div id="advanced-profile-interest">$txt</div>
</div>
@ -138,7 +138,7 @@ EOT;
if($txt = prepare_text($a->profile['contact'])) {
$o .= <<< EOT
<div id="advanced-profile-contact-wrapper" >
<div id="advanced-profile-contact-text">Contact information and Social Networks:</div>
<div id="advanced-profile-contact-text">Coordonées et réseaux sociaux:</div>
<br />
<div id="advanced-profile-contact">$txt</div>
</div>
@ -149,7 +149,7 @@ EOT;
if($txt = prepare_text($a->profile['music'])) {
$o .= <<< EOT
<div id="advanced-profile-music-wrapper" >
<div id="advanced-profile-music-text">Musical interests:</div>
<div id="advanced-profile-music-text">Goûts musicaux:</div>
<br />
<div id="advanced-profile-music">$txt</div>
</div>
@ -160,7 +160,7 @@ EOT;
if($txt = prepare_text($a->profile['book'])) {
$o .= <<< EOT
<div id="advanced-profile-book-wrapper" >
<div id="advanced-profile-book-text">Books, literature:</div>
<div id="advanced-profile-book-text">Livres, littérature:</div>
<br />
<div id="advanced-profile-book">$txt</div>
</div>
@ -171,7 +171,7 @@ EOT;
if($txt = prepare_text($a->profile['tv'])) {
$o .= <<< EOT
<div id="advanced-profile-tv-wrapper" >
<div id="advanced-profile-tv-text">Television:</div>
<div id="advanced-profile-tv-text">Télévision:</div>
<br />
<div id="advanced-profile-tv">$txt</div>
</div>
@ -182,7 +182,7 @@ EOT;
if($txt = prepare_text($a->profile['film'])) {
$o .= <<< EOT
<div id="advanced-profile-film-wrapper" >
<div id="advanced-profile-film-text">Film/dance/culture/entertainment:</div>
<div id="advanced-profile-film-text">Cinéma/Danse/Culture/Divertissement:</div>
<br />
<div id="advanced-profile-film">$txt</div>
</div>
@ -193,7 +193,7 @@ EOT;
if($txt = prepare_text($a->profile['romance'])) {
$o .= <<< EOT
<div id="advanced-profile-romance-wrapper" >
<div id="advanced-profile-romance-text">Love/romance:</div>
<div id="advanced-profile-romance-text">Amour/Passion:</div>
<br />
<div id="advanced-profile-romance">$txt</div>
</div>
@ -204,7 +204,7 @@ EOT;
if($txt = prepare_text($a->profile['work'])) {
$o .= <<< EOT
<div id="advanced-profile-work-wrapper" >
<div id="advanced-profile-work-text">Work/employment:</div>
<div id="advanced-profile-work-text">Travail/Activité professionnelle:</div>
<br />
<div id="advanced-profile-work">$txt</div>
</div>
@ -215,7 +215,7 @@ EOT;
if($txt = prepare_text($a->profile['education'])) {
$o .= <<< EOT
<div id="advanced-profile-education-wrapper" >
<div id="advanced-profile-education-text">School/education:</div>
<div id="advanced-profile-education-text">École/études:</div>
<br />
<div id="advanced-profile-education">$txt</div>
</div>

View file

@ -1,11 +1,11 @@
<h1>Edit Profile Details</h1>
<h1>Éditer les détails du profil</h1>
<div id="profile-edit-links">
<ul>
<li><a href="profile/$profile_id/view?tab=profile" id="profile-edit-view-link" title="View this profile">View this profile</a></li>
<li><a href="profiles/clone/$profile_id" id="profile-edit-clone-link" title="Create a new profile using these settings">Clone this profile</a></li>
<li><a href="profile/$profile_id/view?tab=profile" id="profile-edit-view-link" title="Voir ce profil">Voir ce profil</a></li>
<li><a href="profiles/clone/$profile_id" id="profile-edit-clone-link" title="Créer un nouveau profil en utilisant les réglages de celui-ci">Cloner ce profil</a></li>
<li></li>
<li><a href="profiles/drop/$profile_id" id="profile-edit-drop-link" title="Delete this profile" $disabled >Delete this profile</a></li>
<li><a href="profiles/drop/$profile_id" id="profile-edit-drop-link" title="Supprimer ce profil" $disabled >Supprimer ce profil</a></li>
</ul>
</div>
@ -18,32 +18,32 @@ $default
<form id="profile-edit-form" name="form1" action="profiles/$profile_id" method="post" >
<div id="profile-edit-profile-name-wrapper" >
<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >Profile Name: </label>
<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >Nom du profil: </label>
<input type="text" size="32" name="profile_name" id="profile-edit-profile-name" value="$profile_name" /><div class="required">*</div>
</div>
<div id="profile-edit-profile-name-end"></div>
<div id="profile-edit-name-wrapper" >
<label id="profile-edit-name-label" for="profile-edit-name" >Your Full Name: </label>
<label id="profile-edit-name-label" for="profile-edit-name" >Votre nom complet: </label>
<input type="text" size="32" name="name" id="profile-edit-name" value="$name" />
</div>
<div id="profile-edit-name-end"></div>
<div id="profile-edit-pdesc-wrapper" >
<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >Title/Description: </label>
<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >Titre/descriptif: </label>
<input type="text" size="32" name="pdesc" id="profile-edit-pdesc" value="$pdesc" />
</div>
<div id="profile-edit-pdesc-end"></div>
<div id="profile-edit-gender-wrapper" >
<label id="profile-edit-gender-label" for="gender-select" >Your Gender: </label>
<label id="profile-edit-gender-label" for="gender-select" >Votre genre: </label>
$gender
</div>
<div id="profile-edit-gender-end"></div>
<div id="profile-edit-dob-wrapper" >
<label id="profile-edit-dob-label" for="dob-select" >Birthday (y/m/d): </label>
<label id="profile-edit-dob-label" for="dob-select" >Votre anniversaire (j/m/a): </label>
<div id="profile-edit-dob" >
$dob $age
</div>
@ -53,32 +53,32 @@ $dob $age
$hide_friends
<div class="profile-edit-submit-wrapper" >
<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" />
<input type="submit" name="submit" class="profile-edit-submit-button" value="Soumettre" />
</div>
<div class="profile-edit-submit-end"></div>
<div id="profile-edit-address-wrapper" >
<label id="profile-edit-address-label" for="profile-edit-address" >Street Address: </label>
<label id="profile-edit-address-label" for="profile-edit-address" >Adresse postale: </label>
<input type="text" size="32" name="address" id="profile-edit-address" value="$address" />
</div>
<div id="profile-edit-address-end"></div>
<div id="profile-edit-locality-wrapper" >
<label id="profile-edit-locality-label" for="profile-edit-locality" >Locality/City: </label>
<label id="profile-edit-locality-label" for="profile-edit-locality" >Localité/Ville: </label>
<input type="text" size="32" name="locality" id="profile-edit-locality" value="$locality" />
</div>
<div id="profile-edit-locality-end"></div>
<div id="profile-edit-postal-code-wrapper" >
<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >Postal/Zip Code: </label>
<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >Code postal: </label>
<input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="$postal_code" />
</div>
<div id="profile-edit-postal-code-end"></div>
<div id="profile-edit-country-name-wrapper" >
<label id="profile-edit-country-name-label" for="profile-edit-country-name" >Country: </label>
<label id="profile-edit-country-name-label" for="profile-edit-country-name" >Pays: </label>
<select name="country_name" id="profile-edit-country-name" onChange="Fill_States('$region');">
<option selected="selected" >$country_name</option>
<option>temp</option>
@ -87,7 +87,7 @@ $hide_friends
<div id="profile-edit-country-name-end"></div>
<div id="profile-edit-region-wrapper" >
<label id="profile-edit-region-label" for="profile-edit-region" >Region/State: </label>
<label id="profile-edit-region-label" for="profile-edit-region" >Région/état: </label>
<select name="region" id="profile-edit-region" onChange="Update_Globals();" >
<option selected="selected" >$region</option>
<option>temp</option>
@ -96,20 +96,20 @@ $hide_friends
<div id="profile-edit-region-end"></div>
<div class="profile-edit-submit-wrapper" >
<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" />
<input type="submit" name="submit" class="profile-edit-submit-button" value="Soumettre" />
</div>
<div class="profile-edit-submit-end"></div>
<div id="profile-edit-marital-wrapper" >
<label id="profile-edit-marital-label" for="profile-edit-marital" ><span class="heart">&hearts;</span> (Marital) Status: </label>
<label id="profile-edit-marital-label" for="profile-edit-marital" ><span class="heart">&hearts;</span>Statut (marital): </label>
$marital
</div>
<label id="profile-edit-with-label" for="profile-edit-with" > Who: (if applicable) </label>
<label id="profile-edit-with-label" for="profile-edit-with" > Qui: (si pertinent) </label>
<input type="text" size="32" name="with" id="profile-edit-with" value="$with" />
<div id="profile-edit-marital-end"></div>
<div id="profile-edit-sexual-wrapper" >
<label id="profile-edit-sexual-label" for="sexual-select" >Sexual Preference: </label>
<label id="profile-edit-sexual-label" for="sexual-select" >Attirance sexuelle: </label>
$sexual
</div>
<div id="profile-edit-sexual-end"></div>
@ -117,13 +117,13 @@ $sexual
<div id="profile-edit-homepage-wrapper" >
<label id="profile-edit-homepage-label" for="profile-edit-homepage" >Homepage URL: </label>
<label id="profile-edit-homepage-label" for="profile-edit-homepage" >Site web personnel: </label>
<input type="text" size="32" name="homepage" id="profile-edit-homepage" value="$homepage" />
</div>
<div id="profile-edit-homepage-end"></div>
<div id="profile-edit-politic-wrapper" >
<label id="profile-edit-politic-label" for="profile-edit-politic" >Political Views: </label>
<label id="profile-edit-politic-label" for="profile-edit-politic" >Opinions politiques: </label>
<input type="text" size="32" name="politic" id="profile-edit-politic" value="$politic" />
</div>
<div id="profile-edit-politic-end"></div>
@ -135,26 +135,26 @@ $sexual
<div id="profile-edit-religion-end"></div>
<div id="profile-edit-pubkeywords-wrapper" >
<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >Public Keywords: </label>
<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="Example: fishing photography software" value="$pub_keywords" />
</div><div id="profile-edit-pubkeywords-desc">(Used for suggesting potential friends, can be seen by others)</div>
<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >Mots clés publics: </label>
<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="Exemple: football photographie programmation" value="$pub_keywords" />
</div><div id="profile-edit-pubkeywords-desc">(Utilisés pour les amis potentiels, peuvent être vus)</div>
<div id="profile-edit-pubkeywords-end"></div>
<div id="profile-edit-prvkeywords-wrapper" >
<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >Private Keywords: </label>
<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="Example: fishing photography software" value="$prv_keywords" />
</div><div id="profile-edit-prvkeywords-desc">(Used for searching profiles, never shown to others)</div>
<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >Mots clés privés: </label>
<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="Exemple: football photographie programmation" value="$prv_keywords" />
</div><div id="profile-edit-prvkeywords-desc">(Utilisés lors des recherches, ne sont jamais montrés à personne)</div>
<div id="profile-edit-prvkeywords-end"></div>
<div class="profile-edit-submit-wrapper" >
<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" />
<input type="submit" name="submit" class="profile-edit-submit-button" value="Soumettre" />
</div>
<div class="profile-edit-submit-end"></div>
<div id="about-jot-wrapper" >
<p id="about-jot-desc" >
Tell us about yourself...
Parlez nous de vous...
</p>
<textarea rows="10" cols="72" id="profile-jot-text" name="about" >$about</textarea>
@ -166,7 +166,7 @@ Tell us about yourself...
<div id="interest-jot-wrapper" >
<p id="interest-jot-desc" >
Hobbies/Interests
Marottes/Centre d'intérêts
</p>
<textarea rows="10" cols="72" id="interest-jot-text" name="interest" >$interest</textarea>
@ -178,7 +178,7 @@ Hobbies/Interests
<div id="contact-jot-wrapper" >
<p id="contact-jot-desc" >
Contact information and Social Networks
Coordonnées et réseau sociaux
</p>
<textarea rows="10" cols="72" id="contact-jot-text" name="contact" >$contact</textarea>
@ -189,14 +189,14 @@ Contact information and Social Networks
<div class="profile-edit-submit-wrapper" >
<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" />
<input type="submit" name="submit" class="profile-edit-submit-button" value="Soumettre" />
</div>
<div class="profile-edit-submit-end"></div>
<div id="music-jot-wrapper" >
<p id="music-jot-desc" >
Musical interests
Goûts musicaux
</p>
<textarea rows="10" cols="72" id="music-jot-text" name="music" >$music</textarea>
@ -207,7 +207,7 @@ Musical interests
<div id="book-jot-wrapper" >
<p id="book-jot-desc" >
Books, literature
Livres, littérature
</p>
<textarea rows="10" cols="72" id="book-jot-text" name="book" >$book</textarea>
@ -220,7 +220,7 @@ Books, literature
<div id="tv-jot-wrapper" >
<p id="tv-jot-desc" >
Television
Télévision
</p>
<textarea rows="10" cols="72" id="tv-jot-text" name="tv" >$tv</textarea>
@ -233,7 +233,7 @@ Television
<div id="film-jot-wrapper" >
<p id="film-jot-desc" >
Film/dance/culture/entertainment
Cinéma/Danse/Culture/Divertissement
</p>
<textarea rows="10" cols="72" id="film-jot-text" name="film" >$film</textarea>
@ -244,14 +244,14 @@ Film/dance/culture/entertainment
<div class="profile-edit-submit-wrapper" >
<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" />
<input type="submit" name="submit" class="profile-edit-submit-button" value="Soumettre" />
</div>
<div class="profile-edit-submit-end"></div>
<div id="romance-jot-wrapper" >
<p id="romance-jot-desc" >
Love/romance
Amour/Passion
</p>
<textarea rows="10" cols="72" id="romance-jot-text" name="romance" >$romance</textarea>
@ -264,7 +264,7 @@ Love/romance
<div id="work-jot-wrapper" >
<p id="work-jot-desc" >
Work/employment
Travail/activité professionnelle
</p>
<textarea rows="10" cols="72" id="work-jot-text" name="work" >$work</textarea>
@ -277,7 +277,7 @@ Work/employment
<div id="education-jot-wrapper" >
<p id="education-jot-desc" >
School/education
École/études
</p>
<textarea rows="10" cols="72" id="education-jot-text" name="education" >$education</textarea>
@ -289,11 +289,11 @@ School/education
<div class="profile-edit-submit-wrapper" >
<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" />
<input type="submit" name="submit" class="profile-edit-submit-button" value="Soumettre" />
</div>
<div class="profile-edit-submit-end"></div>
</form>
</div>
<script type="text/javascript">Fill_Country('$country_name');Fill_States('$region');</script>
<script type="text/javascript">Fill_Country('$country_name');Fill_States('$region');</script>

File diff suppressed because it is too large Load diff