Merge

--HG--
branch : product-engine

1 files changed, 38 insertions, 45 deletions

diff --git a/indra/newview/skins/default/xui/fr/panel_edit_profile.xml b/indra/newview/skins/default/xui/fr/panel_edit_profile.xml
index 3a1585bce2..afadd109b1 100644
--- a/indra/newview/skins/default/xui/fr/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/fr/panel_edit_profile.xml
@@ -1,45 +1,38 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="edit_profile_panel">
-   <string name="CaptionTextAcctInfo">
-       [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]
-   </string>
-   <string name="AcctTypeResident"
-    value="Résident" />
-   <string name="AcctTypeTrial"
-    value="Essai" />
-   <string name="AcctTypeCharterMember"
-    value="Membre originaire" />
-   <string name="AcctTypeEmployee"
-    value="Employé(e) de Linden Lab" />
-   <string name="PaymentInfoUsed"
-    value="Infos de paiement utilisées" />
-   <string name="PaymentInfoOnFile"
-    value="Infos de paiement enregistrées" />
-   <string name="NoPaymentInfoOnFile"
-    value="Aucune info de paiement" />
-   <string name="AgeVerified"
-    value="Âge vérifié" />
-   <string name="NotAgeVerified"
-    value="Âge non vérifié" />
-   <string name="partner_edit_link_url">
-       http://www.secondlife.com/account/partners.php?lang=fr
-   </string>
-    <panel name="scroll_content_panel">
-    <panel name="data_panel" >
-     <panel name="lifes_images_panel">
-          <panel name="second_life_image_panel">
-              <text name="second_life_photo_title_text">
-			[SECOND_LIFE]:
-              </text>
-          </panel>
-      </panel>
-        <text name="title_partner_text" value="Partenaire :"/>
-        <panel name="partner_data_panel">
-            <text name="partner_text" value="[FIRST] [LAST]"/>
-         </panel>
-      <text name="text_box3">
-	Réponse si occupé(e) :
-      </text>
-    </panel>
-    </panel>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<panel label="Profile Edit" name="edit_profile_panel">

+	<string name="CaptionTextAcctInfo">

+		[ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]

+	</string>

+	<string name="AcctTypeResident" value="Résident"/>

+	<string name="AcctTypeTrial" value="Essai"/>

+	<string name="AcctTypeCharterMember" value="Membre originaire"/>

+	<string name="AcctTypeEmployee" value="Employé(e) de Linden Lab"/>

+	<string name="PaymentInfoUsed" value="Infos de paiement utilisées"/>

+	<string name="PaymentInfoOnFile" value="Infos de paiement enregistrées"/>

+	<string name="NoPaymentInfoOnFile" value="Aucune info de paiement"/>

+	<string name="AgeVerified" value="Âge vérifié"/>

+	<string name="NotAgeVerified" value="Âge non vérifié"/>

+	<string name="partner_edit_link_url">

+		http://www.secondlife.com/account/partners.php?lang=fr

+	</string>

+	<string name="no_partner_text" value="Aucun"/>

+	<scroll_container name="profile_scroll">

+		<panel name="scroll_content_panel">

+			<panel name="data_panel">

+				<panel name="lifes_images_panel">

+					<icon label="" name="2nd_life_edit_icon" tool_tip="Cliquez pour sélectionner une image"/>

+				</panel>

+				<icon label="" name="real_world_edit_icon" tool_tip="Cliquez pour sélectionner une image"/>

+				<text name="title_homepage_text">

+					Page d&apos;accueil :

+				</text>

+				<check_box label="Afficher dans les résultats de recherche" name="show_in_search_checkbox"/>

+				<text name="title_acc_status_text" value="Statut du compte :"/>

+			</panel>

+		</panel>

+	</scroll_container>

+	<panel name="profile_me_buttons_panel">

+		<button label="Enregistrer les changements" name="save_btn"/>

+		<button label="Annuler" name="cancel_btn"/>

+	</panel>

+</panel>