From 5419c7f2159260f1bcbb35b216093c238d4304dd Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Mon, 1 Mar 2010 14:35:56 -0800
Subject: VWR-17488 width fix for all langs

---
 indra/newview/skins/default/xui/en/panel_preferences_sound.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index a7cdd241c5..a8aa54a8f1 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -329,7 +329,7 @@
 	   left="80"
 	   top_delta="16"
      name="Listen from"
-     width="80">
+     width="110">
         Listen from:
     </text>
 	<icon
-- 
cgit v1.2.3


From f905a10dbb8d23e233534a134d3d70bc87f576ef Mon Sep 17 00:00:00 2001
From: Lis Linden <lis@lindenlab.com>
Date: Mon, 1 Mar 2010 17:53:50 -0500
Subject: EXT-5681 Event Details floater needs labels and clean-up?

---
 .../newview/skins/default/xui/en/floater_event.xml | 106 ++++++++++++++-------
 1 file changed, 70 insertions(+), 36 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_event.xml b/indra/newview/skins/default/xui/en/floater_event.xml
index c2fab900e3..bcf15d7193 100644
--- a/indra/newview/skins/default/xui/en/floater_event.xml
+++ b/indra/newview/skins/default/xui/en/floater_event.xml
@@ -48,7 +48,7 @@
     border_size="0">
     <layout_panel
        name="profile_stack"
-       follows="all"
+       follows="top|left"
        layout="topleft"
        top="0"
        left="0"
@@ -88,7 +88,7 @@
        left="10"
        top_pad="7"
        name="event_runby_label"
-       width="310">
+       width="90">
         Run by:
       </text>
       <text
@@ -96,48 +96,79 @@
         height="20"
         initial_value="(retrieving)"
         layout="topleft"
-        left="10"
+        left_pad="0"
         link="true"
         name="event_runby"
-        top_pad="2"
+        top_delta="0"
         use_ellipses="true"
-        width="310" />
+        width="240" />
+      <text
+       type="string"
+       length="1"
+       follows="top|left"
+       layout="topleft"
+       left="10"
+       top_pad="5"
+       name="event_date_label"
+       width="90">
+        Date:
+      </text>
       <text
      type="string"
      length="1"
-     left="10"
+     left_pad="0"
      height="17"
-     font="SansSerifMedium"
-    text_color="EmphasisColor"
-     top_pad="5"
+     top_delta="0"
      follows="top|left"
      layout="topleft"
      name="event_date"
-     width="310">
+     width="240">
         10/10/2010
       </text>
       <text
        type="string"
-       height="14"
        length="1"
+       follows="top|left"
+       layout="topleft"
        left="10"
+       top_pad="5"
+       name="event_duration_label"
+       width="90">
+        Duration:
+      </text>
+      <text
+       type="string"
+       height="14"
+       length="1"
+       left_pad="0"
        follows="top|left"
        layout="topleft"
        name="event_duration"
-       width="310">
+       top_delta="0"
+       width="240">
         1 hour
       </text>
       <text
-       font="SansSerifMedium"
-       text_color="EmphasisColor"
+       type="string"
+       length="1"
+       follows="top|left"
+       layout="topleft"
+       left="10"
+       top_pad="5"
+       name="event_covercharge_label"
+       width="90">
+        Cover charge:
+      </text>
+      <text
         type="string"
         follows="left|top"
         height="16"
         layout="topleft"
-       left="10"
+       left_pad="0"
        name="event_cover"
         visible="true"
-        width="310">
+        width="240"
+        top_delta="0">
         Free
       </text>
       <text
@@ -147,20 +178,22 @@
        layout="topleft"
        left="10"
        top_pad="5"
-       name="event_location_label">
+       name="event_location_label"
+       width="90">
         Location:
       </text>
       <text
        type="string"
        length="1"
        height="20"
-       left="10"
+       left_pad="0"
        follows="top|left"
        layout="topleft"
        name="event_location"
        use_ellipses="true"
+       top_delta="0"
        value="SampleParcel, Name Long (145, 228, 26)"
-       width="310" />
+       width="240" />
       <icon
        follows="top|left"
        height="16"
@@ -195,33 +228,34 @@
        name="rating_label"
        top_delta="3"
        value="Rating:"
-       width="60" />
+       width="58" />
       <text
        follows="left|right|top"
        height="16"
        layout="topleft"
-       left_pad="0"
+       left_pad="2"
        name="rating_value"
        top_delta="0"
        value="unknown"
-       width="200" />
+       width="240" />
       <expandable_text
-               follows="left|top|right"
-               height="106"
-               layout="topleft"
-               left="6"
-               name="event_desc"
-               width="313" />
+       follows="left|top|right"
+       height="65"
+       layout="topleft"
+       left="6"
+       name="event_desc"
+       width="322">
+       Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</expandable_text>
     </layout_panel>
     <layout_panel
-               follows="left|right"
-               height="24"
-               layout="topleft"
-               mouse_opaque="false"
-               name="button_panel"
-               top="0"
-               left="0"
-               user_resize="false">
+       follows="left|right"
+       height="24"
+       layout="topleft"
+       mouse_opaque="false"
+       name="button_panel"
+       top="0"
+       left="0"
+       user_resize="false">
       <button
        follows="left|top"
            height="18"
-- 
cgit v1.2.3


From 5d5e0c5039daf81a3e84c06a9033af9d3e8567e3 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Mon, 1 Mar 2010 16:01:07 -0800
Subject: VWR-17082 fix width for all langs

---
 indra/newview/skins/default/xui/en/panel_preferences_sound.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index a8aa54a8f1..e03ecd8f04 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -51,7 +51,7 @@
      name="mute_when_minimized"
 	   top_delta="3"
      left_pad="5"
-     width="215" />
+     width="235" />
 	<slider
 		control_name="AudioLevelUI"
 		disabled_control="MuteAudio"
@@ -329,7 +329,7 @@
 	   left="80"
 	   top_delta="16"
      name="Listen from"
-     width="110">
+     width="142">
         Listen from:
     </text>
 	<icon
-- 
cgit v1.2.3


From 2db6e2311c28483f4e692f507eb48544e32c5c9c Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Mon, 1 Mar 2010 16:02:06 -0800
Subject: FR linguistic fix

---
 indra/newview/skins/default/xui/fr/floater_snapshot.xml | 4 ++--
 indra/newview/skins/default/xui/fr/panel_friends.xml    | 2 +-
 indra/newview/skins/default/xui/fr/panel_notes.xml      | 2 +-
 indra/newview/skins/default/xui/fr/panel_people.xml     | 2 +-
 indra/newview/skins/default/xui/fr/panel_profile.xml    | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/fr/floater_snapshot.xml b/indra/newview/skins/default/xui/fr/floater_snapshot.xml
index 74738b7e31..f01d865f29 100644
--- a/indra/newview/skins/default/xui/fr/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/fr/floater_snapshot.xml
@@ -62,8 +62,8 @@
 	<check_box label="Interface" name="ui_check"/>
 	<check_box label="HUD" name="hud_check"/>
 	<check_box label="Garder ouvert après enregistrement" name="keep_open_check"/>
-	<check_box label="Contraindre les proportions" name="keep_aspect_check"/>
-	<check_box label="Arrêt sur image (plein écran)" name="freeze_frame_check"/>
+	<check_box label="Conserver les proportions" name="keep_aspect_check"/>
+	<check_box label="Figer l'image (plein écran)" name="freeze_frame_check"/>
 	<button label="Rafraîchir" name="new_snapshot_btn"/>
 	<check_box label="Rafraîchissement automatique" name="auto_snapshot_check"/>
 	<button label="Enregistrer ([AMOUNT] L$)" name="upload_btn" width="118"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_friends.xml b/indra/newview/skins/default/xui/fr/panel_friends.xml
index 10ec952aa3..ad9e3daf3d 100644
--- a/indra/newview/skins/default/xui/fr/panel_friends.xml
+++ b/indra/newview/skins/default/xui/fr/panel_friends.xml
@@ -16,5 +16,5 @@
 	<button label="Téléporter" name="offer_teleport_btn" tool_tip="Proposez à cet ami d&apos;être téléporté là où vous êtes"/>
 	<button label="Payer" name="pay_btn" tool_tip="Donnez des L$ à cet ami"/>
 	<button label="Supprimer" name="remove_btn" tool_tip="Supprimez ce résident de votre liste d&apos;amis"/>
-	<button label="Ajouter" name="add_btn" tool_tip="Proposer à ce résident de devenir votre ami"/>
+	<button label="Ajouter" name="add_btn" tool_tip="Proposer à un résident de devenir votre ami"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_notes.xml b/indra/newview/skins/default/xui/fr/panel_notes.xml
index ba052a0e07..f4e4f8a4ab 100644
--- a/indra/newview/skins/default/xui/fr/panel_notes.xml
+++ b/indra/newview/skins/default/xui/fr/panel_notes.xml
@@ -13,7 +13,7 @@
 			</scroll_container>
 		</layout_panel>
 		<layout_panel name="notes_buttons_panel">
-			<button label="Devenir amis" name="add_friend" tool_tip="Proposer à ce résident de devenir votre ami"/>
+			<button label="Devenir amis" name="add_friend" tool_tip="Proposer à un résident de devenir votre ami"/>
 			<button label="IM" name="im" width="30" tool_tip="Ouvrir une session IM"/>
 			<button label="Appeler" name="call" width="60" tool_tip="Appeler ce résident"/>
 			<button label="Carte" name="show_on_map_btn" tool_tip="Afficher le résident sur la carte"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_people.xml b/indra/newview/skins/default/xui/fr/panel_people.xml
index f129f56261..84749806ff 100644
--- a/indra/newview/skins/default/xui/fr/panel_people.xml
+++ b/indra/newview/skins/default/xui/fr/panel_people.xml
@@ -26,7 +26,7 @@ Si vous voulez rencontrer d&apos;autres résidents, ouvrez la [secondlife:///app
 			</text>
 			<panel label="bottom_panel" name="bottom_panel">
 				<button name="friends_viewsort_btn" tool_tip="Options"/>
-				<button name="add_btn" tool_tip="Proposer à ce résident de devenir votre ami"/>
+				<button name="add_btn" tool_tip="Proposer à un résident de devenir votre ami"/>
 				<button name="del_btn" tool_tip="Supprimer le résident sélectionné de votre liste d&apos;amis"/>
 			</panel>
 		</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_profile.xml b/indra/newview/skins/default/xui/fr/panel_profile.xml
index 364426fed1..c439435d1a 100644
--- a/indra/newview/skins/default/xui/fr/panel_profile.xml
+++ b/indra/newview/skins/default/xui/fr/panel_profile.xml
@@ -41,7 +41,7 @@
 			</scroll_container>
 		</layout_panel>
 		<layout_panel name="profile_buttons_panel">
-			<button label="Devenir amis" name="add_friend" tool_tip="Proposer à ce résident de devenir votre ami"/>
+			<button label="Devenir amis" name="add_friend" tool_tip="Proposer à un résident de devenir votre ami"/>
 			<button label="IM" name="im" tool_tip="Ouvrir une session IM" width="30"/>
 			<button label="Appeler" name="call" tool_tip="Appeler ce résident" width="60"/>
 			<button label="Carte" name="show_on_map_btn" tool_tip="Afficher le résident sur la carte"/>
-- 
cgit v1.2.3