From 9f9b240dcee53a50b56a0ccb8d255a86d0ce62c9 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Tue, 6 Apr 2010 11:39:01 +0100
Subject: Added voice font selection to the voice floater.

---
 .../default/xui/en/floater_voice_controls.xml      | 38 +++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
index c4411db8c5..100a060557 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -33,6 +33,9 @@
      name="no_one_near">
         No one near has voice enabled
     </string>
+    <floater.string name="no_voice_font">
+        No Voice Effect
+    </floater.string>
       <layout_stack
          clip="false"
          follows="all"
@@ -84,7 +87,39 @@
              visible="true"
              width="20" />
         </layout_panel>
-         <layout_panel
+        <layout_stack
+         clip="false"
+         auto_resize="false"
+         follows="left|right"
+         height="23"
+         layout="topleft"
+         left="10"
+         mouse_opaque="false"
+         name="voice_font_and_leave_call_stack"
+         orientation="horizontal"
+         width="263">
+          <layout_panel
+           auto_resize="false"
+           user_resize="false"
+           follows="top|left"
+           height="26"
+           visible="true"
+           layout="topleft"
+           name="voice_font_panel"
+           width="120">
+            <combo_box
+             follows="left|top"
+             height="23"
+             name="voice_font"
+             top_pad="0"
+             width="120">
+              <combo_box.item
+                label="No Voice Effect"
+                name="no_voice_font"
+                value="0" />
+            </combo_box>
+          </layout_panel>
+        <layout_panel
           auto_resize="false"
           user_resize="false" 
           follows="top|left"
@@ -101,6 +136,7 @@
             name="leave_call_btn"
             width="100" />
          </layout_panel>
+      </layout_stack>
       <layout_panel
           follows="all"
           layout="topleft"
-- 
cgit v1.2.3


From cacfa18643092547e7665b36d482ad9c8c5dfc54 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Wed, 28 Apr 2010 03:33:15 +0100
Subject: Persist Voice Font selection.

Added 'VoiceFontDefault' saved setting.
Implemented LLVoiceClientFontsObserver to update the UI when the voice font list is received.
Renamed LLVoiceClientParticipantObserver::onChange() to onParticipantsChanged to avoid ambiguity and make the code more readable.
Made the Voice Font combo in the VCP auto resize to make best use of the available space when the 'Leave Call button is not visible.
---
 .../newview/skins/default/xui/en/floater_voice_controls.xml  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
index e7c5770a08..885c8304eb 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -101,20 +101,20 @@
          orientation="horizontal"
          width="263">
           <layout_panel
-           auto_resize="false"
+           auto_resize="true"
            user_resize="false"
            follows="top|left"
            height="26"
            visible="true"
            layout="topleft"
            name="voice_font_panel"
-           width="120">
+           width="150">
             <combo_box
-             follows="left|top"
+             follows="left|top|right"
              height="23"
              name="voice_font"
              top_pad="0"
-             width="120">
+             width="150">
               <combo_box.item
                 label="No Voice Effect"
                 name="no_voice_font"
@@ -124,14 +124,14 @@
         <layout_panel
           auto_resize="false"
           user_resize="false" 
-          follows="top|left"
+          follows="top|right"
           height="26"
           visible="true"
           layout="topleft"
           name="leave_call_btn_panel"
           width="100">
            <button
-          follows="right|top"
+            follows="right|top"
             height="23"
             top_pad="0"
             label="Leave Call"
-- 
cgit v1.2.3


From 46897efc3efade25feaaa1dc67bc131c35202d12 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Thu, 29 Apr 2010 02:37:07 +0100
Subject: Make a proper XUI commit_callback for the Voice Font combo

---
 indra/newview/skins/default/xui/en/floater_voice_controls.xml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
index 885c8304eb..44840a82d0 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -110,15 +110,18 @@
            name="voice_font_panel"
            width="150">
             <combo_box
+             enabled="false"
              follows="left|top|right"
              height="23"
              name="voice_font"
              top_pad="0"
              width="150">
               <combo_box.item
-                label="No Voice Effect"
-                name="no_voice_font"
-                value="0" />
+               label="No Voice Effect"
+               name="no_voice_font"
+               value="0" />
+              <combo_box.commit_callback
+               function="Voice.CommitVoiceFont" />
             </combo_box>
           </layout_panel>
         <layout_panel
-- 
cgit v1.2.3


From 93a93dfc92d5339a70f6174ae74b96fc4cb2813f Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Thu, 29 Apr 2010 13:42:34 +0100
Subject: Added VoiceFontUI setting for SLE

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

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
index 44840a82d0..ce81a39fe0 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -105,7 +105,7 @@
            user_resize="false"
            follows="top|left"
            height="26"
-           visible="true"
+           visiblity_control="VoiceFontUI"
            layout="topleft"
            name="voice_font_panel"
            width="150">
-- 
cgit v1.2.3


From 29c2e7ebeca288b051d4851d148b1f82a06d24ef Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Thu, 29 Apr 2010 13:47:50 +0100
Subject: Clip the layout_stack so that the "Leave Call" button isn't seen
 flying in and out of the floater!

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

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
index ce81a39fe0..370bc05c28 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -90,9 +90,9 @@
              width="20" />
         </layout_panel>
         <layout_stack
-         clip="false"
+         clip="true"
          auto_resize="false"
-         follows="left|right"
+         follows="left|top|right"
          height="23"
          layout="topleft"
          left="10"
-- 
cgit v1.2.3


From 7a6474129c6015e102b30570fa474ba48e4c85e0 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Fri, 30 Apr 2010 19:38:52 +0100
Subject: Move the Voice Font control from LLCallFloater to its own panel so
 that it can be reused.

---
 .../default/xui/en/floater_voice_controls.xml      | 66 +++++++---------------
 1 file changed, 21 insertions(+), 45 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
index 370bc05c28..83380577ca 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -3,7 +3,7 @@
  can_resize="true"
  can_minimize="true"
  can_close="false"
- height="202"
+ height="205"
  layout="topleft"
  min_height="124"
  min_width="190"
@@ -35,9 +35,6 @@
      name="no_one_near">
         No one near has voice enabled
     </string>
-    <floater.string name="no_voice_font">
-        No Voice Effect
-    </floater.string>
       <layout_stack
          clip="false"
          follows="all"
@@ -53,7 +50,7 @@
           user_resize="false" 
          auto_resize="false" 
          layout="topleft"
-         height="26"
+         height="20"
          name="my_panel">
             <avatar_icon
              enabled="false"
@@ -93,55 +90,34 @@
          clip="true"
          auto_resize="false"
          follows="left|top|right"
-         height="23"
+         height="26"
          layout="topleft"
-         left="10"
          mouse_opaque="false"
          name="voice_font_and_leave_call_stack"
          orientation="horizontal"
-         width="263">
+         width="262">
+          <panel
+           class="panel_voice_font"
+           name="panel_voice_font"
+           visiblity_control="VoiceFontUI"
+           filename="panel_voice_font.xml" />
           <layout_panel
-           auto_resize="true"
+           auto_resize="false"
            user_resize="false"
-           follows="top|left"
-           height="26"
-           visiblity_control="VoiceFontUI"
+           follows="top|right"
+           height="23"
+           visible="true"
            layout="topleft"
-           name="voice_font_panel"
-           width="150">
-            <combo_box
-             enabled="false"
-             follows="left|top|right"
+           name="leave_call_btn_panel"
+           width="100">
+            <button
+             follows="right|top"
              height="23"
-             name="voice_font"
-             top_pad="0"
-             width="150">
-              <combo_box.item
-               label="No Voice Effect"
-               name="no_voice_font"
-               value="0" />
-              <combo_box.commit_callback
-               function="Voice.CommitVoiceFont" />
-            </combo_box>
+             label="Leave Call"
+             name="leave_call_btn"
+             width="100" />
           </layout_panel>
-        <layout_panel
-          auto_resize="false"
-          user_resize="false" 
-          follows="top|right"
-          height="26"
-          visible="true"
-          layout="topleft"
-          name="leave_call_btn_panel"
-          width="100">
-           <button
-            follows="right|top"
-            height="23"
-            top_pad="0"
-            label="Leave Call"
-            name="leave_call_btn"
-            width="100" />
-         </layout_panel>
-      </layout_stack>
+        </layout_stack>
       <layout_panel
           follows="all"
           layout="topleft"
-- 
cgit v1.2.3


From f3df31078c48c5a98ce47bf04a14a1938da3bdc8 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Thu, 13 May 2010 15:09:51 +0100
Subject: EXT-7138 Forgot to rename panel_voice_font.xml to
 panel_voice_effect.xml oops!

---
 .../skins/default/xui/en/panel_voice_effect.xml    | 35 ++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/panel_voice_effect.xml

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_voice_effect.xml b/indra/newview/skins/default/xui/en/panel_voice_effect.xml
new file mode 100644
index 0000000000..dac2f5ebed
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_voice_effect.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ follows="all"
+ height="26"
+ layout="topleft"
+ name="panel_voice_effect"
+ width="200">
+  <string name="no_voice_effect">
+    No Voice Effect
+  </string>
+  <string name="get_voice_effects_url">
+    https://secondlife.com/my/account/voice.php
+  </string>
+  <string name="get_voice_effects">
+    Add voice effects  ▶
+  </string>
+  <string name="preview_voice_effects">
+    Preview  ▶
+  </string>
+  <combo_box
+   enabled="false"
+   follows="left|top|right"
+   height="23"
+   name="voice_effect"
+   top_pad="0"
+   width="200">
+    <combo_box.item
+     label="No Voice Effect"
+     name="no_voice_effect"
+	 top_pad="0"
+     value="0" />
+    <combo_box.commit_callback
+     function="Voice.CommitVoiceEffect" />
+  </combo_box>
+</panel>
-- 
cgit v1.2.3


From 24c55c9a689aaf7c8c961a5eb4aab5283b0fb1fa Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Tue, 18 May 2010 14:16:25 +0100
Subject: EXT-7337 WIP Implemented prototype voice font preview floater.

---
 .../skins/default/xui/en/floater_voice_effect.xml  | 123 +++++++++++++++++++++
 1 file changed, 123 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/floater_voice_effect.xml

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
new file mode 100644
index 0000000000..5627eb3aff
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_resize="true"
+ height="465"
+ name="voice_effects"
+ help_topic="voice_effects"
+ title="VOICE EFFECTS"
+ background_visible="true"
+ follows="all"
+ label="Places"
+ layout="topleft"
+ min_height="350"
+ min_width="240"
+ width="313">
+  <string name="no_voice_effect">
+    No Voice Effect
+  </string>
+  <scroll_list
+   bottom_delta="400"
+   draw_heading="true"
+   follows="all"
+   layout="topleft"
+   left="0"
+   multi_select="false"
+   top="20"
+   name="voice_effect_list">
+    <scroll_list.columns
+     label="New"
+     name="new"
+     width="48" />
+    <scroll_list.columns
+     label="Name"
+     name="name"
+     width="153" />
+	<scroll_list.columns
+     label="Expires"
+     name="expires"
+     width="100" />
+    <scroll_list.columns
+     label=""
+     name="key"
+     width="-1" />
+  </scroll_list>
+  <panel
+   background_visible="true"
+   bevel_style="none"
+   top_pad="0"
+   follows="left|right|bottom"
+   height="30"
+   label="bottom_panel"
+   layout="topleft"
+   left="0"
+   name="bottom_panel"
+   width="313">
+<!--
+    <button
+     follows="bottom|left"
+     font="SansSerifBigBold"
+     height="10"
+     image_hover_selected="Activate_Checkmark"
+     image_selected="Activate_Checkmark"
+     image_unselected="Activate_Checkmark"
+     layout="topleft"
+     left="10"
+     name="activate_btn"
+     tool_tip="Activate/Deactivate selected voice effect"
+     top="10"
+     width="10"
+      <button.commit_callback
+       function="VoiceEffect.Activate" />
+    </button>
+-->
+  </panel>
+  <button
+   follows="left|bottom"
+   height="23"
+   label="Record"
+   layout="topleft"
+   left="6"
+   name="record_btn"
+   top_pad="5"
+   width="83">
+    <button.commit_callback
+     function="VoiceEffect.Record" />
+  </button>
+  <button
+   follows="left|bottom"
+   height="23"
+   label="Stop"
+   layout="topleft"
+   left_delta="0"
+   name="record_stop_btn"
+   top_delta="0"
+   width="83">
+    <button.commit_callback
+     function="VoiceEffect.Record" />
+  </button>
+  <button
+   follows="left|bottom"
+   height="23"
+   label="Play"
+   layout="topleft"
+   left_pad="6"
+   name="play_btn"
+   top_delta="0"
+   width="83">
+    <button.commit_callback
+     function="VoiceEffect.Play" />
+  </button>
+  <button
+   follows="left|bottom"
+   height="23"
+   label="Stop"
+   layout="topleft"
+   left_delta="0"
+   name="play_stop_btn"
+   top_delta="0"
+   width="83">
+    <button.commit_callback
+     function="VoiceEffect.Play" />
+  </button>
+</floater>
-- 
cgit v1.2.3


From 95ed59a9dec737ffe8d566595e1a74f662fe1e43 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Wed, 19 May 2010 16:28:03 +0100
Subject: EXT-7337 WIP Added template voice fonts to the voice font list for
 previewing

---
 .../skins/default/xui/en/floater_voice_effect.xml  | 89 +++++++++++++++++-----
 1 file changed, 71 insertions(+), 18 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
index 5627eb3aff..8f2f13dffe 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
@@ -16,6 +16,9 @@
   <string name="no_voice_effect">
     No Voice Effect
   </string>
+  <string name="new_voice_effect">
+    New!
+  </string>
   <scroll_list
    bottom_delta="400"
    draw_heading="true"
@@ -25,24 +28,76 @@
    multi_select="false"
    top="20"
    name="voice_effect_list">
-    <scroll_list.columns
-     label="New"
-     name="new"
-     width="48" />
     <scroll_list.columns
      label="Name"
      name="name"
      width="153" />
+    <scroll_list.columns
+     label="New"
+     name="new"
+     width="48" />
 	<scroll_list.columns
      label="Expires"
      name="expires"
      width="100" />
-    <scroll_list.columns
-     label=""
-     name="key"
-     width="-1" />
   </scroll_list>
-  <panel
+              <panel
+             background_visible="true"
+             bevel_style="none"
+             top_pad="0"
+             follows="left|right|bottom"
+             height="30"
+             label="bottom_panel"
+             layout="topleft"
+             left="0"
+             name="bottom_panel"
+             width="313">
+<!--
+              <menu_button
+               follows="bottom|left"
+               height="18"
+               image_disabled="OptionsMenu_Disabled"
+               image_selected="OptionsMenu_Press"
+               image_unselected="OptionsMenu_Off"
+               layout="topleft"
+               left="10"
+               menu_filename="menu_voice_effect_gear.xml"
+               name="gear_btn"
+               top="5"
+               tool_tip="More options"
+               width="18" />
+-->
+    <button
+     follows="bottom|left"
+     font="SansSerifBigBold"
+     height="18"
+     image_selected="AddItem_Press"
+     image_unselected="AddItem_Off"
+     image_disabled="AddItem_Disabled"
+     layout="topleft"
+     left="10"
+     name="new_gesture_btn"
+     tool_tip="Make new gesture"
+     top="5"
+     width="18" />
+    <button
+     follows="bottom|left"
+     font="SansSerifBigBold"
+     height="10"
+     image_hover_selected="Activate_Checkmark"
+     image_selected="Activate_Checkmark"
+     image_unselected="Activate_Checkmark"
+     layout="topleft"
+     left_pad="5"
+     name="activate_btn"
+     tool_tip="Activate/Deactivate selected voice effect"
+     top="10"
+     width="10">
+      <button.commit_callback
+       function="VoiceEffect.Activate" />
+    </button>
+  </panel>
+<!--  <panel
    background_visible="true"
    bevel_style="none"
    top_pad="0"
@@ -53,7 +108,6 @@
    left="0"
    name="bottom_panel"
    width="313">
-<!--
     <button
      follows="bottom|left"
      font="SansSerifBigBold"
@@ -70,17 +124,16 @@
       <button.commit_callback
        function="VoiceEffect.Activate" />
     </button>
--->
-  </panel>
+  </panel> -->
   <button
    follows="left|bottom"
    height="23"
-   label="Record"
+   label="Record Sample"
    layout="topleft"
    left="6"
    name="record_btn"
    top_pad="5"
-   width="83">
+   width="135">
     <button.commit_callback
      function="VoiceEffect.Record" />
   </button>
@@ -92,19 +145,19 @@
    left_delta="0"
    name="record_stop_btn"
    top_delta="0"
-   width="83">
+   width="135">
     <button.commit_callback
      function="VoiceEffect.Record" />
   </button>
   <button
    follows="left|bottom"
    height="23"
-   label="Play"
+   label="Play Preview"
    layout="topleft"
    left_pad="6"
    name="play_btn"
    top_delta="0"
-   width="83">
+   width="135">
     <button.commit_callback
      function="VoiceEffect.Play" />
   </button>
@@ -116,7 +169,7 @@
    left_delta="0"
    name="play_stop_btn"
    top_delta="0"
-   width="83">
+   width="135">
     <button.commit_callback
      function="VoiceEffect.Play" />
   </button>
-- 
cgit v1.2.3


From 2930b805d3a5aa88efdbe9eadfec210c461edfa9 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Wed, 19 May 2010 17:35:53 +0100
Subject: EXT-7337 WIP Fix formatting in floater_voice_effect.xml (no
 functional change)

---
 .../skins/default/xui/en/floater_voice_effect.xml  | 48 +++++++++++-----------
 1 file changed, 24 insertions(+), 24 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
index 8f2f13dffe..8452fb55b7 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
@@ -41,31 +41,31 @@
      name="expires"
      width="100" />
   </scroll_list>
-              <panel
-             background_visible="true"
-             bevel_style="none"
-             top_pad="0"
-             follows="left|right|bottom"
-             height="30"
-             label="bottom_panel"
-             layout="topleft"
-             left="0"
-             name="bottom_panel"
-             width="313">
+  <panel
+   background_visible="true"
+   bevel_style="none"
+   top_pad="0"
+   follows="left|right|bottom"
+   height="30"
+   label="bottom_panel"
+   layout="topleft"
+   left="0"
+   name="bottom_panel"
+   width="313">
 <!--
-              <menu_button
-               follows="bottom|left"
-               height="18"
-               image_disabled="OptionsMenu_Disabled"
-               image_selected="OptionsMenu_Press"
-               image_unselected="OptionsMenu_Off"
-               layout="topleft"
-               left="10"
-               menu_filename="menu_voice_effect_gear.xml"
-               name="gear_btn"
-               top="5"
-               tool_tip="More options"
-               width="18" />
+    <menu_button
+     follows="bottom|left"
+     height="18"
+     image_disabled="OptionsMenu_Disabled"
+     image_selected="OptionsMenu_Press"
+     image_unselected="OptionsMenu_Off"
+     layout="topleft"
+     left="10"
+     menu_filename="menu_voice_effect_gear.xml"
+     name="gear_btn"
+     top="5"
+     tool_tip="More options"
+     width="18" />
 -->
     <button
      follows="bottom|left"
-- 
cgit v1.2.3


From 4f2f2f90378e5191cd00748c2cc6633af3efd230 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Wed, 19 May 2010 21:14:24 +0100
Subject: EXT-7138 WIP Enable activation of voice effects from the Voice
 Effects floater

---
 indra/newview/skins/default/xui/en/floater_voice_effect.xml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
index 8452fb55b7..1f28a6375f 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
@@ -16,6 +16,9 @@
   <string name="no_voice_effect">
     No Voice Effect
   </string>
+  <string name="get_voice_effects_url">
+    https://secondlife.com/my/account/voice.php
+  </string>
   <string name="new_voice_effect">
     New!
   </string>
@@ -76,10 +79,13 @@
      image_disabled="AddItem_Disabled"
      layout="topleft"
      left="10"
-     name="new_gesture_btn"
-     tool_tip="Make new gesture"
+     name="add_voice_effect_btn"
+     tool_tip="Get more voice effects"
      top="5"
-     width="18" />
+     width="18">
+      <button.commit_callback
+       function="VoiceEffect.Add" />
+    </button>
     <button
      follows="bottom|left"
      font="SansSerifBigBold"
-- 
cgit v1.2.3


From 1a88cb1c392f4f1274db88a8d2cdd35ad6028838 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Wed, 19 May 2010 21:25:41 +0100
Subject: CSX-1753 WIP Set temporary Voice Morphing marketing URL for testing.
 Set to http://secondlife.com/landing/v0icem0rphingt3st Needs updating to
 http://secondlife.com/voicemorphing before launch.

---
 indra/newview/skins/default/xui/en/floater_voice_effect.xml | 2 +-
 indra/newview/skins/default/xui/en/panel_voice_effect.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
index 1f28a6375f..82f816fec1 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
@@ -17,7 +17,7 @@
     No Voice Effect
   </string>
   <string name="get_voice_effects_url">
-    https://secondlife.com/my/account/voice.php
+    http://secondlife.com/landing/v0icem0rphingt3st
   </string>
   <string name="new_voice_effect">
     New!
diff --git a/indra/newview/skins/default/xui/en/panel_voice_effect.xml b/indra/newview/skins/default/xui/en/panel_voice_effect.xml
index dac2f5ebed..dbcb7b64f7 100644
--- a/indra/newview/skins/default/xui/en/panel_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/panel_voice_effect.xml
@@ -9,7 +9,7 @@
     No Voice Effect
   </string>
   <string name="get_voice_effects_url">
-    https://secondlife.com/my/account/voice.php
+    http://secondlife.com/landing/v0icem0rphingt3st
   </string>
   <string name="get_voice_effects">
     Add voice effects  ▶
-- 
cgit v1.2.3


From 927977c5d84473bc9d7c47c767dbdd71951c0267 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Fri, 21 May 2010 18:14:29 +0100
Subject: EXT-7138 WIP Voice Morphing - Added a "My Voice" item to the "Me"
 menu.

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 16c2581d63..5425c545e0 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -80,6 +80,16 @@
              function="Floater.Toggle"
              parameter="gestures" />
         </menu_item_check>
+        <menu_item_check
+         label="My Voice"
+         name="ShowVoice">
+            <menu_item_check.on_check
+             function="Floater.Visible"
+             parameter="voice_effect" />
+            <menu_item_check.on_click
+             function="Floater.Toggle"
+             parameter="voice_effect" />
+        </menu_item_check>
         <menu
          label="My Status"
          name="Status"
-- 
cgit v1.2.3


From 05157c9985d955bb62c9ef897cee6298500c762d Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Sat, 22 May 2010 15:24:08 +0100
Subject: EXT-7138 WIP Voice Morphing Updated "Preview Voice Morphing" and "Get
 Voice Morphing" items in the Voice Effect combo

---
 indra/newview/skins/default/xui/en/floater_voice_effect.xml | 2 +-
 indra/newview/skins/default/xui/en/panel_voice_effect.xml   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
index 82f816fec1..d869f6c610 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
@@ -5,7 +5,7 @@
  height="465"
  name="voice_effects"
  help_topic="voice_effects"
- title="VOICE EFFECTS"
+ title="PREVIEW VOICE MORPHING"
  background_visible="true"
  follows="all"
  label="Places"
diff --git a/indra/newview/skins/default/xui/en/panel_voice_effect.xml b/indra/newview/skins/default/xui/en/panel_voice_effect.xml
index dbcb7b64f7..9e5652d1e2 100644
--- a/indra/newview/skins/default/xui/en/panel_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/panel_voice_effect.xml
@@ -11,11 +11,11 @@
   <string name="get_voice_effects_url">
     http://secondlife.com/landing/v0icem0rphingt3st
   </string>
-  <string name="get_voice_effects">
-    Add voice effects  ▶
-  </string>
   <string name="preview_voice_effects">
-    Preview  ▶
+    Preview Voice Morphing  ▶
+  </string>
+  <string name="get_voice_effects">
+    Get Voice Morphing  ▶
   </string>
   <combo_box
    enabled="false"
-- 
cgit v1.2.3


From 1ebbe196910110eb51497f272abde277f8f0f69a Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Sun, 23 May 2010 02:22:48 +0100
Subject: EXT-7337 WIP Voice morph previewing Separate Play and Stop callbacks,
 to allow single click previews in the effect list.

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

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
index d869f6c610..9a6c21c7f2 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
@@ -153,7 +153,7 @@
    top_delta="0"
    width="135">
     <button.commit_callback
-     function="VoiceEffect.Record" />
+     function="VoiceEffect.Stop" />
   </button>
   <button
    follows="left|bottom"
@@ -177,6 +177,6 @@
    top_delta="0"
    width="135">
     <button.commit_callback
-     function="VoiceEffect.Play" />
+     function="VoiceEffect.Stop" />
   </button>
 </floater>
-- 
cgit v1.2.3


From 49d8b3f5195e854f8b87fd08098b54eeda51b0ae Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Sun, 23 May 2010 02:31:46 +0100
Subject: EXT-7337 WIP Voice morph previewing - Remove redundant play button
 now single-click preview is possible.

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

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
index 9a6c21c7f2..d0c503f7b8 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
@@ -155,6 +155,7 @@
     <button.commit_callback
      function="VoiceEffect.Stop" />
   </button>
+<!--
   <button
    follows="left|bottom"
    height="23"
@@ -179,4 +180,5 @@
     <button.commit_callback
      function="VoiceEffect.Stop" />
   </button>
+-->
 </floater>
-- 
cgit v1.2.3


From 6e98ca08300fad1fa8a4a5ab3996e1a6f8318564 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Sun, 23 May 2010 04:35:31 +0100
Subject: EXT-7337 WIP Voice morph previewing. Remove the activate button in
 the preview floater for now, it doesn't work in capture mode. Remove the
 remains of the play button.

---
 .../skins/default/xui/en/floater_voice_effect.xml  | 65 +++-------------------
 1 file changed, 8 insertions(+), 57 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
index d0c503f7b8..728beece6b 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
@@ -14,11 +14,14 @@
  min_width="240"
  width="313">
   <string name="no_voice_effect">
-    No Voice Effect
+    (No Voice Effect)
   </string>
   <string name="get_voice_effects_url">
     http://secondlife.com/landing/v0icem0rphingt3st
   </string>
+  <string name="active_voice_effect">
+    (Active)
+  </string>
   <string name="new_voice_effect">
     New!
   </string>
@@ -38,8 +41,8 @@
     <scroll_list.columns
      label="New"
      name="new"
-     width="48" />
-	<scroll_list.columns
+     width="64" />
+    <scroll_list.columns
      label="Expires"
      name="expires"
      width="100" />
@@ -86,6 +89,7 @@
       <button.commit_callback
        function="VoiceEffect.Add" />
     </button>
+<!--
     <button
      follows="bottom|left"
      font="SansSerifBigBold"
@@ -102,35 +106,8 @@
       <button.commit_callback
        function="VoiceEffect.Activate" />
     </button>
+-->
   </panel>
-<!--  <panel
-   background_visible="true"
-   bevel_style="none"
-   top_pad="0"
-   follows="left|right|bottom"
-   height="30"
-   label="bottom_panel"
-   layout="topleft"
-   left="0"
-   name="bottom_panel"
-   width="313">
-    <button
-     follows="bottom|left"
-     font="SansSerifBigBold"
-     height="10"
-     image_hover_selected="Activate_Checkmark"
-     image_selected="Activate_Checkmark"
-     image_unselected="Activate_Checkmark"
-     layout="topleft"
-     left="10"
-     name="activate_btn"
-     tool_tip="Activate/Deactivate selected voice effect"
-     top="10"
-     width="10"
-      <button.commit_callback
-       function="VoiceEffect.Activate" />
-    </button>
-  </panel> -->
   <button
    follows="left|bottom"
    height="23"
@@ -155,30 +132,4 @@
     <button.commit_callback
      function="VoiceEffect.Stop" />
   </button>
-<!--
-  <button
-   follows="left|bottom"
-   height="23"
-   label="Play Preview"
-   layout="topleft"
-   left_pad="6"
-   name="play_btn"
-   top_delta="0"
-   width="135">
-    <button.commit_callback
-     function="VoiceEffect.Play" />
-  </button>
-  <button
-   follows="left|bottom"
-   height="23"
-   label="Stop"
-   layout="topleft"
-   left_delta="0"
-   name="play_stop_btn"
-   top_delta="0"
-   width="135">
-    <button.commit_callback
-     function="VoiceEffect.Stop" />
-  </button>
--->
 </floater>
-- 
cgit v1.2.3


From 234b3edc26db7cf87a11fc16d9720bf4a9c20177 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Sun, 23 May 2010 14:11:48 +0100
Subject: EXT-7337 WIP Added explanatory note to the voice morph preview
 floater

---
 .../skins/default/xui/en/floater_voice_effect.xml   | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
index 728beece6b..acd70bce8e 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
@@ -2,7 +2,7 @@
 <floater
  legacy_header_height="18"
  can_resize="true"
- height="465"
+ height="415"
  name="voice_effects"
  help_topic="voice_effects"
  title="PREVIEW VOICE MORPHING"
@@ -26,12 +26,13 @@
     New!
   </string>
   <scroll_list
-   bottom_delta="400"
+   bottom_delta="300"
    draw_heading="true"
    follows="all"
    layout="topleft"
    left="0"
    multi_select="false"
+   tool_tip="Record a sample of your voice, then click an effect to preview."
    top="20"
    name="voice_effect_list">
     <scroll_list.columns
@@ -108,6 +109,21 @@
     </button>
 -->
   </panel>
+  <text
+   height="40"
+   word_wrap="true"
+   use_ellipses="true"
+   type="string"
+   text_color="LabelSelectedDisabledColor"
+   length="1"
+   follows="left|bottom|right"
+   layout="topleft"
+   left="6"
+   name="status_text"
+   top_pad="10"
+   width="300">
+    Record a sample of your voice, and then select an effect to preview. Close this window to return to in-world voice.
+  </text>
   <button
    follows="left|bottom"
    height="23"
@@ -115,6 +131,7 @@
    layout="topleft"
    left="6"
    name="record_btn"
+   tool_tip="Record a sample of your voice."
    top_pad="5"
    width="135">
     <button.commit_callback
-- 
cgit v1.2.3


From 12171ddba3c70b73e53bf103a45779262b38c6ec Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Mon, 24 May 2010 00:20:03 +0100
Subject: EXT-7336 WIP Move the Voice Morphing marketing URL into strings.xml
 so it can be used in notifications as well.

---
 indra/newview/skins/default/xui/en/floater_voice_effect.xml |  3 ---
 indra/newview/skins/default/xui/en/panel_voice_effect.xml   |  3 ---
 indra/newview/skins/default/xui/en/strings.xml              | 10 ++++++----
 3 files changed, 6 insertions(+), 10 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
index acd70bce8e..7335488e73 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
@@ -16,9 +16,6 @@
   <string name="no_voice_effect">
     (No Voice Effect)
   </string>
-  <string name="get_voice_effects_url">
-    http://secondlife.com/landing/v0icem0rphingt3st
-  </string>
   <string name="active_voice_effect">
     (Active)
   </string>
diff --git a/indra/newview/skins/default/xui/en/panel_voice_effect.xml b/indra/newview/skins/default/xui/en/panel_voice_effect.xml
index 9e5652d1e2..9b6548ef9c 100644
--- a/indra/newview/skins/default/xui/en/panel_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/panel_voice_effect.xml
@@ -8,9 +8,6 @@
   <string name="no_voice_effect">
     No Voice Effect
   </string>
-  <string name="get_voice_effects_url">
-    http://secondlife.com/landing/v0icem0rphingt3st
-  </string>
   <string name="preview_voice_effects">
     Preview Voice Morphing  ▶
   </string>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index f8bb36b88a..a54dd02927 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3086,10 +3086,12 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
   <string name="unread_chat_multiple">
     [SOURCES] have said something new
   </string>"
-	<string name="session_initialization_timed_out_error">
-		The session initialization is timed out
-	</string>
-  
+  <string name="session_initialization_timed_out_error">
+    The session initialization is timed out
+  </string>
+
+  <string name="voice_morphing_url">http://secondlife.com/landing/v0icem0rphingt3st</string>
+
   <!-- Financial operations strings -->
   <string name="paid_you_ldollars">[NAME] paid you L$[AMOUNT]</string>
   <string name="you_paid_ldollars">You paid [NAME] L$[AMOUNT] [REASON].</string>
-- 
cgit v1.2.3


From 15c3b2c6309fa4b45376f3d62e33bfcd3ccdbfc7 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Mon, 24 May 2010 02:27:07 +0100
Subject: EXT-7335 WIP Added notification of expiring voice effects

---
 .../newview/skins/default/xui/en/notifications.xml | 33 ++++++++++++++++++++++
 1 file changed, 33 insertions(+)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 999f804e71..6b5659f6c0 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5956,6 +5956,39 @@ We are creating a voice channel for you. This may take up to one minute.
     <unique/>
   </notification>
 
+  <notification
+   icon="notify.tga"
+   name="VoiceEffectsExpired"
+   sound="UISndAlert"
+   persist="true"
+   type="notify">
+Subscribed Voice Effects have expired.
+[[URL] Renew your subscription] to reactivate them.
+    <unique/>
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="VoiceEffectsExpiredInUse"
+   sound="UISndAlert"
+   persist="true"
+   type="notify">
+The active Voice Effect has expired, your normal voice settings have been applied.
+[[URL] Renew your subscription] to reactivate it.
+    <unique/>
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="VoiceEffectsWillExpire"
+   sound="UISndAlert"
+   persist="true"
+   type="notify">
+Voice Effects will expire in less than [INTERVAL] days.
+[[URL] Renew your subscription] or they will be removed.
+    <unique/>
+  </notification>
+
   <notification
    icon="notifytip.tga"
    name="Cannot enter parcel: not a group member"
-- 
cgit v1.2.3


From 40e240fe61fe8ff989ac906969946d22a186bcf2 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Mon, 24 May 2010 03:00:29 +0100
Subject: EXT-7138 WIP Renamed VoiceEffectEnabled debug setting to
 VoiceMorphingEnabled. Hide Me->My Voice menu item when VoiceMorphing is
 disabled. Removed temporary VoiceFontsAvailable debug setting.

---
 indra/newview/skins/default/xui/en/floater_voice_controls.xml | 2 +-
 indra/newview/skins/default/xui/en/menu_viewer.xml            | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
index 216766c3a6..0569b4d515 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -99,7 +99,7 @@
           <panel
            class="panel_voice_effect"
            name="panel_voice_effect"
-           visiblity_control="VoiceEffectEnabled"
+           visiblity_control="VoiceMorphingEnabled"
            filename="panel_voice_effect.xml" />
           <layout_panel
            auto_resize="false"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 5425c545e0..96885bf134 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -82,7 +82,8 @@
         </menu_item_check>
         <menu_item_check
          label="My Voice"
-         name="ShowVoice">
+         name="ShowVoice"
+         visibility_control="VoiceMorphingEnabled">
             <menu_item_check.on_check
              function="Floater.Visible"
              parameter="voice_effect" />
-- 
cgit v1.2.3


From d85464bb3304a112f1dd766428889a919c5715e2 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Mon, 24 May 2010 16:21:56 +0100
Subject: EXT-7138 WIP Don't rebuild the voice effect combo list every time a
 different effect is selected. Added a notification on receiving new voice
 effects.

---
 indra/newview/skins/default/xui/en/notifications.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 6b5659f6c0..b997dee30c 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5988,6 +5988,17 @@ Voice Effects will expire in less than [INTERVAL] days.
 [[URL] Renew your subscription] or they will be removed.
     <unique/>
   </notification>
+		LLNotificationsUtil::add("VoiceEffectsNew");
+
+  <notification
+   icon="notify.tga"
+   name="VoiceEffectsNew"
+   sound="UISndAlert"
+   persist="true"
+   type="notify">
+New Voice Effects are available!
+    <unique/>
+  </notification>
 
   <notification
    icon="notifytip.tga"
-- 
cgit v1.2.3


From cf34437506cabdc54466cdf5010979a61a99154b Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Mon, 24 May 2010 21:29:09 +0100
Subject: EXT-7337 WIP Rearrange controls in the voice morphing preview. Added
 link to marketing page.

---
 .../skins/default/xui/en/floater_voice_effect.xml  | 141 +++++++--------------
 1 file changed, 46 insertions(+), 95 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
index 7335488e73..73e4a694eb 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
@@ -2,7 +2,7 @@
 <floater
  legacy_header_height="18"
  can_resize="true"
- height="415"
+ height="400"
  name="voice_effects"
  help_topic="voice_effects"
  title="PREVIEW VOICE MORPHING"
@@ -12,7 +12,7 @@
  layout="topleft"
  min_height="350"
  min_width="240"
- width="313">
+ width="300">
   <string name="no_voice_effect">
     (No Voice Effect)
   </string>
@@ -22,111 +22,25 @@
   <string name="new_voice_effect">
     New!
   </string>
-  <scroll_list
-   bottom_delta="300"
-   draw_heading="true"
-   follows="all"
-   layout="topleft"
-   left="0"
-   multi_select="false"
-   tool_tip="Record a sample of your voice, then click an effect to preview."
-   top="20"
-   name="voice_effect_list">
-    <scroll_list.columns
-     label="Name"
-     name="name"
-     width="153" />
-    <scroll_list.columns
-     label="New"
-     name="new"
-     width="64" />
-    <scroll_list.columns
-     label="Expires"
-     name="expires"
-     width="100" />
-  </scroll_list>
-  <panel
-   background_visible="true"
-   bevel_style="none"
-   top_pad="0"
-   follows="left|right|bottom"
-   height="30"
-   label="bottom_panel"
-   layout="topleft"
-   left="0"
-   name="bottom_panel"
-   width="313">
-<!--
-    <menu_button
-     follows="bottom|left"
-     height="18"
-     image_disabled="OptionsMenu_Disabled"
-     image_selected="OptionsMenu_Press"
-     image_unselected="OptionsMenu_Off"
-     layout="topleft"
-     left="10"
-     menu_filename="menu_voice_effect_gear.xml"
-     name="gear_btn"
-     top="5"
-     tool_tip="More options"
-     width="18" />
--->
-    <button
-     follows="bottom|left"
-     font="SansSerifBigBold"
-     height="18"
-     image_selected="AddItem_Press"
-     image_unselected="AddItem_Off"
-     image_disabled="AddItem_Disabled"
-     layout="topleft"
-     left="10"
-     name="add_voice_effect_btn"
-     tool_tip="Get more voice effects"
-     top="5"
-     width="18">
-      <button.commit_callback
-       function="VoiceEffect.Add" />
-    </button>
-<!--
-    <button
-     follows="bottom|left"
-     font="SansSerifBigBold"
-     height="10"
-     image_hover_selected="Activate_Checkmark"
-     image_selected="Activate_Checkmark"
-     image_unselected="Activate_Checkmark"
-     layout="topleft"
-     left_pad="5"
-     name="activate_btn"
-     tool_tip="Activate/Deactivate selected voice effect"
-     top="10"
-     width="10">
-      <button.commit_callback
-       function="VoiceEffect.Activate" />
-    </button>
--->
-  </panel>
   <text
    height="40"
    word_wrap="true"
    use_ellipses="true"
    type="string"
-   text_color="LabelSelectedDisabledColor"
-   length="1"
-   follows="left|bottom|right"
+   follows="left|top|right"
    layout="topleft"
-   left="6"
+   left="10"
    name="status_text"
-   top_pad="10"
-   width="300">
+   right="-10"
+   top="25">
     Record a sample of your voice, and then select an effect to preview. Close this window to return to in-world voice.
   </text>
   <button
-   follows="left|bottom"
+   follows="left|top"
    height="23"
    label="Record Sample"
    layout="topleft"
-   left="6"
+   left="5"
    name="record_btn"
    tool_tip="Record a sample of your voice."
    top_pad="5"
@@ -135,7 +49,7 @@
      function="VoiceEffect.Record" />
   </button>
   <button
-   follows="left|bottom"
+   follows="left|top"
    height="23"
    label="Stop"
    layout="topleft"
@@ -146,4 +60,41 @@
     <button.commit_callback
      function="VoiceEffect.Stop" />
   </button>
+  <scroll_list
+   bottom_delta="280"
+   draw_heading="true"
+   follows="all"
+   layout="topleft"
+   left_delta="0"
+   multi_select="false"
+   name="voice_effect_list"
+   right="-5"
+   tool_tip="Record a sample of your voice, then click an effect to preview."
+   top="100">
+    <scroll_list.columns
+     label="Name"
+     name="name"
+     width="120" />
+    <scroll_list.columns
+     label="New"
+     name="new"
+     width="60" />
+    <scroll_list.columns
+     label="Expires"
+     name="expires"
+     width="110" />
+  </scroll_list>
+  <text
+   height="20"
+   word_wrap="true"
+   use_ellipses="true"
+   type="string"
+   follows="left|bottom|right"
+   layout="topleft"
+   left="10"
+   name="voice_morphing_link"
+   right="-10"
+   top_pad="5">
+    [[URL] Get Voice Morphing]
+  </text>
 </floater>
-- 
cgit v1.2.3


From 563ae1c7e029ceef2aed0b85623c2f0a95d38b46 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Tue, 25 May 2010 02:47:28 +0100
Subject: EXT-7337 WIP Replace the new column with a (New!) tag after the voice
 effect name

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

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
index 73e4a694eb..f79d4fd35c 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
@@ -20,7 +20,7 @@
     (Active)
   </string>
   <string name="new_voice_effect">
-    New!
+    (New!)
   </string>
   <text
    height="40"
@@ -72,13 +72,9 @@
    tool_tip="Record a sample of your voice, then click an effect to preview."
    top="100">
     <scroll_list.columns
-     label="Name"
-     name="name"
-     width="120" />
-    <scroll_list.columns
-     label="New"
-     name="new"
-     width="60" />
+     dynamic_width="true"
+     label="Voice Effect"
+     name="name"/>
     <scroll_list.columns
      label="Expires"
      name="expires"
-- 
cgit v1.2.3


From 3e85291fee01680f465198d895d12fef733b146c Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Tue, 25 May 2010 03:36:36 +0100
Subject: EXT-7337 WIP Further tweaking of Voice Effect preview layout

---
 .../skins/default/xui/en/floater_voice_effect.xml  | 51 +++++++++++-----------
 1 file changed, 26 insertions(+), 25 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
index f79d4fd35c..4f4b20066d 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
@@ -11,8 +11,8 @@
  label="Places"
  layout="topleft"
  min_height="350"
- min_width="240"
- width="300">
+ min_width="300"
+ width="455">
   <string name="no_voice_effect">
     (No Voice Effect)
   </string>
@@ -33,18 +33,19 @@
    name="status_text"
    right="-10"
    top="25">
-    Record a sample of your voice, and then select an effect to preview. Close this window to return to in-world voice.
+Record a sample of your voice, and then select an effect to preview.
+Close this window to return to in-world voice.
   </text>
   <button
    follows="left|top"
    height="23"
    label="Record Sample"
    layout="topleft"
-   left="5"
+   left="10"
    name="record_btn"
    tool_tip="Record a sample of your voice."
    top_pad="5"
-   width="135">
+   width="150">
     <button.commit_callback
      function="VoiceEffect.Record" />
   </button>
@@ -56,41 +57,41 @@
    left_delta="0"
    name="record_stop_btn"
    top_delta="0"
-   width="135">
+   width="150">
     <button.commit_callback
      function="VoiceEffect.Stop" />
   </button>
+  <text
+   height="18"
+   halign="right"
+   use_ellipses="true"
+   type="string"
+   follows="left|top|right"
+   layout="topleft"
+   left_pad="10"
+   name="voice_morphing_link"
+   right="-10"
+   top_delta="5">
+    [[URL] Get Voice Morphing]
+  </text>
   <scroll_list
-   bottom_delta="280"
+   bottom="-10"
    draw_heading="true"
    follows="all"
    layout="topleft"
-   left_delta="0"
+   left="10"
    multi_select="false"
    name="voice_effect_list"
-   right="-5"
+   right="-10"
    tool_tip="Record a sample of your voice, then click an effect to preview."
    top="100">
     <scroll_list.columns
-     dynamic_width="true"
      label="Voice Effect"
-     name="name"/>
+     name="name" relative_width="0.41"/>
     <scroll_list.columns
+     dynamic_width="true"
      label="Expires"
      name="expires"
-     width="110" />
+	 relative_width="0.59" />
   </scroll_list>
-  <text
-   height="20"
-   word_wrap="true"
-   use_ellipses="true"
-   type="string"
-   follows="left|bottom|right"
-   layout="topleft"
-   left="10"
-   name="voice_morphing_link"
-   right="-10"
-   top_pad="5">
-    [[URL] Get Voice Morphing]
-  </text>
 </floater>
-- 
cgit v1.2.3


From 485f9abde6b728a923070e392e40c16ea9f05226 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Thu, 27 May 2010 12:53:53 +0100
Subject: EXT-7138 WIP Changed UI text to use "Voice Morph" everywhere instead
 of "Voice Effect". Revised wording in preview floater (DEV-50573). Added
 tool-tip for Voice Morphing control in Nearby Voice (DEV-50608).

---
 .../skins/default/xui/en/floater_voice_effect.xml       | 17 +++++++++--------
 indra/newview/skins/default/xui/en/notifications.xml    | 14 +++++++-------
 .../newview/skins/default/xui/en/panel_voice_effect.xml |  5 +++--
 3 files changed, 19 insertions(+), 17 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
index 4f4b20066d..207397d3dc 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
@@ -2,7 +2,7 @@
 <floater
  legacy_header_height="18"
  can_resize="true"
- height="400"
+ height="420"
  name="voice_effects"
  help_topic="voice_effects"
  title="PREVIEW VOICE MORPHING"
@@ -11,10 +11,10 @@
  label="Places"
  layout="topleft"
  min_height="350"
- min_width="300"
+ min_width="330"
  width="455">
   <string name="no_voice_effect">
-    (No Voice Effect)
+    (No Voice Morph)
   </string>
   <string name="active_voice_effect">
     (Active)
@@ -23,7 +23,7 @@
     (New!)
   </string>
   <text
-   height="40"
+   height="68"
    word_wrap="true"
    use_ellipses="true"
    type="string"
@@ -33,8 +33,9 @@
    name="status_text"
    right="-10"
    top="25">
-Record a sample of your voice, and then select an effect to preview.
-Close this window to return to in-world voice.
+To preview any of the Voice Morphing effects, click the Record button to record a short snippet of voice, then click any Voice Morph in the list to hear how it will sound.
+
+To reconnect to Nearby Voice simply close this window.
   </text>
   <button
    follows="left|top"
@@ -84,9 +85,9 @@ Close this window to return to in-world voice.
    name="voice_effect_list"
    right="-10"
    tool_tip="Record a sample of your voice, then click an effect to preview."
-   top="100">
+   top="128">
     <scroll_list.columns
-     label="Voice Effect"
+     label="Voice Morph"
      name="name" relative_width="0.41"/>
     <scroll_list.columns
      dynamic_width="true"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index b997dee30c..99896e46c9 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5962,8 +5962,8 @@ We are creating a voice channel for you. This may take up to one minute.
    sound="UISndAlert"
    persist="true"
    type="notify">
-Subscribed Voice Effects have expired.
-[[URL] Renew your subscription] to reactivate them.
+One or more of your subscribed Voice Morphs has expired.
+[[URL] Click here] to renew your subscription.
     <unique/>
   </notification>
 
@@ -5973,8 +5973,8 @@ Subscribed Voice Effects have expired.
    sound="UISndAlert"
    persist="true"
    type="notify">
-The active Voice Effect has expired, your normal voice settings have been applied.
-[[URL] Renew your subscription] to reactivate it.
+The active Voice Morph has expired, your normal voice settings have been applied.
+[[URL] Click here] to renew your subscription.
     <unique/>
   </notification>
 
@@ -5984,8 +5984,8 @@ The active Voice Effect has expired, your normal voice settings have been applie
    sound="UISndAlert"
    persist="true"
    type="notify">
-Voice Effects will expire in less than [INTERVAL] days.
-[[URL] Renew your subscription] or they will be removed.
+One or more of your Voice Morphs will expire in less than [INTERVAL] days.
+[[URL] Click here] to renew your subscription.
     <unique/>
   </notification>
 		LLNotificationsUtil::add("VoiceEffectsNew");
@@ -5996,7 +5996,7 @@ Voice Effects will expire in less than [INTERVAL] days.
    sound="UISndAlert"
    persist="true"
    type="notify">
-New Voice Effects are available!
+New Voice Morphs are available!
     <unique/>
   </notification>
 
diff --git a/indra/newview/skins/default/xui/en/panel_voice_effect.xml b/indra/newview/skins/default/xui/en/panel_voice_effect.xml
index 9b6548ef9c..c575ca468c 100644
--- a/indra/newview/skins/default/xui/en/panel_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/panel_voice_effect.xml
@@ -6,7 +6,7 @@
  name="panel_voice_effect"
  width="200">
   <string name="no_voice_effect">
-    No Voice Effect
+    No Voice Morph
   </string>
   <string name="preview_voice_effects">
     Preview Voice Morphing  ▶
@@ -19,10 +19,11 @@
    follows="left|top|right"
    height="23"
    name="voice_effect"
+   tool_tip="Select a Voice Morphing effect to change your voice."
    top_pad="0"
    width="200">
     <combo_box.item
-     label="No Voice Effect"
+     label="No Voice Morph"
      name="no_voice_effect"
 	 top_pad="0"
      value="0" />
-- 
cgit v1.2.3


From 6c3c9c249304d03b86bf703d27b510f6bcc16189 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Thu, 27 May 2010 16:45:29 +0100
Subject: EXT-7138 WIP Indicate unsubscribed Voice Morphs with (Unsubscribed)
 in the expiry date column.

---
 indra/newview/skins/default/xui/en/floater_voice_effect.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
index 207397d3dc..edc25348e4 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
@@ -19,6 +19,9 @@
   <string name="active_voice_effect">
     (Active)
   </string>
+  <string name="unsubscribed_voice_effect">
+    (Unsubscribed)
+  </string>
   <string name="new_voice_effect">
     (New!)
   </string>
-- 
cgit v1.2.3


From af7d4e17aad256d428294841db6d5a54cba8e3f1 Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Thu, 3 Jun 2010 14:54:34 +0300
Subject: EXT-7392 FIXED panel edit outfit, switched location of checkboxes and
 texture pickers

- switched location of checkboxes and texture pickers, updated size of texture pickers
https://jira.secondlife.com/secure/attachment/39898/for+review.jpg

Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/498/

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_edit_alpha.xml      | 89 ++++++++++++----------
 1 file changed, 47 insertions(+), 42 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_edit_alpha.xml b/indra/newview/skins/default/xui/en/panel_edit_alpha.xml
index cfcdc25f81..7bcd4962d2 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_alpha.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_alpha.xml
@@ -21,126 +21,131 @@
       name="avatar_alpha_color_panel"
       top="0"
       width="313" >
+       <check_box
+        control_name="LowerAlphaTextureInvisible"
+        follows="left"
+        height="16"
+        layout="topleft"
+        left="5"
+        name="lower alpha texture invisible"
+        top="10"
+        width="16" />
        <texture_picker
         can_apply_immediately="true"
         default_image_name="Default"
         follows="left|top"
-        height="100"
+        height="115"
         label="Lower Alpha"
         layout="topleft"
-        left="30"
+        left_pad="5"
         name="Lower Alpha"
         tool_tip="Click to choose a picture"
         top="10"
-        width="94" >
+        width="115" >
          <texture_picker.commit_callback
              function="TexturePicker.Commit" />
        </texture_picker>
+
        <check_box
-        control_name="LowerAlphaTextureInvisible"
+        control_name="UpperAlphaTextureInvisible"
         follows="left"
         height="16"
         layout="topleft"
-        left_pad="6"
-        name="lower alpha texture invisible"
-        top_delta="4"
+        left_pad="20"
+        name="upper alpha texture invisible"
+        top="10"
         width="16" />
        <texture_picker
         can_apply_immediately="true"
         default_image_name="Default"
         follows="left|top"
-        height="100"
+        height="115"
         label="Upper Alpha"
         layout="topleft"
-        left_pad="20"
+        left_pad="5"
         name="Upper Alpha"
         tool_tip="Click to choose a picture"
         top="10"
-        width="94">
+        width="115">
          <texture_picker.commit_callback
              function="TexturePicker.Commit" />
        </texture_picker>
+
        <check_box
-        control_name="UpperAlphaTextureInvisible"
+        control_name="HeadAlphaTextureInvisible"
         follows="left"
         height="16"
         layout="topleft"
-        left_pad="6"
-        name="upper alpha texture invisible"
-        top_delta="4"
+        left="5"
+        name="head alpha texture invisible"
+        top_pad="15"
         width="16" />
        <texture_picker
         can_apply_immediately="true"
         default_image_name="Default"
         follows="left|top"
-        height="100"
+        height="115"
         label="Head Alpha"
         layout="topleft"
-        left="30"
+        left_pad="5"
         name="Head Alpha"
         tool_tip="Click to choose a picture"
-        top="120"
-        width="94" >
+        top_delta="0"
+        width="115" >
          <texture_picker.commit_callback
              function="TexturePicker.Commit" />
        </texture_picker>
+
        <check_box
-        control_name="HeadAlphaTextureInvisible"
+        control_name="Eye AlphaTextureInvisible"
         follows="left"
         height="16"
         layout="topleft"
-        left_pad="6"
-        name="head alpha texture invisible"
-        top_delta="4"
+        left_pad="20"
+        name="eye alpha texture invisible"
+        top_delta="0"
         width="16" />
        <texture_picker
         can_apply_immediately="true"
         default_image_name="Default"
         follows="left|top"
-        height="100"
+        height="115"
         label="Eye Alpha"
         layout="topleft"
-        left_pad="20"
+        left_pad="5"
         name="Eye Alpha"
         tool_tip="Click to choose a picture"
-        top="120"
-        width="94" >
+        top_delta="0"
+        width="115" >
          <texture_picker.commit_callback
              function="TexturePicker.Commit" />
        </texture_picker>
+
        <check_box
-        control_name="Eye AlphaTextureInvisible"
+        control_name="HairAlphaTextureInvisible"
         follows="left"
         height="16"
         layout="topleft"
-        left_pad="6"
-        name="eye alpha texture invisible"
-        top_delta="4"
+        left="5"
+        name="hair alpha texture invisible"
+        top_pad="15"
         width="16" />
        <texture_picker
         can_apply_immediately="true"
         default_image_name="Default"
         follows="left|top"
-        height="100"
+        height="115"
         label="Hair Alpha"
         layout="topleft"
         left="30"
         name="Hair Alpha"
         tool_tip="Click to choose a picture"
-        top="230"
-        width="94" >
+        top_delta="0"
+        width="115" >
          <texture_picker.commit_callback
              function="TexturePicker.Commit" />
        </texture_picker>
-       <check_box
-        control_name="HairAlphaTextureInvisible"
-        follows="left"
-        height="16"
-        layout="topleft"
-        left_pad="6"
-        name="hair alpha texture invisible"
-        top_delta="4"
-        width="16" />
+
 	 </panel>
 </panel>
 
-- 
cgit v1.2.3


From 7e0c07b6a64a2e1816cbfe6436215c309af58452 Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Thu, 3 Jun 2010 14:58:16 +0300
Subject: EXT-7527 FIXED added green highlighting for "Add more..." and filter
 buttons (panel outfit edit)

Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/499/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_outfit_edit.xml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index 2ff46637f1..664dce1d71 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -205,6 +205,9 @@ It is calculated as border_size + 2*UIResizeBarOverlap
                     <button
                      follows="left|bottom" 
                      height="22"
+                     image_pressed="PushButton_Press"
+                     image_pressed_selected="PushButton_Selected_Press"
+                     image_selected="PushButton_Selected_Press"
                      is_toggle="true"
                      label="Add More..."
                      layout="topleft"
@@ -227,6 +230,9 @@ It is calculated as border_size + 2*UIResizeBarOverlap
                      follows="bottom|right"
                      height="22"
                      image_overlay="Search_Icon"
+                     image_pressed="PushButton_Press"
+                     image_pressed_selected="PushButton_Selected_Press"
+                     image_selected="PushButton_Selected_Press"
                      is_toggle="true"
                      layout="topleft"
                      name="filter_button"
-- 
cgit v1.2.3


From 7902899df5f22794d5ccd2d977d2cb1361021d5e Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Thu, 3 Jun 2010 16:21:56 +0300
Subject: EXT-7511 FIXED Fixed problems in appearance UI

- Made slight changes in xml according to requirements.

- Added mForceNoLinksOnIcons bool member to LLPanelInventoryListItemBase. It is used in LLPanelWearableListItem to disable showing of link icons as
was requested in ticket.

- Created icon for divider 3 pixels high as asked by Erica in EXT-7233. To properly show and hide it made changes to LLCOFWearables::buildClothingListItem
which now not only showes separator but also reshapes panel depending on its visibility. Increased heights of body parts, dummy clothing and attachment items because
dividers are now 2 pxls higher and they always have dividers. Changed heights of buttons accordingly.

Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/502/

--HG--
branch : product-engine
---
 .../default/xui/en/panel_body_parts_list_item.xml  | 46 ++++++++++-------
 .../default/xui/en/panel_clothing_list_item.xml    | 57 +++++++++++++---------
 .../xui/en/panel_deletable_wearable_list_item.xml  | 27 +++++-----
 .../xui/en/panel_dummy_clothing_list_item.xml      | 26 +++++-----
 4 files changed, 87 insertions(+), 69 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml
index 2edd643cc5..a0bbc8f2ee 100644
--- a/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  follows="top|right|left"
- height="23"
+ height="25"
  layout="topleft"
  left="0"
  name="wearable_item"
@@ -9,22 +9,22 @@
  width="380">
     <icon
      follows="top|right|left"
-     height="23"
+     height="22"
      image_name="ListItem_Over"
      layout="topleft"
      left="0"
      name="hovered_icon"
-     top="0"
+     top="1"
      visible="false"
      width="380" />
     <icon
-     height="23"
+     height="22"
      follows="top|right|left"
      image_name="ListItem_Select"
      layout="topleft"
      left="0"
      name="selected_icon"
-     top="0"
+     top="1"
      visible="false"
      width="380" />
     <icon
@@ -53,7 +53,6 @@
      name="btn_lock"
      layout="topleft"
      follows="top|right"
-     image_name="Locked_Icon"
      top="0"
      left="0"
      height="23"
@@ -70,24 +69,35 @@
          width="9"
          tab_stop="false" />
     </panel>
-    <button 
-     name="btn_edit"
+    <panel
+     background_visible="false"
+     name="btn_edit_panel"
      layout="topleft"
      follows="top|right"
-     image_overlay="Edit_Wrench"
      top="0"
      left_pad="3"
-     height="23"
-     width="23"
-     tab_stop="false" />
-    <panel
-     background_visible="true"
-     bg_alpha_color="0.4 0.4 0.4 1.0"
-     bottom="0"
+     height="24"
+     width="27"
+     tab_stop="false">
+         <button 
+          name="btn_edit"
+          layout="topleft"
+          follows="top|right"
+          image_overlay="Edit_Wrench"
+          top="0"
+          left="0"
+          height="24"
+          width="24"
+          tab_stop="false" />
+      </panel>
+    <icon
      follows="left|right|top"
-     height="1"
+     height="3"
+     image_name="Wearables_Divider"
      layout="bottomleft"
      left="0"
-     name="wearable_type_separator_panel"
+     name="wearable_type_separator_icon"
+     top="3"
+     visible="true"
      width="380"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml
index 035e8607ec..e41141f6bd 100644
--- a/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml
@@ -9,22 +9,22 @@
  width="380">
     <icon
      follows="top|right|left"
-     height="23"
+     height="22"
      image_name="ListItem_Over"
      layout="topleft"
      left="0"
      name="hovered_icon"
-     top="0"
+     top="1"
      visible="false"
      width="380" />
     <icon
-     height="23"
+     height="22"
      follows="top|right|left"
      image_name="ListItem_Select"
      layout="topleft"
      left="0"
      name="selected_icon"
-     top="0"
+     top="1"
      visible="false"
      width="380" />
     <button 
@@ -33,10 +33,10 @@
      follows="top|left"
      image_unselected="Toast_CloseBtn"
      image_selected="Toast_CloseBtn"
-     top="0"
+     top="2"
      left="0"
-     height="20"
-     width="20"
+     height="18"
+     width="18"
      tab_stop="false" />
     <icon
      height="16"
@@ -66,8 +66,8 @@
      image_overlay="UpArrow_Off"
      top="0"
      left="0"
-     height="23"
-     width="23"
+     height="24"
+     width="24"
      tab_stop="false" />
     <button 
      name="btn_move_down"
@@ -76,15 +76,14 @@
      image_overlay="DownArrow_Off"
      top="0"
      left_pad="3"
-     height="23"
-     width="23"
+     height="24"
+     width="24"
      tab_stop="false" />
     <panel
      background_visible="false"
      name="btn_lock"
      layout="topleft"
      follows="top|right"
-     image_name="Locked_Icon"
      top="0"
      left="0"
      height="23"
@@ -101,25 +100,35 @@
          width="9"
          tab_stop="false" />
     </panel>
-    <button 
-     name="btn_edit"
+    <panel
+     background_visible="false"
+     name="btn_edit_panel"
      layout="topleft"
      follows="top|right"
-     image_overlay="Edit_Wrench"
      top="0"
      left_pad="3"
-     height="23"
-     width="23"
-     tab_stop="false" />
-    <panel
-     background_visible="true"
-     bg_alpha_color="0.4 0.4 0.4 1.0"
-     bottom="0"
+     height="24"
+     width="27"
+     tab_stop="false">
+        <button 
+         name="btn_edit"
+         layout="topleft"
+         follows="top|right"
+         image_overlay="Edit_Wrench"
+         top="0"
+         left="0"
+         height="24"
+         width="24"
+         tab_stop="false" />
+      </panel>
+    <icon
      follows="left|right|top"
-     height="1"
+     height="3"
+     image_name="Wearables_Divider"
      layout="bottomleft"
      left="0"
-     name="wearable_type_separator_panel"
+     name="wearable_type_separator_icon"
+     top="0"
      visible="false"
      width="380"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml
index 2f37b9d3c9..b006d125ee 100644
--- a/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  follows="top|right|left"
- height="23"
+ height="25"
  layout="topleft"
  left="0"
  name="deletable_wearable_item"
@@ -9,22 +9,22 @@
  width="380">
     <icon
      follows="top|right|left"
-     height="20"
+     height="22"
      image_name="ListItem_Over"
      layout="topleft"
      left="0"
      name="hovered_icon"
-     top="0"
+     top="1"
      visible="false"
      width="380" />
     <icon
-     height="20"
+     height="22"
      follows="top|right|left"
      image_name="ListItem_Select"
      layout="topleft"
      left="0"
      name="selected_icon"
-     top="0"
+     top="1"
      visible="false"
      width="380" />
     <button 
@@ -33,10 +33,10 @@
      follows="top|left"
      image_unselected="Toast_CloseBtn"
      image_selected="Toast_CloseBtn"
-     top="0"
+     top="2"
      left="0"
-     height="20"
-     width="20"
+     height="18"
+     width="18"
      tab_stop="false" />
     <icon
      height="16"
@@ -59,15 +59,14 @@
      top="4"
      value="..."
      width="359" />
-    <panel
-     background_visible="true"
-     bg_alpha_color="0.4 0.4 0.4 1.0"
-     bottom="0"
+    <icon
      follows="left|right|top"
-     height="1"
+     height="3"
+     image_name="Wearables_Divider"
      layout="bottomleft"
      left="0"
-     name="wearable_type_separator_panel"
+     name="wearable_type_separator_icon"
+     top="3"
      visible="true"
      width="380"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml
index 06371b7489..6c43635d49 100644
--- a/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  follows="top|right|left"
- height="23"
+ height="25"
  layout="topleft"
  left="0"
  name="dummy_clothing_item"
@@ -9,22 +9,22 @@
  width="380">
     <icon
      follows="top|right|left"
-     height="23"
+     height="22"
      image_name="ListItem_Over"
      layout="topleft"
      left="0"
      name="hovered_icon"
-     top="0"
+     top="1"
      visible="false"
      width="380" />
     <icon
-     height="23"
+     height="22"
      follows="top|right|left"
      image_name="ListItem_Select"
      layout="topleft"
      left="0"
      name="selected_icon"
-     top="0"
+     top="1"
      visible="false"
      width="380" />
     <icon
@@ -56,17 +56,17 @@
      image_overlay="AddItem_Off"
      top="0"
      left="0"
-     height="23"
-     width="23"
+     height="24"
+     width="24"
      tab_stop="false" />
-    <panel
-     background_visible="true"
-     bg_alpha_color="0.4 0.4 0.4 1.0"
-     bottom="0"
+    <icon
      follows="left|right|top"
-     height="1"
+     height="3"
+     image_name="Wearables_Divider"
      layout="bottomleft"
      left="0"
-     name="wearable_type_separator_panel"
+     name="wearable_type_separator_icon"
+     top="3"
+     visible="true"
      width="380"/>
 </panel>
-- 
cgit v1.2.3


From 0aca6f91ae3641475527ea932827588da20732ed Mon Sep 17 00:00:00 2001
From: Vladimir Pchelko <pchelko@productengine.com>
Date: Thu, 3 Jun 2010 16:49:55 +0300
Subject: EXT-7474 FIXED Tooltip was added for 'Share' and similar buttons (at
 sidepanel) without 'tool_tip'. Reviewed by Vadim Savchuk at
 https://codereview.productengine.com/secondlife/r/500/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_places.xml        | 2 ++
 indra/newview/skins/default/xui/en/sidepanel_inventory.xml | 5 +++++
 2 files changed, 7 insertions(+)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml
index a7a0efcdb3..33f895e13a 100644
--- a/indra/newview/skins/default/xui/en/panel_places.xml
+++ b/indra/newview/skins/default/xui/en/panel_places.xml
@@ -89,6 +89,7 @@ background_visible="true"
          layout="topleft"
          left_pad="3"
          name="map_btn"
+         tool_tip="Show the corresponding area on the World Map"
          width="85" />
         <button
          follows="bottom|left"
@@ -141,6 +142,7 @@ background_visible="true"
          layout="topleft"
          name="profile_btn"
          right="-1"
+         tool_tip="Show place profile"
          top="1"
          width="111" />
     </panel>
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index 4c42d1f750..6c9acae35e 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -45,6 +45,7 @@
 				 layout="topleft"
 				 left="0"
 				 name="info_btn"
+				 tool_tip="Show object profile"
 				 top="0"
 				 width="102" />
 			<button
@@ -55,6 +56,7 @@
 				 layout="topleft"
 				 left="105"
 				 name="share_btn"
+				 tool_tip="Share an inventory item"
 				 top="0"
 				 width="102" />
 			<button
@@ -65,6 +67,7 @@
 				 layout="topleft"
 				 left="210"
 				 name="shop_btn"
+				 tool_tip="Open Marketplace webpage"
 				 top="0"
 				 width="102" />
 			<button
@@ -75,6 +78,7 @@
 				 layout="topleft"
 				 left="210"
 				 name="wear_btn"
+				 tool_tip="Wear seleceted outfit"
 				 top="0"
 				 width="102" />
 			<button
@@ -95,6 +99,7 @@
 				 layout="topleft"
 				 left="210"
 				 name="teleport_btn"
+				 tool_tip="Teleport to the selected area"
 				 top="0"
 				 width="102" />
 		</panel>
-- 
cgit v1.2.3


From d4b6b04af9ea1429c3a67ec7010aafbd10f46a4d Mon Sep 17 00:00:00 2001
From: Yuri Chebotarev <ychebotarev@productengine.com>
Date: Thu, 3 Jun 2010 17:03:09 +0300
Subject: EXT-7013 FIX due to localization tools restrictions hardcode using of
 special strings for Japanese

reviewed by Mike Antipov https://codereview.productengine.com/secondlife/r/504/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/strings.xml | 21 ++++++++-------------
 indra/newview/skins/default/xui/ja/strings.xml | 18 ------------------
 2 files changed, 8 insertions(+), 31 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 9d7079a495..9b156377a7 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3189,18 +3189,13 @@ Abuse Report</string>
   </string>
 
   <!-- overriding datetime formating. 
-	leave emtpy in for current localization this is not needed 
-	list of values should be separated with ':'
-        example:
-	<string name="dateTimeWeekdaysShortNames">
-	Son:Mon:Tue:Wed:Thu:Fri:Sat
-	</string>  	
+	didn't translate if this is not needed for current localization 
   -->
-  <string name="dateTimeWeekdaysNames"></string>
-  <string name="dateTimeWeekdaysShortNames"></string>
-  <string name="dateTimeMonthNames"></string>
-  <string name="dateTimeMonthShortNames"></string>
-  <string name="dateTimeDayFormat"></string>
-  <string name="dateTimeAM"></string>
-  <string name="dateTimePM"></string>
+  <string name="dateTimeWeekdaysNames">Sunday:Monday:Tuesday:Wednesday:Thursday:Friday:Saturday</string>
+  <string name="dateTimeWeekdaysShortNames">Sun:Mon:Tue:Wed:Thu:Fri:Sat</string>
+  <string name="dateTimeMonthNames">January:February:March:April:May:June:July:August:September:October:November:December</string>
+  <string name="dateTimeMonthShortNames">Jan:Feb:Mar:Apr:May:Jun:Jul:Aug:Sep:Oct:Nov:Dec</string>
+  <string name="dateTimeDayFormat">[MDAY]</string>
+  <string name="dateTimeAM">AM</string>
+  <string name="dateTimePM">PM</string>
   </strings>
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index dfc12bc1cb..d59699552d 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -3762,22 +3762,4 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 	<string name="texture_load_dimensions_error">
 		[WIDTH]*[HEIGHT] 以上の画像は読み込めません
 	</string>
-	<!-- overriding datetime formating. leave emtpy in for current localization this is not needed -->
-	<string name="dateTimeWeekdaysNames">
-	Sunday:Monday:Tuesday:Wednesday:Thursday:Friday:Saturday
-	</string>
-	<string name="dateTimeWeekdaysShortNames">
-	Son:Mon:Tue:Wed:Thu:Fri:Sat
-	</string>
-	<string name="dateTimeMonthNames">
-	January:February:March:April:May:June:July:August:September:October:November:December
-	</string>
-	<string name="dateTimeMonthNames">
-	Jan:Feb:Mar:Apr:May:Jun:Jul:Aug:Sep:Oct:Nov:Dec
-	</string>
-	<string name="dateTimeDayFormat">
-		[MDAY] D
-	</string>
-        <string name="dateTimeAM">AM</string>
-        <string name="dateTimePM">PM</string>
 </strings>
-- 
cgit v1.2.3


From 5609f78f456a2919aa6eba76955a2438689c0689 Mon Sep 17 00:00:00 2001
From: Andrew Polunin <apolunin@gmail.com>
Date: Thu, 3 Jun 2010 18:59:16 +0300
Subject: EXT-5808 FIXED Mini-Location panel was added below Navigation Bar

- Implemented class LLPanelTopInfoBar (llpaneltopinfobar.h, llpaneltopinfobar.cpp, panel_topinfo_bar.xml). Most of it's implementation is borrowed from LLLocationInputCtrl class.
- Mini-Location panel is turned off by default.
- Added top bar context menu option \"Show Mini-Location Panel\".
- Mini-Location panel displays the same context menu as top bar.
- Added code to initialize LLPanelTopInfoBar in llviewerwindow.cpp.
- Added declaration of the widget in main_view.xml

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/464/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/main_view.xml   |  11 +++
 .../skins/default/xui/en/menu_hide_navbar.xml      |  19 +++-
 .../skins/default/xui/en/panel_topinfo_bar.xml     | 102 +++++++++++++++++++++
 3 files changed, 128 insertions(+), 4 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/panel_topinfo_bar.xml

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index b2e4a7ad95..79efb287cd 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -74,6 +74,17 @@
                    mouse_opaque="false"
                 name="hud container"
                    width="500">
+            <panel auto_resize="false"
+                   follows="left|top"
+                   height="19"
+                   left="0"
+                   mouse_opaque="false"
+                   name="topinfo_bar_container"
+                   tab_stop="false"
+                   top="0"
+                   user_resize="false"
+                   visible="false"
+                   width="1024"/>
               <panel follows="right|top|bottom"
                      height="500"
                      mouse_opaque="false"
diff --git a/indra/newview/skins/default/xui/en/menu_hide_navbar.xml b/indra/newview/skins/default/xui/en/menu_hide_navbar.xml
index a175b3103f..3f38d734b9 100644
--- a/indra/newview/skins/default/xui/en/menu_hide_navbar.xml
+++ b/indra/newview/skins/default/xui/en/menu_hide_navbar.xml
@@ -12,10 +12,10 @@
          label="Show Navigation Bar"
          layout="topleft"
          name="ShowNavbarNavigationPanel">
-           <menu_item_check.on_click
+           <on_click
              function="ToggleControl"
              parameter="ShowNavbarNavigationPanel" /> 
-             <menu_item_check.on_check
+             <on_check
              function="CheckControl"
              parameter="ShowNavbarNavigationPanel" />
     </menu_item_check>
@@ -23,11 +23,22 @@
          label="Show Favorites Bar"
          layout="topleft"
          name="ShowNavbarFavoritesPanel">
-           <menu_item_check.on_click
+           <on_click
              function="ToggleControl"
              parameter="ShowNavbarFavoritesPanel" /> 
-             <menu_item_check.on_check
+             <on_check
              function="CheckControl"
              parameter="ShowNavbarFavoritesPanel" />
     </menu_item_check>
+    <menu_item_check
+         label="Show Mini-Location Bar"
+         layout="topleft"
+         name="ShowMiniLocationPanel">
+           <on_click
+             function="ToggleControl"
+             parameter="ShowMiniLocationPanel" />
+             <on_check
+             function="CheckControl"
+             parameter="ShowMiniLocationPanel" />
+    </menu_item_check>
 </menu>
diff --git a/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml b/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml
new file mode 100644
index 0000000000..d3fb77f135
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<panel
+ background_visible="true"
+ background_opaque="false"
+ bg_opaque_color="Black_50"
+ bg_alpha_color="Black_50"
+ follows="left|top|right"
+ height="19"
+ layout="topleft"
+ name="topinfo_bar"
+ width="1024">
+  <button
+    border="true"
+    follows="left|top"
+    height="16"
+    hover_glow_amount="0.15"
+    image_disabled="Info_Off"
+    image_disabled_selected="Info_Off"
+    image_selected="Info_Off"
+    image_unselected="Info_Off"
+    left="11"
+    name="place_info_btn"
+    top="1"
+    width="16"/>
+   <text
+     follows="left|top|right"
+     font="DejaVu"
+     height="16"
+     layout="topleft"
+     left_pad="11"
+     length="1"
+     name="parcel_info_text"
+     top="1"
+     type="string"
+     width="1"/>
+  <icon
+    enabled="true"
+    follows="right|top"
+    height="18"
+    image_name="Parcel_VoiceNo_Light"
+    name="voice_icon"
+    top="1"
+    visible="false"
+    width="22"
+    />
+  <icon
+    follows="right|top"
+    height="18"
+    image_name="Parcel_FlyNo_Light"
+    name="fly_icon"
+    top="1"
+    visible="false"
+    width="22"
+    />
+  <icon
+    follows="right|top"
+    height="18"
+    image_name="Parcel_PushNo_Light"
+    name="push_icon"
+    top="1"
+    visible="false"
+    width="22"
+    />
+  <icon
+    follows="right|top"
+    height="18"
+    image_name="Parcel_BuildNo_Light"
+    name="build_icon"
+    top="1"
+    visible="false"
+    width="22"
+    />
+  <icon
+    follows="right|top"
+    height="18"
+    image_name="Parcel_ScriptsNo_Light"
+    name="scripts_icon"
+    top="1"
+    visible="false"
+    width="22"
+    />
+  <icon
+    follows="right|top"
+    height="13"
+    image_name="Parcel_Health_Dark"
+    left="2"
+    name="damage_icon"
+    top="3"
+    visible="false"
+    width="14"
+    />
+  <text
+    follows="right|top"
+    font="SansSerifSmall"
+    halign="right"
+    height="18"
+    name="damage_text"
+    top="5"
+    visible="false"
+    width="35"
+    />
+</panel>
-- 
cgit v1.2.3


From 24b278237af20f94f2115da94ef065cbb45f3dd2 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Thu, 3 Jun 2010 20:47:18 +0300
Subject: EXT-6844 FIXED Eliminated truncation in Floater World Map

- Switched the order of the two lines such that the longer string (yellow) is below the shorter string (purple)
- Fixed button length in PT locale

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/506/

--HG--
branch : product-engine
---
 .../skins/default/xui/en/floater_world_map.xml     | 28 +++++++++++-----------
 .../skins/default/xui/pt/floater_world_map.xml     |  2 +-
 2 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml
index ad40cafe61..ece406f9b1 100644
--- a/indra/newview/skins/default/xui/en/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_world_map.xml
@@ -178,16 +178,16 @@
      width="90">
         Land Sale
     </text>
-    <icon
-     color="1 1 0.25 1"
+        <icon
+     color="0.5 0.25 1 1"
      follows="top|right"
      height="16"
      image_name="legend.tga"
      layout="topleft"
      mouse_opaque="true"
      name="square2"
-     left="41"
-     top_pad="-2"
+     left="20"
+     top_pad="2"
      width="16" />
     <text
      type="string"
@@ -196,21 +196,21 @@
      height="16"
      layout="topleft"
      left_pad="0"
-     name="by_owner_label"
+     name="auction_label"
      top_delta="3"
-     width="100">
-       by owner
+     width="170">
+        land auction
     </text>
-        <icon
-     color="0.5 0.25 1 1"
+    <icon
+     color="1 1 0.25 1"
      follows="top|right"
      height="16"
      image_name="legend.tga"
      layout="topleft"
      mouse_opaque="true"
      name="square2"
-     left="41"
-     top_pad="-3"
+     left="20"
+     top_pad="-5"
      width="16" />
     <text
      type="string"
@@ -219,10 +219,10 @@
      height="16"
      layout="topleft"
      left_pad="0"
-     name="auction_label"
+     name="by_owner_label"
      top_delta="3"
-     width="170">
-        land auction
+     width="100">
+       by owner
     </text>
 
     <button
diff --git a/indra/newview/skins/default/xui/pt/floater_world_map.xml b/indra/newview/skins/default/xui/pt/floater_world_map.xml
index 65e48b4bfd..878d0b1973 100644
--- a/indra/newview/skins/default/xui/pt/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/pt/floater_world_map.xml
@@ -6,7 +6,7 @@
 		</text>
 	</panel>
 	<panel name="layout_panel_2">
-		<button font="SansSerifSmall" label="Mostra minha localização" label_selected="Mostra minha localização" left_delta="91" name="Show My Location" tool_tip="Centrar o mapa na localização do meu avatar" width="135"/>
+		<button font="SansSerifSmall" label="Mostra minha localização" label_selected="Mostra minha localização" left_delta="91" name="Show My Location" tool_tip="Centrar o mapa na localização do meu avatar" />
 		<text name="me_label">
 			Eu
 		</text>
-- 
cgit v1.2.3


From 3d46c5f53452678ac7539560255165d97e5dc907 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Thu, 3 Jun 2010 20:47:44 +0300
Subject: EXT-7594 FIXED Decreased panel height to eliminate cropping of
 horizontal scrollbar on 'Add Wearable' panel

- Decreased panel height

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/477/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_outfit_edit.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index 664dce1d71..769f9b7bbf 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -300,7 +300,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap
              background_visible="false"
              border="false"
              follows="left|top|right|bottom"
-             height="210"
+             height="203"
              layout="topleft"
              left="0"
              mouse_opaque="false"
@@ -318,7 +318,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap
              height="210"
              left="0"
              mouse_opaque="false"
-             width="311"
+             width="310"
              top_delta="0"
              visible="true">
                 <wearable_items_list
-- 
cgit v1.2.3


From fdee6dd75080fed6304db79221fac2e65d2a4e7a Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Thu, 3 Jun 2010 21:12:37 +0100
Subject: Tidy up indentation around NoVoiceConnect notification in
 notifications.xml

---
 .../newview/skins/default/xui/en/notifications.xml | 59 ++++++++++++----------
 1 file changed, 31 insertions(+), 28 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 5ead756d20..5b06b0d651 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6237,36 +6237,39 @@ Avatar '[NAME]' entered appearance mode.
 Avatar '[NAME]' left appearance mode.
   </notification>
 
-    <notification
+  <notification
    icon="alertmodal.tga"
    name="NoConnect"
    type="alertmodal">
-        We're having trouble connecting using [PROTOCOL] [HOSTID].
-        Please check your network and firewall setup.
-        <form name="form">
-            <button
-               default="true"
-               index="0"
-               name="OK"
-               text="OK"/>
-        </form>
-    </notification>
+We're having trouble connecting using [PROTOCOL] [HOSTID].
+Please check your network and firewall setup.
+    <form name="form">
+      <button
+       default="true"
+       index="0"
+       name="OK"
+       text="OK"/>
+    </form>
+  </notification>
 
-    <notification
-          icon="alertmodal.tga"
-          name="NoVoiceConnect"
-          type="alertmodal">
-        We're having trouble connecting your voiceserver using [HOSTID].
-        Voice communications will not be available.
-        Please check your network and firewall setup.
-        <form name="form">
-            <button
-               default="true"
-               index="0"
-               name="OK"
-               text="OK"/>
-        </form>
-    </notification>
+  <notification
+   icon="alertmodal.tga"
+   name="NoVoiceConnect"
+   type="alertmodal">
+We're having trouble connecting to your voice server:
+
+[HOSTID]
+
+Voice communications will not be available.
+Please check your network and firewall setup.
+    <form name="form">
+      <button
+       default="true"
+       index="0"
+       name="OK"
+       text="OK"/>
+    </form>
+  </notification>
 
   <notification
    icon="notifytip.tga"
@@ -6294,7 +6297,7 @@ Are you sure you want to leave this call?
      name="okcancelignore"
      notext="No"
      yestext="Yes"/>
-     <unique/>
+    <unique/>
   </notification>
 
   <notification
@@ -6311,7 +6314,7 @@ Mute everyone?
      name="okcancelignore"
      yestext="Ok"
      notext="Cancel"/>
-     <unique/>
+    <unique/>
   </notification>
 
   <global name="UnsupportedCPU">
-- 
cgit v1.2.3


From 0312ff71d31cd18cbe0f579ed70a6299f312c277 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Thu, 3 Jun 2010 14:32:04 -0700
Subject: CT-575 WIP DA linguistic

---
 .../newview/skins/default/xui/da/floater_about.xml |   2 +-
 .../skins/default/xui/da/floater_about_land.xml    |   3 +
 .../default/xui/da/floater_avatar_textures.xml     |  73 ++++-----
 indra/newview/skins/default/xui/da/floater_map.xml |   2 +-
 .../skins/default/xui/da/floater_moveview.xml      |  36 ++++-
 .../default/xui/da/floater_preview_notecard.xml    |   4 +-
 .../newview/skins/default/xui/da/floater_tools.xml |  15 +-
 .../skins/default/xui/da/menu_attachment_self.xml  |   2 +-
 .../skins/default/xui/da/menu_avatar_self.xml      |   4 +-
 .../skins/default/xui/da/menu_bottomtray.xml       |   5 +
 .../default/xui/da/menu_inspect_self_gear.xml      |   2 +-
 .../skins/default/xui/da/menu_inventory.xml        |   1 +
 indra/newview/skins/default/xui/da/menu_login.xml  |   2 +-
 .../skins/default/xui/da/menu_participant_list.xml |   4 +-
 indra/newview/skins/default/xui/da/menu_viewer.xml |   4 +-
 .../newview/skins/default/xui/da/notifications.xml | 110 ++++++++++++--
 .../skins/default/xui/da/panel_bottomtray.xml      |  23 ++-
 .../skins/default/xui/da/panel_edit_shape.xml      |  12 +-
 .../skins/default/xui/da/panel_edit_tattoo.xml     |   1 +
 .../skins/default/xui/da/panel_edit_wearable.xml   |   6 +
 .../default/xui/da/panel_group_land_money.xml      |   3 +
 .../skins/default/xui/da/panel_group_notices.xml   |   1 +
 indra/newview/skins/default/xui/da/panel_login.xml |  10 +-
 .../skins/default/xui/da/panel_main_inventory.xml  |  66 ++-------
 .../skins/default/xui/da/panel_outfit_edit.xml     |  15 +-
 .../newview/skins/default/xui/da/panel_people.xml  |  10 +-
 .../default/xui/da/panel_preferences_advanced.xml  |   1 +
 .../default/xui/da/panel_preferences_chat.xml      |   1 +
 .../default/xui/da/panel_preferences_graphics1.xml |   7 +-
 .../skins/default/xui/da/sidepanel_appearance.xml  |   8 +-
 .../skins/default/xui/da/sidepanel_inventory.xml   |   1 +
 indra/newview/skins/default/xui/da/strings.xml     | 164 ++++++++++++++++++++-
 32 files changed, 423 insertions(+), 175 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/da/floater_about.xml b/indra/newview/skins/default/xui/da/floater_about.xml
index 435c7f4907..2e9d003848 100644
--- a/indra/newview/skins/default/xui/da/floater_about.xml
+++ b/indra/newview/skins/default/xui/da/floater_about.xml
@@ -29,7 +29,7 @@ libcurl Version: [LIBCURL_VERSION]
 J2C Decoder Version: [J2C_VERSION]
 Audio Driver Version: [AUDIO_DRIVER_VERSION]
 Qt Webkit Version: [QT_WEBKIT_VERSION]
-Vivox Version: [VIVOX_VERSION]
+Voice Server Version: [VOICE_VERSION]
 	</floater.string>
 	<floater.string name="none">
 		(ingen)
diff --git a/indra/newview/skins/default/xui/da/floater_about_land.xml b/indra/newview/skins/default/xui/da/floater_about_land.xml
index fd1fe4aa19..053fe4d9d9 100644
--- a/indra/newview/skins/default/xui/da/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/da/floater_about_land.xml
@@ -63,6 +63,9 @@
 				Pacel ikke valgt.
 Gå til &apos;Verden&apos; &gt; &apos;Om land&apos; eller vælg en anden parcel for at se detaljer.
 			</panel.string>
+			<panel.string name="time_stamp_template">
+				[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
+			</panel.string>
 			<text name="Name:">
 				Navn:
 			</text>
diff --git a/indra/newview/skins/default/xui/da/floater_avatar_textures.xml b/indra/newview/skins/default/xui/da/floater_avatar_textures.xml
index e405a1beb8..d0d766eaab 100644
--- a/indra/newview/skins/default/xui/da/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/da/floater_avatar_textures.xml
@@ -3,41 +3,48 @@
 	<floater.string name="InvalidAvatar">
 		UGYLDING AVATAR
 	</floater.string>
-	<text name="composite_label">
-		Blandede teksturer
-	</text>
-	<button label="Drop" label_selected="Dump" name="Dump"/>
 	<scroll_container name="profile_scroll">
 		<panel name="scroll_content_panel">
-			<texture_picker label="Hår" name="hair-baked"/>
-			<texture_picker label="Hår" name="hair_grain"/>
-			<texture_picker label="Alpha - hår" name="hair_alpha"/>
-			<texture_picker label="Hoved" name="head-baked"/>
-			<texture_picker label="Makeup" name="head_bodypaint"/>
-			<texture_picker label="Alpha - hoved" name="head_alpha"/>
-			<texture_picker label="Tatovering - hoved" name="head_tattoo"/>
-			<texture_picker label="Eyes" name="eyes-baked"/>
-			<texture_picker label="Øje" name="eyes_iris"/>
-			<texture_picker label="Alpha - øjne" name="eyes_alpha"/>
-			<texture_picker label="Overkrop" name="upper-baked"/>
-			<texture_picker label="Bodypaint - overkrop" name="upper_bodypaint"/>
-			<texture_picker label="Undertrøje" name="upper_undershirt"/>
-			<texture_picker label="Handsker" name="upper_gloves"/>
-			<texture_picker label="Trøje" name="upper_shirt"/>
-			<texture_picker label="Jakke - foroven" name="upper_jacket"/>
-			<texture_picker label="Alpha - øvre" name="upper_alpha"/>
-			<texture_picker label="Tatovering - øvre" name="upper_tattoo"/>
-			<texture_picker label="Ben" name="lower-baked"/>
-			<texture_picker label="Bodypaint - ben" name="lower_bodypaint"/>
-			<texture_picker label="Underbukser" name="lower_underpants"/>
-			<texture_picker label="Strømper" name="lower_socks"/>
-			<texture_picker label="Sko" name="lower_shoes"/>
-			<texture_picker label="Bukser" name="lower_pants"/>
-			<texture_picker label="Jakke" name="lower_jacket"/>
-			<texture_picker label="Alpha - nedre" name="lower_alpha"/>
-			<texture_picker label="Tatovering - nedre" name="lower_tattoo"/>
-			<texture_picker label="Nederdel" name="skirt-baked"/>
-			<texture_picker label="Nederdel" name="skirt"/>
+			<text name="label">
+				Gemte
+teksturer
+			</text>
+			<text name="composite_label">
+				Sammensatte
+teksturer
+			</text>
+			<button label="Vis IDs på skærm" label_selected="Dump" name="Dump"/>
+			<panel name="scroll_content_panel">
+				<texture_picker label="Hår" name="hair-baked"/>
+				<texture_picker label="Hår" name="hair_grain"/>
+				<texture_picker label="Alpha - hår" name="hair_alpha"/>
+				<texture_picker label="Hoved" name="head-baked"/>
+				<texture_picker label="Makeup" name="head_bodypaint"/>
+				<texture_picker label="Alpha - hoved" name="head_alpha"/>
+				<texture_picker label="Tatovering - hovede" name="head_tattoo"/>
+				<texture_picker label="Øjne" name="eyes-baked"/>
+				<texture_picker label="Øje" name="eyes_iris"/>
+				<texture_picker label="Alpha øjne" name="eyes_alpha"/>
+				<texture_picker label="Overkrop" name="upper-baked"/>
+				<texture_picker label="Øverste bodyPaint" name="upper_bodypaint"/>
+				<texture_picker label="Undertrøje" name="upper_undershirt"/>
+				<texture_picker label="Handsker" name="upper_gloves"/>
+				<texture_picker label="Trøje" name="upper_shirt"/>
+				<texture_picker label="Jakke øverst" name="upper_jacket"/>
+				<texture_picker label="Alpha - øverst" name="upper_alpha"/>
+				<texture_picker label="Tatovering - øverst" name="upper_tattoo"/>
+				<texture_picker label="Underkrop" name="lower-baked"/>
+				<texture_picker label="BodyPaint - nederst" name="lower_bodypaint"/>
+				<texture_picker label="Underbukser" name="lower_underpants"/>
+				<texture_picker label="Strømper" name="lower_socks"/>
+				<texture_picker label="Sko" name="lower_shoes"/>
+				<texture_picker label="Bukser" name="lower_pants"/>
+				<texture_picker label="Jakke" name="lower_jacket"/>
+				<texture_picker label="Alpha - nederst" name="lower_alpha"/>
+				<texture_picker label="Tatovering - nederst" name="lower_tattoo"/>
+				<texture_picker label="Nederdel" name="skirt-baked"/>
+				<texture_picker label="Nederdel" name="skirt"/>
+			</panel>
 		</panel>
 	</scroll_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/floater_map.xml b/indra/newview/skins/default/xui/da/floater_map.xml
index 82897d545a..cd6c03058b 100644
--- a/indra/newview/skins/default/xui/da/floater_map.xml
+++ b/indra/newview/skins/default/xui/da/floater_map.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Map" title="Mini-kort">
+<floater name="Map" title="">
 	<floater.string name="mini_map_north">
 		N
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/da/floater_moveview.xml b/indra/newview/skins/default/xui/da/floater_moveview.xml
index 8385924bda..14d3604b43 100644
--- a/indra/newview/skins/default/xui/da/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/da/floater_moveview.xml
@@ -6,18 +6,48 @@
 	<string name="walk_back_tooltip">
 		Gå baglæns (Tryk på Ned piletast eller S)
 	</string>
+	<string name="walk_left_tooltip">
+		Gå til venstre (tryk Shift + venstre pil eller A)
+	</string>
+	<string name="walk_right_tooltip">
+		Gå til højre (tryk Shift + højre pil eller D)
+	</string>
 	<string name="run_forward_tooltip">
 		Løb forlæns (Tryk på Op piletast eller W)
 	</string>
 	<string name="run_back_tooltip">
 		Løb baglæns (Tryk på Ned piletast eller S)
 	</string>
+	<string name="run_left_tooltip">
+		Løb til venstre (tryk Shift + venstre pil eller A)
+	</string>
+	<string name="run_right_tooltip">
+		Løb til højre (tryk Shift + højre pil eller D)
+	</string>
 	<string name="fly_forward_tooltip">
 		Flyv frem (Tryk på Op piletast eller W)
 	</string>
 	<string name="fly_back_tooltip">
 		Flyv baglæns (Tryk på Ned piletast eller S)
 	</string>
+	<string name="fly_left_tooltip">
+		Flyv til venstre (tryk Shift + venstre pil eller A)
+	</string>
+	<string name="fly_right_tooltip">
+		Flyv til højre (tryk Shift + højre pil eller D)
+	</string>
+	<string name="fly_up_tooltip">
+		Flyv op (tryk E)
+	</string>
+	<string name="fly_down_tooltip">
+		Flyv ned (tryk C)
+	</string>
+	<string name="jump_tooltip">
+		Hop (tryk E)
+	</string>
+	<string name="crouch_tooltip">
+		Kryb (tryk C)
+	</string>
 	<string name="walk_title">
 		Gå
 	</string>
@@ -28,10 +58,12 @@
 		Flyv
 	</string>
 	<panel name="panel_actions">
+		<button label="" label_selected="" name="move up btn" tool_tip="Flyv op (tryk E)"/>
 		<button label="" label_selected="" name="turn left btn" tool_tip="xxx     Drej til venstre (Tryk på venstre piletast eller A)"/>
+		<joystick_slide name="move left btn" tool_tip="Gå til venstre (tryk Shift + venstre pil eller A)"/>
+		<button label="" label_selected="" name="move down btn" tool_tip="Flyv ned (tryk C)"/>
 		<button label="" label_selected="" name="turn right btn" tool_tip="Drej til højre (Tryk på højre piletast eller D)"/>
-		<button label="" label_selected="" name="move up btn" tool_tip="Flyv op, tryk E"/>
-		<button label="" label_selected="" name="move down btn" tool_tip="Flyv ned, tryk C"/>
+		<joystick_slide name="move right btn" tool_tip="Gå til højre (tryk Shift + højre pil eller D)"/>
 		<joystick_turn name="forward btn" tool_tip="Gå frem (Tryk på Op piletast eller W)"/>
 		<joystick_turn name="backward btn" tool_tip="Gå tilbage (Tryk på Ned piletast eller S)"/>
 	</panel>
diff --git a/indra/newview/skins/default/xui/da/floater_preview_notecard.xml b/indra/newview/skins/default/xui/da/floater_preview_notecard.xml
index e600a774ec..5a0f5a32c0 100644
--- a/indra/newview/skins/default/xui/da/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/da/floater_preview_notecard.xml
@@ -9,9 +9,6 @@
 	<floater.string name="Title">
 		Note: [NAME]
 	</floater.string>
-	<floater.string label="Gem" label_selected="Gem" name="Save">
-		Gem
-	</floater.string>
 	<text name="desc txt">
 		Beskrivelse:
 	</text>
@@ -19,4 +16,5 @@
 		Indlæser...
 	</text_editor>
 	<button label="Gem" label_selected="Gem" name="Save"/>
+	<button label="Slet" label_selected="Slet" name="Delete"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/floater_tools.xml b/indra/newview/skins/default/xui/da/floater_tools.xml
index b501722e92..a84af9adc0 100644
--- a/indra/newview/skins/default/xui/da/floater_tools.xml
+++ b/indra/newview/skins/default/xui/da/floater_tools.xml
@@ -67,8 +67,8 @@
 	<text name="RenderingCost" tool_tip="Hvis beregnede rendering omkostninger for dette objekt">
 		þ: [COUNT]
 	</text>
-	<check_box name="checkbox uniform"/>
-	<text name="checkbox uniform label">
+	<check_box label="" name="checkbox uniform"/>
+	<text label="Stræk begge sider" name="checkbox uniform label">
 		Stræk begge sider
 	</text>
 	<check_box initial_value="true" label="Stræk teksturer" name="checkbox stretch textures"/>
@@ -443,8 +443,6 @@
 			<check_box label="Vend" name="checkbox flip s"/>
 			<spinner label="Lodret (V)" name="TexScaleV"/>
 			<check_box label="Vend" name="checkbox flip t"/>
-			<spinner label="Rotation˚"/>
-			<spinner label="Gentagelser pr. m."/>
 			<button label="Gem" label_selected="Gem" left_delta="62" name="button apply"/>
 			<text name="tex offset">
 				Tekstur offset
@@ -477,14 +475,7 @@
 			Areal: [AREA] m²
 		</text>
 		<button label="Om land" label_selected="Om land" name="button about land"/>
-		<check_box label="Vis ejere" name="checkbox show owners" tool_tip="Farver grunde afhængigt af ejerskab: 
-
-Grøn = Dit land 
-Turkis = Din gruppes land 
-Rød = Ejet af andre 
-Gul = Til salg 
-Lilla = På auktion 
-Grå = Offentligt ejet"/>
+		<check_box label="Vis ejere" name="checkbox show owners" tool_tip="Farver grunde afhængigt af ejerskab:   Grøn = Dit land  Turkis = Din gruppes land  Rød = Ejet af andre  Gul = Til salg  Lilla = På auktion  Grå = Offentligt ejet"/>
 		<text name="label_parcel_modify">
 			Redigere grund
 		</text>
diff --git a/indra/newview/skins/default/xui/da/menu_attachment_self.xml b/indra/newview/skins/default/xui/da/menu_attachment_self.xml
index d8bd78fa23..bf52e5d57f 100644
--- a/indra/newview/skins/default/xui/da/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/da/menu_attachment_self.xml
@@ -5,7 +5,7 @@
 	<menu_item_call label="Tag af" name="Detach"/>
 	<menu_item_call label="Smid" name="Drop"/>
 	<menu_item_call label="Stå op" name="Stand Up"/>
-	<menu_item_call label="Udseende" name="Appearance..."/>
+	<menu_item_call label="Skift sæt" name="Change Outfit"/>
 	<menu_item_call label="Venner" name="Friends..."/>
 	<menu_item_call label="Grupper" name="Groups..."/>
 	<menu_item_call label="Profil" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/da/menu_avatar_self.xml b/indra/newview/skins/default/xui/da/menu_avatar_self.xml
index 39f3e49702..ec85bd05a5 100644
--- a/indra/newview/skins/default/xui/da/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/da/menu_avatar_self.xml
@@ -20,7 +20,9 @@
 		<context_menu label="Tag af  ▶" name="Object Detach"/>
 		<menu_item_call label="Tag alt af" name="Detach All"/>
 	</context_menu>
-	<menu_item_call label="Udseende" name="Appearance..."/>
+	<menu_item_call label="Skift sæt" name="Chenge Outfit"/>
+	<menu_item_call label="Redigér mit sæt" name="Edit Outfit"/>
+	<menu_item_call label="Redigér min form" name="Edit My Shape"/>
 	<menu_item_call label="Venner" name="Friends..."/>
 	<menu_item_call label="Grupper" name="Groups..."/>
 	<menu_item_call label="Profil" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/da/menu_bottomtray.xml b/indra/newview/skins/default/xui/da/menu_bottomtray.xml
index dbdeefeaff..e979e35a91 100644
--- a/indra/newview/skins/default/xui/da/menu_bottomtray.xml
+++ b/indra/newview/skins/default/xui/da/menu_bottomtray.xml
@@ -4,6 +4,11 @@
 	<menu_item_check label="Bevægelse knap" name="ShowMoveButton"/>
 	<menu_item_check label="Vis knap" name="ShowCameraButton"/>
 	<menu_item_check label="Foto knap" name="ShowSnapshotButton"/>
+	<menu_item_check label="Sidepanel knap" name="ShowSidebarButton"/>
+	<menu_item_check label="Bygge knap" name="ShowBuildButton"/>
+	<menu_item_check label="Søge knap" name="ShowSearchButton"/>
+	<menu_item_check label="Kort knap" name="ShowWorldMapButton"/>
+	<menu_item_check label="Mini-Map button" name="ShowMiniMapButton"/>
 	<menu_item_call label="Klip" name="NearbyChatBar_Cut"/>
 	<menu_item_call label="Kopiér" name="NearbyChatBar_Copy"/>
 	<menu_item_call label="Sæt ind" name="NearbyChatBar_Paste"/>
diff --git a/indra/newview/skins/default/xui/da/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/da/menu_inspect_self_gear.xml
index aeef2ccb23..c226d06404 100644
--- a/indra/newview/skins/default/xui/da/menu_inspect_self_gear.xml
+++ b/indra/newview/skins/default/xui/da/menu_inspect_self_gear.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu name="Gear Menu">
 	<menu_item_call label="Stå op" name="stand_up"/>
-	<menu_item_call label="Udseende" name="my_appearance"/>
+	<menu_item_call label="Skift sæt" name="change_outfit"/>
 	<menu_item_call label="Profil" name="my_profile"/>
 	<menu_item_call label="Venner" name="my_friends"/>
 	<menu_item_call label="Grupper" name="my_groups"/>
diff --git a/indra/newview/skins/default/xui/da/menu_inventory.xml b/indra/newview/skins/default/xui/da/menu_inventory.xml
index 0ea21dc409..ff70ec7886 100644
--- a/indra/newview/skins/default/xui/da/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/da/menu_inventory.xml
@@ -52,6 +52,7 @@
 	<menu_item_call label="Slet ting" name="Purge Item"/>
 	<menu_item_call label="Genskab ting" name="Restore Item"/>
 	<menu_item_call label="åben" name="Open"/>
+	<menu_item_call label="Åben original" name="Open Original"/>
 	<menu_item_call label="Egenskaber" name="Properties"/>
 	<menu_item_call label="Omdøb" name="Rename"/>
 	<menu_item_call label="Kopiér asset UUID" name="Copy Asset UUID"/>
diff --git a/indra/newview/skins/default/xui/da/menu_login.xml b/indra/newview/skins/default/xui/da/menu_login.xml
index 36e82e8bc4..1231c4c08d 100644
--- a/indra/newview/skins/default/xui/da/menu_login.xml
+++ b/indra/newview/skins/default/xui/da/menu_login.xml
@@ -2,7 +2,7 @@
 <menu_bar name="Login Menu">
 	<menu label="Mig" name="File">
 		<menu_item_call label="Indstillinger" name="Preferences..."/>
-		<menu_item_call label="Afslut" name="Quit"/>
+		<menu_item_call label="Afslut [APP_NAME]" name="Quit"/>
 	</menu>
 	<menu label="Hjælp" name="Help">
 		<menu_item_call label="[SECOND_LIFE] hjælp" name="Second Life Help"/>
diff --git a/indra/newview/skins/default/xui/da/menu_participant_list.xml b/indra/newview/skins/default/xui/da/menu_participant_list.xml
index 02b7e8466b..2bd28e10de 100644
--- a/indra/newview/skins/default/xui/da/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/da/menu_participant_list.xml
@@ -14,8 +14,8 @@
 	<context_menu label="Moderator muligheder &gt;" name="Moderator Options">
 		<menu_item_check label="Tillad tekst chat" name="AllowTextChat"/>
 		<menu_item_call label="Sluk for denne deltager" name="ModerateVoiceMuteSelected"/>
-		<menu_item_call label="Sluk for alle andre" name="ModerateVoiceMuteOthers"/>
 		<menu_item_call label="Fjern slukning for denne deltager" name="ModerateVoiceUnMuteSelected"/>
-		<menu_item_call label="Fjern slukning for alle andre" name="ModerateVoiceUnMuteOthers"/>
+		<menu_item_call label="Sluk lyd for alle" name="ModerateVoiceMute"/>
+		<menu_item_call label="Tænd lyd for alle" name="ModerateVoiceUnmute"/>
 	</context_menu>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/da/menu_viewer.xml b/indra/newview/skins/default/xui/da/menu_viewer.xml
index e195ebfeed..a061292eb0 100644
--- a/indra/newview/skins/default/xui/da/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/da/menu_viewer.xml
@@ -5,7 +5,7 @@
 		<menu_item_call label="Mit instrumentpanel" name="Manage My Account"/>
 		<menu_item_call label="Køb L$" name="Buy and Sell L$"/>
 		<menu_item_call label="Profil" name="Profile"/>
-		<menu_item_call label="Udseende" name="Appearance"/>
+		<menu_item_call label="Skift sæt" name="ChangeOutfit"/>
 		<menu_item_check label="Beholdning" name="Inventory"/>
 		<menu_item_check label="Min beholdning" name="ShowSidetrayInventory"/>
 		<menu_item_check label="Mine bevægelser" name="Gestures"/>
@@ -160,6 +160,7 @@
 			<menu_item_check label="Fleksible objekter" name="Flexible Objects"/>
 		</menu>
 		<menu_item_check label="Kør flere &apos;threats&apos;" name="Run Multiple Threads"/>
+		<menu_item_check label="Benyt &quot;Plugin Read Thread&quot;" name="Use Plugin Read Thread"/>
 		<menu_item_call label="Tøm gruppe cache" name="ClearGroupCache"/>
 		<menu_item_check label="Muse udjævning" name="Mouse Smoothing"/>
 		<menu label="Shortcuts" name="Shortcuts">
@@ -186,7 +187,6 @@
 			<menu_item_call label="Zoom ind" name="Zoom In"/>
 			<menu_item_call label="Zoom standard" name="Zoom Default"/>
 			<menu_item_call label="Zoom ud" name="Zoom Out"/>
-			<menu_item_call label="Skift fuld-skærm" name="Toggle Fullscreen"/>
 		</menu>
 		<menu_item_call label="Vis debug valg" name="Debug Settings"/>
 		<menu_item_check label="Vis udviklingsmenu" name="Debug Mode"/>
diff --git a/indra/newview/skins/default/xui/da/notifications.xml b/indra/newview/skins/default/xui/da/notifications.xml
index afccc1e904..72a1ab6a29 100644
--- a/indra/newview/skins/default/xui/da/notifications.xml
+++ b/indra/newview/skins/default/xui/da/notifications.xml
@@ -208,6 +208,9 @@ Du skal skrive både fornavn og efternavn på din figur.
 Du har brug for en konto for at logge ind i [SECOND_LIFE]. Vil du oprette en nu?
 		<usetemplate name="okcancelbuttons" notext="Prøv igen" yestext="Lav ny konto"/>
 	</notification>
+	<notification name="InvalidCredentialFormat">
+		Du skal indtaste både fornavn og efternavn i din avatars brugernavn felt og derefter logge på igen.
+	</notification>
 	<notification name="AddClassified">
 		Annoncer vil vises i &apos;Annoncer&apos; sektionen i søge biblioteket og på [http://secondlife.com/community/classifieds secondlife.com] i en uge.
 Udfyld din annonce og klik på &apos;Udgiv...&apos; for at tilf&apos;je den til biblioteket.				
@@ -279,6 +282,11 @@ Gå til [_URL] for information om køb af L$?
 	<notification name="CannotEncodeFile">
 		Kunne ikke &apos;forstå&apos; filen: [FILE]
 	</notification>
+	<notification name="CorruptedProtectedDataStore">
+		Vi kan ikke læse dine beskyttede data så de nulstilles.
+   Dette kan ske hvis du ændrer din netværksopsætning.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="DoNotSupportBulkAnimationUpload">
 		[APP_NAME] understøtter p.t. ikke at send flere animationsfiler ad gangen.
 	</notification>
@@ -404,6 +412,12 @@ Tilbyd venskab til [NAME]?
 			<button name="Cancel" text="Annullér"/>
 		</form>
 	</notification>
+	<notification name="ConfirmItemDeleteHasLinks">
+		Mindst en af genstandene har lænkede genstande der peger på den. Hvis du sletter denne genstand, vil lænkninger ikke virke mere.  Det anbefales kraftigt at fjerne lænkninger først.
+
+Er du sikker på at du vil slette disse genstande?
+		<usetemplate name="okcancelbuttons" notext="Annullér" yestext="OK"/>
+	</notification>
 	<notification name="ErrorMessage">
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
@@ -438,6 +452,42 @@ Vend tilbage til [http://join.secondlife.com secondlife.com] for at oprette en n
 
 Du kan enten checke din Internet forbindelse og prøve igen om lidt, klikke på Hjælp for at se [SUPPORT_SITE] siden, eller klikke på Teleport for at forsøge at teleportere hjem.
 	</notification>
+	<notification name="CantTeleportToGrid">
+		Kunne ikke teleportere til [SLURL] da den er på et andet net ([GRID]) end det nuværende net ([CURRENT_GRID]).  Luk venligst din klient og prøv igen.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="GeneralCertificateError">
+		Kunne ikke opnå forbindelse til server.
+[REASON]
+
+Vedrørende: [SUBJECT_NAME_STRING]
+Fra: [ISSUER_NAME_STRING]
+Valid fra: [VALID_FROM]
+Valid til: [VALID_TO]
+MD5 Fingerprint: [SHA1_DIGEST]
+SHA1 Fingerprint: [MD5_DIGEST]
+Key Usage: [KEYUSAGE]
+Extended Key Usage: [EXTENDEDKEYUSAGE]
+Subject Key Identifier: [SUBJECTKEYIDENTIFIER]
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="TrustCertificateError">
+		Certifikationsmyndighed for denne server er ikke kendt.
+
+Certifikat information:
+Vedrørende: [SUBJECT_NAME_STRING]
+Fra: [ISSUER_NAME_STRING]
+Valid fra: [VALID_FROM]
+Valid til: [VALID_TO]
+MD5 Fingerprint: [SHA1_DIGEST]
+SHA1 Fingerprint: [MD5_DIGEST]
+Key Usage: [KEYUSAGE]
+Extended Key Usage: [EXTENDEDKEYUSAGE]
+Subject Key Identifier: [SUBJECTKEYIDENTIFIER]
+
+Ønsker du at stole på denne myndighed?
+		<usetemplate name="okcancelbuttons" notext="Annullér" yestext="Stol på"/>
+	</notification>
 	<notification name="NotEnoughCurrency">
 		[NAME] L$ [PRICE] Du har ikke nok L$ til dette.
 	</notification>
@@ -627,9 +677,9 @@ Gå til &apos;Knowledge Base&apos; for mere information om indholdsratings.
 		Du har ikke adgang til denne region på grund af din valgte indholdsrating.
 	</notification>
 	<notification name="RegionEntryAccessBlocked_Change">
-		Du har ikke adgang til denne region på grund af din indholdsrating præferencer.
+		Du har ikke adgang til den region, da din indholdsrating ikke tillader dette.
 
-Du kan klikke på &apos;Ændre præference&apos; for at ændre din indholdsrating nu og dermed opnå adgang. Du vil så få mulighed for at søge og tilgå [REGIONMATURITY] fra da af. Hvis du senere ønsker at ændre denne opsætning tilbage, gå til Mig &gt; Indstillinger &gt; Generelt.
+Klik på &quot;Ændre præference&quot; for at forhøje din indholdsrating for direkte adgang nu. Ved at gøre dette vil du få lov til at søge og få adgang til [REGIONMATURITY] indhold. Hvis du ønsker at ændre denne opsætning senere, kan du gøre dette fra Mig &gt; Indstillinger &gt; Generelt.
 		<form name="form">
 			<button name="OK" text="Ændre indstillinger"/>
 			<button name="Cancel" text="Luk"/>
@@ -1169,15 +1219,6 @@ Prøv igen om lidt.
 	</notification>
 	<notification name="ObjectGiveItem">
 		Et objekt med navnet [OBJECTFROMNAME] ejet af [NAME_SLURL] har givet dig denne/dette [OBJECTTYPE]:
-[ITEM_SLURL]
-		<form name="form">
-			<button name="Keep" text="Behold"/>
-			<button name="Discard" text="Smid væk"/>
-			<button name="Mute" text="Blokér"/>
-		</form>
-	</notification>
-	<notification name="ObjectGiveItemUnknownUser">
-		Et objekt med navnet [OBJECTFROMNAME] ejet af (en ukendt beboer) har givet dig denne/dette [OBJECTTYPE]:
 [ITEM_SLURL]
 		<form name="form">
 			<button name="Keep" text="Behold"/>
@@ -1487,8 +1528,53 @@ Knappen vil blive vist når der er nok plads til den.
 	<notification name="ShareNotification">
 		Træk genstande fra beholdning til en person i beboer vælgeren
 	</notification>
+	<notification name="DeedToGroupFail">
+		Dedikering til gruppe fejlede.
+	</notification>
 	<notification name="AvatarRezNotification">
-		Avatar &apos;[NAME]&apos; rezzed på [TIME] sekunder.
+		( [EXISTENCE] sekunder i live )
+Avatar &apos;[NAME]&apos; declouded in [TIME] seconds.
+	</notification>
+	<notification name="AvatarRezSelfNotification">
+		( [EXISTENCE] sekunder i live )
+Du afsluttede klargøring af dit sæt på [TIME] sekunder.
+	</notification>
+	<notification name="AvatarRezCloudNotification">
+		( [EXISTENCE] sekunder i live )
+Avatar &apos;[NAME]&apos; blev til &quot;sky&quot;.
+	</notification>
+	<notification name="AvatarRezArrivedNotification">
+		( [EXISTENCE] sekunder i live )
+Avatar &apos;[NAME]&apos; appeared.
+	</notification>
+	<notification name="AvatarRezLeftCloudNotification">
+		( [EXISTENCE] sekunder i live )
+Avatar &apos;[NAME]&apos; forsvandt efter [TIME] sekunder som &quot;sky&quot;.
+	</notification>
+	<notification name="AvatarRezEnteredAppearanceNotification">
+		( [EXISTENCE] sekunder i live )
+Avatar &apos;[NAME]&apos; skiftede til udseende modus.
+	</notification>
+	<notification name="AvatarRezLeftAppearanceNotification">
+		( [EXISTENCE] sekunder i live )
+Avatar &apos;[NAME]&apos; har forladt udseende modus.
+	</notification>
+	<notification name="AvatarRezLeftNotification">
+		( [EXISTENCE] sekunder i live )
+Avatar &apos;[NAME]&apos; forsvandt helt &quot;uploaded&quot;.
+	</notification>
+	<notification name="ConfirmLeaveCall">
+		Er du sikker på at du vil forlade dette opkald?
+		<usetemplate ignoretext="Bekræft før jeg forlader opkald" name="okcancelignore" notext="Nej" yestext="Ja"/>
+	</notification>
+	<notification name="ConfirmMuteAll">
+		Du har valgt at slukke for lyden for alle deltagere i gruppeopkaldet.
+Dette vil også betyde, at alle beboere der slutter sig til opkaldet
+vil have lyden slukket - selv efter de har forladt kaldet.
+
+
+Sluk for alles lyd?
+		<usetemplate ignoretext="Bekræft før jeg slukker for alle deltageres lyd i gruppe-kald" name="okcancelignore" notext="OK" yestext="Annullér"/>
 	</notification>
 	<global name="UnsupportedGLRequirements">
 		Det ser ikke ud til at din hardware opfylder minimumskravene til [APP_NAME]. [APP_NAME] kræver et OpenGL grafikkort som understøter &apos;multitexture&apos;. Check eventuelt om du har de nyeste drivere for grafikkortet, og de nyeste service-packs og patches til dit operativsystem.
diff --git a/indra/newview/skins/default/xui/da/panel_bottomtray.xml b/indra/newview/skins/default/xui/da/panel_bottomtray.xml
index 4a038e89ba..2d288a9494 100644
--- a/indra/newview/skins/default/xui/da/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/da/panel_bottomtray.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="bottom_tray">
-	<string name="SpeakBtnToolTip">
-		Slukker/tænder mikrofon
-	</string>
-	<string name="VoiceControlBtnToolTip">
-		Skjuler/viser stemme kontrol panel
-	</string>
+	<string name="SpeakBtnToolTip" value="Slå mikrofon til/fra"/>
+	<string name="VoiceControlBtnToolTip" value="Vis/skjul stemme kontrolpanel"/>
 	<layout_stack name="toolbar_stack">
 		<layout_panel name="speak_panel">
 			<talk_button name="talk">
@@ -24,6 +20,21 @@
 		<layout_panel name="snapshot_panel">
 			<button label="" name="snapshots" tool_tip="Tag foto"/>
 		</layout_panel>
+		<layout_panel name="sidebar_btn_panel">
+			<button label="Sidepanel" name="sidebar_btn" tool_tip="Vis/skjul sidepanel"/>
+		</layout_panel>
+		<layout_panel name="build_btn_panel">
+			<button label="Byg" name="build_btn" tool_tip="Vis/skjul byggeværktøjer"/>
+		</layout_panel>
+		<layout_panel name="search_btn_panel">
+			<button label="Søg" name="search_btn" tool_tip="Vis/skjul søgning"/>
+		</layout_panel>
+		<layout_panel name="world_map_btn_panel">
+			<button label="Kort" name="world_map_btn" tool_tip="Vis/skjul verdenskort"/>
+		</layout_panel>
+		<layout_panel name="mini_map_btn_panel">
+			<button label="Mini-kort" name="mini_map_btn" tool_tip="Vis/skjul Mini-kort"/>
+		</layout_panel>
 		<layout_panel name="im_well_panel">
 			<chiclet_im_well name="im_well">
 				<button name="Unread IM messages" tool_tip="Konversationer"/>
diff --git a/indra/newview/skins/default/xui/da/panel_edit_shape.xml b/indra/newview/skins/default/xui/da/panel_edit_shape.xml
index 1c8567d27c..4360fe35f5 100644
--- a/indra/newview/skins/default/xui/da/panel_edit_shape.xml
+++ b/indra/newview/skins/default/xui/da/panel_edit_shape.xml
@@ -1,14 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_shape_panel">
-	<panel name="avatar_sex_panel">
-		<text name="gender_text">
-			Køn:
-		</text>
-		<radio_group name="sex_radio">
-			<radio_item label="Kvinde" name="radio"/>
-			<radio_item label="Mand" name="radio2"/>
-		</radio_group>
-	</panel>
+	<text name="avatar_height">
+		[HEIGHT] meter høj
+	</text>
 	<panel label="Trøje" name="accordion_panel">
 		<accordion name="wearable_accordion">
 			<accordion_tab name="shape_body_tab" title="Krop"/>
diff --git a/indra/newview/skins/default/xui/da/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/da/panel_edit_tattoo.xml
index 4a133d8693..d4a12209db 100644
--- a/indra/newview/skins/default/xui/da/panel_edit_tattoo.xml
+++ b/indra/newview/skins/default/xui/da/panel_edit_tattoo.xml
@@ -4,5 +4,6 @@
 		<texture_picker label="Hoved tatovering" name="Head Tattoo" tool_tip="Klik for at vælge et billede"/>
 		<texture_picker label="Øvre tatovering" name="Upper Tattoo" tool_tip="Klik for at vælge et billede"/>
 		<texture_picker label="Nedre tatovering" name="Lower Tattoo" tool_tip="Klik for at vælge et billede"/>
+		<color_swatch label="Farve/Nuance" name="Color/Tint" tool_tip="Klik for at åbne farvevælger"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/panel_edit_wearable.xml b/indra/newview/skins/default/xui/da/panel_edit_wearable.xml
index 4afb7ba45c..8e6990fe31 100644
--- a/indra/newview/skins/default/xui/da/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/da/panel_edit_wearable.xml
@@ -93,6 +93,12 @@
 	<text name="edit_wearable_title" value="Redigerer kropsbygning"/>
 	<panel label="Trøje" name="wearable_type_panel">
 		<text name="description_text" value="Kropsbygning:"/>
+		<radio_group name="sex_radio">
+			<radio_item label="" name="sex_male" tool_tip="Mand" value="1"/>
+			<radio_item label="" name="sex_female" tool_tip="Kvinde" value="0"/>
+		</radio_group>
+		<icon name="male_icon" tool_tip="Mandlig"/>
+		<icon name="female_icon" tool_tip="Kvindelig"/>
 	</panel>
 	<panel label="gear_buttom_panel" name="gear_buttom_panel">
 		<button name="friends_viewsort_btn" tool_tip="Valg"/>
diff --git a/indra/newview/skins/default/xui/da/panel_group_land_money.xml b/indra/newview/skins/default/xui/da/panel_group_land_money.xml
index 9b0267529c..efad4d0c34 100644
--- a/indra/newview/skins/default/xui/da/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/da/panel_group_land_money.xml
@@ -6,6 +6,9 @@
 	<panel.string name="cant_view_group_land_text">
 		Du har ikke tilladelse til at se gruppeejet land.
 	</panel.string>
+	<panel.string name="epmty_view_group_land_text">
+		Intet indhold
+	</panel.string>
 	<panel.string name="cant_view_group_accounting_text">
 		Du har ikke tilladelse til at se gruppens økonomiinformationer.
 	</panel.string>
diff --git a/indra/newview/skins/default/xui/da/panel_group_notices.xml b/indra/newview/skins/default/xui/da/panel_group_notices.xml
index 7046ac4d7c..d8e8cb3c2a 100644
--- a/indra/newview/skins/default/xui/da/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/da/panel_group_notices.xml
@@ -42,6 +42,7 @@ Maksimum er 200 pr. gruppe pr. dag
 		<text name="string">
 			Træk og slip en gensand for at vedhæfte den:
 		</text>
+		<button label="Beholdning" name="open_inventory" tool_tip="Åben beholdning"/>
 		<button label="Fjern" label_selected="Fjern bilag" name="remove_attachment" tool_tip="Fjern vedhæng fra din note"/>
 		<button label="Send" label_selected="Send" name="send_notice"/>
 		<group_drop_target name="drop_target" tool_tip="Træk en genstand fra din beholdning til dette felt for at sende den med denne besked. Du skal have rettigheder til at kopiere og overdrage denne genstand for at kunne vedhæfte den."/>
diff --git a/indra/newview/skins/default/xui/da/panel_login.xml b/indra/newview/skins/default/xui/da/panel_login.xml
index 1e60174909..d4bf9a7d78 100644
--- a/indra/newview/skins/default/xui/da/panel_login.xml
+++ b/indra/newview/skins/default/xui/da/panel_login.xml
@@ -11,14 +11,10 @@
 	</panel.string>
 	<layout_stack name="login_widgets">
 		<layout_panel name="login">
-			<text name="first_name_text">
-				Fornavn:
+			<text name="username_text">
+				Brugernavn:
 			</text>
-			<line_editor label="Fornavn" name="first_name_edit" tool_tip="[SECOND_LIFE] First Name"/>
-			<text name="last_name_text">
-				Efternavn:
-			</text>
-			<line_editor label="Efternavn" name="last_name_edit" tool_tip="[SECOND_LIFE] Last Name"/>
+			<line_editor label="Brugernavn" name="username_edit" tool_tip="[SECOND_LIFE] Brugernavn"/>
 			<text name="password_text">
 				Password:
 			</text>
diff --git a/indra/newview/skins/default/xui/da/panel_main_inventory.xml b/indra/newview/skins/default/xui/da/panel_main_inventory.xml
index 16bd22c21a..d6406939c1 100644
--- a/indra/newview/skins/default/xui/da/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/da/panel_main_inventory.xml
@@ -9,62 +9,20 @@
 	<text name="ItemcountText">
 		Genstande:
 	</text>
-	<menu_bar name="Inventory Menu">
-		<menu label="Filer" name="File">
-			<menu_item_call label="Åben" name="Open"/>
-			<menu label="Send fil" name="upload">
-				<menu_item_call label="Billede (L$[COST])..." name="Upload Image"/>
-				<menu_item_call label="Lyd (L$[COST])..." name="Upload Sound"/>
-				<menu_item_call label="Animation (L$[COST])..." name="Upload Animation"/>
-				<menu_item_call label="Flere filer (L$[COST] pr. fil)..." name="Bulk Upload"/>
-			</menu>
-			<menu_item_call label="Nyt vindue" name="New Window"/>
-			<menu_item_call label="Vis filtre" name="Show Filters"/>
-			<menu_item_call label="Nulstil filtre" name="Reset Current"/>
-			<menu_item_call label="Luk alle mapper" name="Close All Folders"/>
-			<menu_item_call label="Tøm papirkurv" name="Empty Trash"/>
-			<menu_item_call label="Tøm fundne genstande" name="Empty Lost And Found"/>
-		</menu>
-		<menu label="Opret" name="Create">
-			<menu_item_call label="Ny mappe" name="New Folder"/>
-			<menu_item_call label="Nyt script" name="New Script"/>
-			<menu_item_call label="Ny note" name="New Note"/>
-			<menu_item_call label="Ny bevægelse" name="New Gesture"/>
-			<menu label="Nyt tøj" name="New Clothes">
-				<menu_item_call label="Ny trøje" name="New Shirt"/>
-				<menu_item_call label="Nye bukser" name="New Pants"/>
-				<menu_item_call label="Nye sko" name="New Shoes"/>
-				<menu_item_call label="Nye strømper" name="New Socks"/>
-				<menu_item_call label="Ny jakke" name="New Jacket"/>
-				<menu_item_call label="Ny nederdel" name="New Skirt"/>
-				<menu_item_call label="Nye handsker" name="New Gloves"/>
-				<menu_item_call label="Ny undertrøje" name="New Undershirt"/>
-				<menu_item_call label="Nye underbukser" name="New Underpants"/>
-				<menu_item_call label="Nyt alpha lag" name="New Alpha"/>
-				<menu_item_call label="Ny tatovering" name="New Tattoo"/>
-			</menu>
-			<menu label="Nye kropsdele" name="New Body Parts">
-				<menu_item_call label="Ny kropsbygning" name="New Shape"/>
-				<menu_item_call label="Ny hud" name="New Skin"/>
-				<menu_item_call label="Nyt hår" name="New Hair"/>
-				<menu_item_call label="Nye øjne" name="New Eyes"/>
-			</menu>
-		</menu>
-		<menu label="Sortér" name="Sort">
-			<menu_item_check label="Efter navn" name="By Name"/>
-			<menu_item_check label="Efter dato" name="By Date"/>
-			<menu_item_check label="Altid mapper efter navn" name="Folders Always By Name"/>
-			<menu_item_check label="System-mapper i toppen" name="System Folders To Top"/>
-		</menu>
-	</menu_bar>
 	<filter_editor label="Filter" name="inventory search editor"/>
 	<tab_container name="inventory filter tabs">
 		<inventory_panel label="Alle ting" name="All Items"/>
-		<inventory_panel label="Nye ting" name="Recent Items"/>
+		<recent_inventory_panel label="Nye ting" name="Recent Items"/>
 	</tab_container>
-	<panel name="bottom_panel">
-		<button name="options_gear_btn" tool_tip="Vis flere valgmuligheder"/>
-		<button name="add_btn" tool_tip="Opret ny genstand"/>
-		<dnd_button name="trash_btn" tool_tip="Fjern valgt genstand"/>
-	</panel>
+	<layout_stack name="bottom_panel">
+		<layout_panel name="options_gear_btn_panel">
+			<button name="options_gear_btn" tool_tip="Vis yderligere valg"/>
+		</layout_panel>
+		<layout_panel name="add_btn_panel">
+			<button name="add_btn" tool_tip="Tilføj ny genstand"/>
+		</layout_panel>
+		<layout_panel name="trash_btn_panel">
+			<dnd_button name="trash_btn" tool_tip="Fjern valgte genstand"/>
+		</layout_panel>
+	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/panel_outfit_edit.xml b/indra/newview/skins/default/xui/da/panel_outfit_edit.xml
index de68366610..9aa9fd14cc 100644
--- a/indra/newview/skins/default/xui/da/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/da/panel_outfit_edit.xml
@@ -2,6 +2,8 @@
 <!-- Side tray Outfit Edit panel -->
 <panel label="Redigér sæt" name="outfit_edit">
 	<string name="No Outfit" value="Intet sæt"/>
+	<string name="unsaved_changes" value="Ikke gemte ændringer"/>
+	<string name="now_editing" value="Redigerer nu"/>
 	<panel.string name="not_available">
 		(Ikke relevant)
 	</panel.string>
@@ -15,24 +17,19 @@
 	<text name="title" value="Redigér sæt"/>
 	<panel label="bottom_panel" name="header_panel">
 		<panel label="bottom_panel" name="outfit_name_and_status">
-			<text name="status" value="Retter..."/>
+			<text name="status" value="Redigerer nu..."/>
 			<text name="curr_outfit_name" value="[Current Outfit]"/>
 		</panel>
 	</panel>
 	<layout_stack name="im_panels">
 		<layout_panel label="IM kontrolpanel" name="outfit_wearables_panel">
-			<scroll_list name="look_items_list">
-				<scroll_list.columns label="Se genstand" name="look_item"/>
-				<scroll_list.columns label="Sorter genstande i sæt" name="look_item_sort"/>
-			</scroll_list>
 			<panel label="bottom_panel" name="edit_panel"/>
 		</layout_panel>
 		<layout_panel name="add_wearables_panel">
-			<filter_editor label="Filter" name="look_item_filter"/>
+			<text name="add_to_outfit_label" value="Tilføj til sæt:"/>
 			<layout_stack name="filter_panels">
-				<layout_panel label="IM kontrolpanel" name="filter_button_panel">
-					<text name="add_to_outfit_label" value="Tilføj til sæt:"/>
-					<button label="O" name="filter_button"/>
+				<layout_panel label="IM kontrolpanel" name="filter_panel">
+					<filter_editor label="Filter" name="look_item_filter"/>
 				</layout_panel>
 			</layout_stack>
 			<panel label="add_wearables_button_bar" name="add_wearables_button_bar">
diff --git a/indra/newview/skins/default/xui/da/panel_people.xml b/indra/newview/skins/default/xui/da/panel_people.xml
index db72125b84..5d8474259c 100644
--- a/indra/newview/skins/default/xui/da/panel_people.xml
+++ b/indra/newview/skins/default/xui/da/panel_people.xml
@@ -2,9 +2,9 @@
 <!-- Side tray panel -->
 <panel label="Personer" name="people_panel">
 	<string name="no_recent_people" value="Ingen tidligere personer. Leder du efter nogen at være sammen med? Prøv [secondlife:///app/search/people Search] eller [secondlife:///app/worldmap World Map]."/>
-	<string name="no_filtered_recent_people" value="Fandt du ikke hvad du ledte efter? Prøv [secondlife:///app/search/people Search]."/>
+	<string name="no_filtered_recent_people" value="Fandt du ikke det du søgte? Prøv [secondlife:///app/search/people/[SEARCH_TERM] Search]."/>
 	<string name="no_one_near" value="Ingen i nærheden. Leder du efter nogen at være sammen med? Prøv [secondlife:///app/search/people Search] eller [secondlife:///app/worldmap World Map]."/>
-	<string name="no_one_filtered_near" value="Fandt du ikke hvad du ledte efter? Prøv [secondlife:///app/search/people Search]."/>
+	<string name="no_one_filtered_near" value="Fandt du ikke det du søgte? Prøv [secondlife:///app/search/people/[SEARCH_TERM] Search]."/>
 	<string name="no_friends_online" value="Ingen venner online"/>
 	<string name="no_friends" value="Ingen venner"/>
 	<string name="no_friends_msg">
@@ -12,11 +12,11 @@
 Leder du efter nogen at være sammen med? Prøv [secondlife:///app/worldmap World Map].
 	</string>
 	<string name="no_filtered_friends_msg">
-		Fandt du ikke hvad du ledte efter? Prøv [secondlife:///app/search/people Search].
+		Fandt du ikke det du søgte? Prøv [secondlife:///app/search/people/[SEARCH_TERM] Search].
 	</string>
 	<string name="people_filter_label" value="Filtrér personer"/>
 	<string name="groups_filter_label" value="Filtrér grupper"/>
-	<string name="no_filtered_groups_msg" value="Fandt du ikke hvad du ledte efter? Prøv [secondlife:///app/search/groups Search]."/>
+	<string name="no_filtered_groups_msg" value="Fandt du ikke det du søgte? Prøv [secondlife:///app/search/groups/[SEARCH_TERM] Search]."/>
 	<string name="no_groups_msg" value="Leder du efter grupper at være med i? Prøv [secondlife:///app/search/groups Search]."/>
 	<filter_editor label="Filtrér" name="filter_input"/>
 	<tab_container name="tabs">
@@ -55,7 +55,7 @@ Leder du efter nogen at være sammen med? Prøv [secondlife:///app/worldmap Worl
 		<button label="Profil" name="view_profile_btn" tool_tip="Vis billede, gruppe og anden information om beboer"/>
 		<button label="IM" name="im_btn" tool_tip="Chat privat med denne person"/>
 		<button label="Opkald" name="call_btn" tool_tip="Opkald til denne beboer"/>
-		<button label="Del" name="share_btn"/>
+		<button label="Del" name="share_btn" tool_tip="Del en genstand i beholdning"/>
 		<button label="Teleport" name="teleport_btn" tool_tip="Tilbyd teleport"/>
 		<button label="Group profil" name="group_info_btn" tool_tip="Vis gruppe information"/>
 		<button label="Gruppe chat" name="chat_btn" tool_tip="Åben chat session"/>
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml
index 4d505db30e..807d7939b8 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml
@@ -13,6 +13,7 @@
 	</text>
 	<check_box label="Byg/Redigér" name="edit_camera_movement" tool_tip="Benyt automatisk kamera positionering ved start og slut af editerings modus"/>
 	<check_box label="Udseende" name="appearance_camera_movement" tool_tip="Benyt automatisk kamera positionering ved redigering"/>
+	<check_box initial_value="1" label="Sidepanel" name="appearance_sidebar_positioning" tool_tip="Benyt automatisk positionering af kamera"/>
 	<check_box label="Vis avatar i førsteperson" name="first_person_avatar_visible"/>
 	<check_box label="Piletaster bruges altid til bevægelse" name="arrow_keys_move_avatar_check"/>
 	<check_box label="Tast-tast-hold for at løbe" name="tap_tap_hold_to_run"/>
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_chat.xml b/indra/newview/skins/default/xui/da/panel_preferences_chat.xml
index df97193598..20a376f152 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_chat.xml
@@ -45,6 +45,7 @@
 	</text>
 	<check_box initial_value="true" label="Afspil skrive animation ved chat" name="play_typing_animation"/>
 	<check_box label="Send e-mail til mig når jeg modtager IM og er offline" name="send_im_to_email"/>
+	<check_box label="Åben for almindelig tekst i IM og chat historik" name="plain_text_chat_history"/>
 	<text name="show_ims_in_label">
 		Vis IM&apos;er i:
 	</text>
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml
index 07e3aec72a..586896041d 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Grafik" name="Display panel">
-	<text name="UI Size:">
-		UI størrelse:
-	</text>
 	<text name="QualitySpeed">
 		Kvalitet og hastighed:
 	</text>
@@ -53,6 +50,10 @@
 			m
 		</text>
 		<slider label="Maks. antal partikler:" name="MaxParticleCount"/>
+		<slider label="Maks. avatar optegningsafstand:" name="MaxAvatarDrawDistance"/>
+		<text name="DrawDistanceMeterText3">
+			m
+		</text>
 		<slider label="Efterbehandlingskvalitet:" name="RenderPostProcess"/>
 		<text name="MeshDetailText">
 			Netmaske detaljer:
diff --git a/indra/newview/skins/default/xui/da/sidepanel_appearance.xml b/indra/newview/skins/default/xui/da/sidepanel_appearance.xml
index 43ddfdada7..be049bea38 100644
--- a/indra/newview/skins/default/xui/da/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/da/sidepanel_appearance.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Sæt" name="appearance panel">
 	<string name="No Outfit" value="Intet sæt"/>
+	<string name="Unsaved Changes" value="Ikke gemte ændringer"/>
+	<string name="Now Wearing" value="Bærer nu..."/>
 	<panel name="panel_currentlook">
-		<text name="currentlook_title">
-			(ikke gemt)
+		<button label="E" name="editappearance_btn"/>
+		<button label="O" name="openoutfit_btn"/>
+		<text name="currentlook_status">
+			(Status)
 		</text>
 	</panel>
 	<filter_editor label="Filtrér sæt" name="Filter"/>
diff --git a/indra/newview/skins/default/xui/da/sidepanel_inventory.xml b/indra/newview/skins/default/xui/da/sidepanel_inventory.xml
index 9a2a348f58..767d74ca3f 100644
--- a/indra/newview/skins/default/xui/da/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/da/sidepanel_inventory.xml
@@ -4,6 +4,7 @@
 		<panel name="button_panel">
 			<button label="Profil" name="info_btn"/>
 			<button label="Del" name="share_btn"/>
+			<button label="Køb ind" name="shop_btn"/>
 			<button label="Bær" name="wear_btn"/>
 			<button label="Afspil" name="play_btn"/>
 			<button label="Teleportér" name="teleport_btn"/>
diff --git a/indra/newview/skins/default/xui/da/strings.xml b/indra/newview/skins/default/xui/da/strings.xml
index bd5ab62be9..5ceb0612a8 100644
--- a/indra/newview/skins/default/xui/da/strings.xml
+++ b/indra/newview/skins/default/xui/da/strings.xml
@@ -88,6 +88,24 @@
 	<string name="LoginDownloadingClothing">
 		Henter tøj...
 	</string>
+	<string name="InvalidCertificate">
+		Serveren returnerede et ugyldigt eller ødelagt certifikat. Kontakt venligst administrator af dette net.
+	</string>
+	<string name="CertInvalidHostname">
+		Et ugyldig hostnavn blev brugt for at få adgang til serveren. Check venligst din SLURL eller navnet på hosten.
+	</string>
+	<string name="CertExpired">
+		Certifikat returneret fra nettet ser ud til at være udløbet.  Check venligst din systemtid eller kontakt administratoren af dette net.
+	</string>
+	<string name="CertKeyUsage">
+		Det certifikat der blev returneret af serveren kan ikke benyttes til SSL.  Kontakt venligst administrator af dette net.
+	</string>
+	<string name="CertBasicConstraints">
+		For mange certifikater i serverens certifikat streng.  Kontakt venligst administrator af dette net.
+	</string>
+	<string name="CertInvalidSignature">
+		Certifikat signaturen returneret på dette net kan ikke bekræftes.  Kontakt venligst administrator af dette net.
+	</string>
 	<string name="LoginFailedNoNetwork">
 		Netværksfejl: Kunne ikke etablere forbindelse, check venligst din netværksforbindelse.
 	</string>
@@ -816,6 +834,42 @@
 	<string name="invalid">
 		ugyldig
 	</string>
+	<string name="shirt_not_worn">
+		Trøje - ikke på
+	</string>
+	<string name="pants_not_worn">
+		Bukser - ikke på
+	</string>
+	<string name="shoes_not_worn">
+		Sko - ikke på
+	</string>
+	<string name="socks_not_worn">
+		Strømper - ikke på
+	</string>
+	<string name="jacket_not_worn">
+		Jakke - ikke på
+	</string>
+	<string name="gloves_not_worn">
+		Handsker - ikke på
+	</string>
+	<string name="undershirt_not_worn">
+		Undertrøje - ikke på
+	</string>
+	<string name="underpants_not_worn">
+		Underbukser - ikke på
+	</string>
+	<string name="skirt_not_worn">
+		Nederdel - ikke på
+	</string>
+	<string name="alpha_not_worn">
+		Alpha ikke benyttet
+	</string>
+	<string name="tattoo_not_worn">
+		Tatovering ikke benyttet
+	</string>
+	<string name="invalid_not_worn">
+		ugyldig
+	</string>
 	<string name="NewWearable">
 		Ny [WEARABLE_ITEM]
 	</string>
@@ -886,7 +940,10 @@
 		Tryk ESC for at skift til normalt udsyn
 	</string>
 	<string name="InventoryNoMatchingItems">
-		Fandt du ikke hvad du ledte efter. Prøv [secondlife:///app/search/all Search].
+		Fandt du ikke hvad du søgte? Prøv [secondlife:///app/search/all/[SEARCH_TERM] Search].
+	</string>
+	<string name="PlacesNoMatchingItems">
+		Fandt du ikke hvad du søgte? Prøv [secondlife:///app/search/places/[SEARCH_TERM] Search].
 	</string>
 	<string name="FavoritesNoMatchingItems">
 		Træk et landemærke hertil for at tilføje den som favorit.
@@ -916,6 +973,7 @@
 	<string name="Wave" value=" Vink "/>
 	<string name="HelloAvatar" value=" Hej, avatar! "/>
 	<string name="ViewAllGestures" value=" Se alle &gt;&gt;"/>
+	<string name="GetMoreGestures" value="Få mere &gt;&gt;"/>
 	<string name="Animations" value=" Animationer,"/>
 	<string name="Calling Cards" value=" Visitkort,"/>
 	<string name="Clothing" value=" Tøj,"/>
@@ -1528,16 +1586,19 @@
 		Beboeren du sendte en besked er &apos;optaget&apos;, hvilket betyder at han/hun ikke vil forstyrres. Din besked vil blive vis i hans/hendes IM panel til senere visning.
 	</string>
 	<string name="MuteByName">
-		(efter navn)
+		(Efter navn)
 	</string>
 	<string name="MuteAgent">
 		(beboer)
 	</string>
 	<string name="MuteObject">
-		(objekt)
+		(Objekt)
 	</string>
 	<string name="MuteGroup">
-		(gruppe)
+		(Gruppe)
+	</string>
+	<string name="MuteExternal">
+		(Ekstern)
 	</string>
 	<string name="RegionNoCovenant">
 		Der er ingen regler for dette estate.
@@ -3297,11 +3358,14 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
 	<string name="answered_call">
 		Dit opkald er blevet besvaret
 	</string>
-	<string name="started_call">
-		startede et stemme opkald
+	<string name="you_started_call">
+		Du startede dette stemme kald
+	</string>
+	<string name="you_joined_call">
+		Du er nu med i stemme opkald
 	</string>
-	<string name="joined_call">
-		tilsluttede stemme opkald
+	<string name="name_started_call">
+		[NAME] startede et stemmekald
 	</string>
 	<string name="ringing-im">
 		Tilslutter stemme opkald...
@@ -3500,6 +3564,90 @@ Krænkelsesanmeldelse
 	<string name="Contents">
 		Indhold
 	</string>
+	<string name="Gesture">
+		Bevægelse
+	</string>
+	<string name="Male Gestures">
+		Mandlige bevægelser
+	</string>
+	<string name="Female Gestures">
+		Kvindelige bevægelser
+	</string>
+	<string name="Other Gestures">
+		Andre bevægelser
+	</string>
+	<string name="Speech Gestures">
+		Tale bevægelser
+	</string>
+	<string name="Common Gestures">
+		Almindelige bevægelser
+	</string>
+	<string name="Male - Excuse me">
+		Mand - Undskyld mig
+	</string>
+	<string name="Male - Get lost">
+		Mand - Skrid!
+	</string>
+	<string name="Male - Blow kiss">
+		Mand - Pust et kys
+	</string>
+	<string name="Male - Boo">
+		Mand - Boo
+	</string>
+	<string name="Male - Bored">
+		Mand - Keder sig
+	</string>
+	<string name="Male - Hey">
+		Mand - Hey
+	</string>
+	<string name="Male - Laugh">
+		Mand - Latter
+	</string>
+	<string name="Male - Repulsed">
+		Mand - Frastødt
+	</string>
+	<string name="Male - Shrug">
+		Mand - Skuldertræk
+	</string>
+	<string name="Male - Stick tougue out">
+		Mand - Stik tunge ud
+	</string>
+	<string name="Male - Wow">
+		Mand - Wow
+	</string>
+	<string name="FeMale - Excuse me">
+		Kvinde - Undskyld mig
+	</string>
+	<string name="FeMale - Get lost">
+		Kvinde - Skrid!
+	</string>
+	<string name="FeMale - Blow kiss">
+		Kvinde - Pust et kys
+	</string>
+	<string name="FeMale - Boo">
+		Kvinde - Boo
+	</string>
+	<string name="Female - Bored">
+		Kvinde - Keder sig
+	</string>
+	<string name="Female - Hey">
+		Kvinde - Hey
+	</string>
+	<string name="Female - Laugh">
+		Kvinde - Latter
+	</string>
+	<string name="Female - Repulsed">
+		Kvinde - Frastødt
+	</string>
+	<string name="Female - Shrug">
+		Kvinde - Skuldertræk
+	</string>
+	<string name="Female - Stick tougue out">
+		Kvinde - Stik tungen ud
+	</string>
+	<string name="Female - Wow">
+		Kvinde - Wow
+	</string>
 	<string name="AvatarBirthDateFormat">
 		[mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt]
 	</string>
-- 
cgit v1.2.3


From 2d93672587e6f5ca46e06d768a1f6f9df4ebac37 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Thu, 3 Jun 2010 14:32:15 -0700
Subject: CT-575 WIP DA linguistic new files

---
 indra/newview/skins/default/xui/da/floater_buy_currency_html.xml  | 2 ++
 indra/newview/skins/default/xui/da/panel_body_parts_list_item.xml | 4 ++++
 .../skins/default/xui/da/panel_bodyparts_list_button_bar.xml      | 5 +++++
 .../skins/default/xui/da/panel_clothing_list_button_bar.xml       | 5 +++++
 indra/newview/skins/default/xui/da/panel_clothing_list_item.xml   | 4 ++++
 indra/newview/skins/default/xui/da/panel_cof_wearables.xml        | 8 ++++++++
 .../skins/default/xui/da/panel_deletable_wearable_list_item.xml   | 4 ++++
 .../skins/default/xui/da/panel_dummy_clothing_list_item.xml       | 4 ++++
 8 files changed, 36 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/da/floater_buy_currency_html.xml
 create mode 100644 indra/newview/skins/default/xui/da/panel_body_parts_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/da/panel_bodyparts_list_button_bar.xml
 create mode 100644 indra/newview/skins/default/xui/da/panel_clothing_list_button_bar.xml
 create mode 100644 indra/newview/skins/default/xui/da/panel_clothing_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/da/panel_cof_wearables.xml
 create mode 100644 indra/newview/skins/default/xui/da/panel_deletable_wearable_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/da/panel_dummy_clothing_list_item.xml

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/da/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/da/floater_buy_currency_html.xml
new file mode 100644
index 0000000000..e32b25ca17
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/floater_buy_currency_html.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_buy_currency_html" title="KØB VALUTA"/>
diff --git a/indra/newview/skins/default/xui/da/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/da/panel_body_parts_list_item.xml
new file mode 100644
index 0000000000..de764d8025
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_body_parts_list_item.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="wearable_item">
+	<text name="item_name" value="..."/>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/da/panel_bodyparts_list_button_bar.xml
new file mode 100644
index 0000000000..4cbcdebbe4
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_bodyparts_list_button_bar.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="clothing_list_button_bar_panel">
+	<button label="Skift" name="switch_btn"/>
+	<button label="Køb &gt;" name="bodyparts_shop_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/da/panel_clothing_list_button_bar.xml
new file mode 100644
index 0000000000..c08d095c66
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_clothing_list_button_bar.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="clothing_list_button_bar_panel">
+	<button label="Tilføj +" name="add_btn"/>
+	<button label="Køb &gt;" name="clothing_shop_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/da/panel_clothing_list_item.xml
new file mode 100644
index 0000000000..de764d8025
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_clothing_list_item.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="wearable_item">
+	<text name="item_name" value="..."/>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_cof_wearables.xml b/indra/newview/skins/default/xui/da/panel_cof_wearables.xml
new file mode 100644
index 0000000000..92d78b01a2
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_cof_wearables.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="cof_wearables">
+	<accordion name="cof_wearables_accordion">
+		<accordion_tab name="tab_attachments" title="Attachments"/>
+		<accordion_tab name="tab_clothing" title="Tøj"/>
+		<accordion_tab name="tab_body_parts" title="Kropsdele"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/da/panel_deletable_wearable_list_item.xml
new file mode 100644
index 0000000000..91d90a5660
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_deletable_wearable_list_item.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="deletable_wearable_item">
+	<text name="item_name" value="..."/>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/da/panel_dummy_clothing_list_item.xml
new file mode 100644
index 0000000000..6af84de0c7
--- /dev/null
+++ b/indra/newview/skins/default/xui/da/panel_dummy_clothing_list_item.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="dummy_clothing_item">
+	<text name="item_name" value="..."/>
+</panel>
-- 
cgit v1.2.3


From 2caa710a46d3baa1e6a884961f1ff756d35ef5df Mon Sep 17 00:00:00 2001
From: "Nyx (Neal Orman)" <nyx@lindenlab.com>
Date: Thu, 3 Jun 2010 20:06:25 -0400
Subject: VWR-19699 WIP Correct operations for wear and replace on wearables

Resident-submitted patch, cleaned up so it matches style and compiles/builds
well. Appears to work for stated goals but will need some more UI work to
ensure consistency.

WIP checkin, will be code reviewed before pushing.
---
 indra/newview/skins/default/xui/en/menu_inventory.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index 11459ad0e6..221457ac1f 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -661,6 +661,14 @@
          function="Inventory.DoToSelected"
          parameter="wear" />
     </menu_item_call>
+    <menu_item_call
+     label="Add"
+     layout="topleft"
+     name="Wearable Add">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="wear_add" />
+    </menu_item_call>
     <menu_item_call
      label="Take Off"
      layout="topleft"
-- 
cgit v1.2.3


From e1189d0e2ee47539edc68c3532e0a5ce64d5dcd1 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Fri, 4 Jun 2010 13:29:25 +0300
Subject: EXT-7368 FIXED Implemented new "empty_accordion_text" textbox to show
 help text when there are no visible tabs in accordion.

* Textbox always fit whole accordion.
* This text is updated with search_term (in link to open Search floater) when new filter substring is passed to accordion.
* Accordion is notified by its tabs when their visibility is changed.

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/486/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_outfits_list.xml |  1 +
 indra/newview/skins/default/xui/en/widgets/accordion.xml  | 15 +++++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/widgets/accordion.xml

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_outfits_list.xml b/indra/newview/skins/default/xui/en/panel_outfits_list.xml
index 5cf94c25d7..5c9ae51a48 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_list.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_list.xml
@@ -14,6 +14,7 @@
      background_visible="true"
      bg_alpha_color="DkGray2"
      bg_opaque_color="DkGray2"
+     empty_accordion_text.value="Didn't find what you're looking for? Try [secondlife:///app/search/all/[SEARCH_TERM] Search]."
      follows="all"
      height="400"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/widgets/accordion.xml b/indra/newview/skins/default/xui/en/widgets/accordion.xml
new file mode 100644
index 0000000000..b817ba56ca
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/accordion.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<accordion
+ height="100"
+ name="accordion"
+ width="200">
+    <empty_accordion_text
+     follows="all"
+     height="100"
+     h_pad="10"
+     name="no_visible_items_msg"
+     value="There are no visible content here."
+     v_pad="15"
+     width="200"
+     wrap="true "/>
+</accordion>
-- 
cgit v1.2.3


From caeeebe86a73486288e31751cde3b4989def379f Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Fri, 4 Jun 2010 15:49:59 +0300
Subject: EXT-7607 FIXED added 2px gap between a texture label and a texture
 preview area for all texture pickers

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/509/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/widgets/color_swatch.xml   | 3 ++-
 indra/newview/skins/default/xui/en/widgets/texture_picker.xml | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/widgets/color_swatch.xml b/indra/newview/skins/default/xui/en/widgets/color_swatch.xml
index dfd301a770..48b987d7e8 100644
--- a/indra/newview/skins/default/xui/en/widgets/color_swatch.xml
+++ b/indra/newview/skins/default/xui/en/widgets/color_swatch.xml
@@ -4,5 +4,6 @@
               name="color_swatch">
   <color_swatch.caption_text name="caption"
                              halign="center"
-                             follows="left|right|bottom"/>
+                             follows="left|right|bottom"
+                             v_pad="2"/>
 </color_swatch>
diff --git a/indra/newview/skins/default/xui/en/widgets/texture_picker.xml b/indra/newview/skins/default/xui/en/widgets/texture_picker.xml
index 33c3475eb2..757f0f49d1 100644
--- a/indra/newview/skins/default/xui/en/widgets/texture_picker.xml
+++ b/indra/newview/skins/default/xui/en/widgets/texture_picker.xml
@@ -3,7 +3,8 @@
   <multiselect_text font="SansSerifSmall"/>
   <caption_text text="Multiple" 
                 halign="center" 
-                font="SansSerifSmall"/>
+                font="SansSerifSmall"
+                v_pad="2"/>
   <border bevel_style="in"/>
 </texture_picker>
 
-- 
cgit v1.2.3


From 9343389313f9d4895b5826bfc68d7998763254e7 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Fri, 4 Jun 2010 17:44:28 +0300
Subject: EXT-7595 FIXED Add empty space above button bar with 'Add more...'
 button in Add Wearables panel

- Decreased accordion height

Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/512/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_cof_wearables.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
index 5f34c24bca..83040a745b 100644
--- a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
+++ b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
@@ -11,7 +11,7 @@
     <accordion
      fit_parent="true"
      follows="all"
-     height="200"
+     height="198"
      layout="topleft"
      left="0"
      single_expansion="true"
-- 
cgit v1.2.3


From bca161ca899064d7a758a4a19efe2957605d0378 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Fri, 4 Jun 2010 17:45:07 +0300
Subject: EXT-7596 FIXED Reworked filters 'My Appearance' and 'Add Wearaples'
 panel corresponding with spec

- Changed label and font of filter's label in 'Add Wearables' panel
- Added magnifier icon to the filters of 'My Appearance' and 'Add Wearables' panels

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/515/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_outfit_edit.xml    | 5 ++---
 indra/newview/skins/default/xui/en/sidepanel_appearance.xml | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index 769f9b7bbf..40f60d50fb 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -256,15 +256,14 @@ It is calculated as border_size + 2*UIResizeBarOverlap
 		             background_image="TextField_Search_Off"
 		             enabled="true"
 		             follows="left|right|top"
-		             font="SansSerif"
-		             label="Filter"
+		             label="Filter Inventory Wearables"
 		             layout="topleft"
 		             left="5"
 		             width="290"
 		             height="25"
 		             name="look_item_filter"
+		             search_button_visible="true"
 		             text_color="black"
-		             text_pad_left="25"
 		             visible="true"/>
                     
                 </layout_panel>
diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
index 3d7b0b7edc..ae08a13793 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@@ -111,6 +111,7 @@ width="333">
    label="Filter Outfits"
    max_length="300"
    name="Filter"
+   search_button_visible="true"
    top_pad="10"
    width="303" />
    <panel
-- 
cgit v1.2.3


From 206745402589974237802d5394e76f2885c3f0df Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Fri, 4 Jun 2010 18:29:39 +0300
Subject: EXT-7641 FIXED removed a button bar from Edit Wearable panel

Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/521/

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_edit_wearable.xml   | 92 ++++------------------
 1 file changed, 17 insertions(+), 75 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
index 67ff71cef1..8604f42e75 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
@@ -235,7 +235,7 @@ left="0"
 	 </panel>
 	 <panel
 		 follows="all"
-		 height="408"
+		 height="433"
 		 layout="topleft"
 		 left="0"
 		 name="edit_subpanel_container"
@@ -246,7 +246,7 @@ left="0"
 		 <panel
 			 filename="panel_edit_shape.xml"
 			 follows="all"
-			 height="408"
+			 height="433"
 			 layout="topleft"
 			 left="0"
 			 name="edit_shape_panel"
@@ -256,7 +256,7 @@ left="0"
 		 <panel
 			 filename="panel_edit_skin.xml"
 			 follows="all"
-			 height="400"
+			 height="425"
 			 layout="topleft"
 			 left="0"
 			 name="edit_skin_panel"
@@ -266,7 +266,7 @@ left="0"
 		 <panel
 			 filename="panel_edit_hair.xml"
 			 follows="all"
-			 height="400"
+			 height="425"
 			 layout="topleft"
 			 left="0"
 			 name="edit_hair_panel"
@@ -276,7 +276,7 @@ left="0"
 		 <panel
 			 filename="panel_edit_eyes.xml"
 			 follows="all"
-			 height="400"
+			 height="425"
 			 layout="topleft"
 			 left="0"
 			 name="edit_eyes_panel"
@@ -286,7 +286,7 @@ left="0"
 		 <panel
 			 filename="panel_edit_shirt.xml"
 			 follows="all"
-			 height="400"
+			 height="425"
 			 layout="topleft"
 			 left="0"
 			 name="edit_shirt_panel"
@@ -296,7 +296,7 @@ left="0"
 		 <panel
 			 filename="panel_edit_pants.xml"
 			 follows="all"
-			 height="400"
+			 height="425"
 			 layout="topleft"
 			 left="0"
 			 name="edit_pants_panel"
@@ -306,7 +306,7 @@ left="0"
 		 <panel
 			 filename="panel_edit_shoes.xml"
 			 follows="all"
-			 height="400"
+			 height="425"
 			 layout="topleft"
 			 left="0"
 			 name="edit_shoes_panel"
@@ -316,7 +316,7 @@ left="0"
 		 <panel
 			 filename="panel_edit_socks.xml"
 			 follows="all"
-			 height="400"
+			 height="425"
 			 layout="topleft"
 			 left="0"
 			 name="edit_socks_panel"
@@ -326,7 +326,7 @@ left="0"
 		 <panel
 			 filename="panel_edit_jacket.xml"
 			 follows="all"
-			 height="400"
+			 height="425"
 			 layout="topleft"
 			 left="0"
 			 name="edit_jacket_panel"
@@ -336,7 +336,7 @@ left="0"
 		 <panel
 			 filename="panel_edit_skirt.xml"
 			 follows="all"
-			 height="400"
+			 height="425"
 			 layout="topleft"
 			 left="0"
 			 name="edit_skirt_panel"
@@ -346,7 +346,7 @@ left="0"
 		 <panel
 			 filename="panel_edit_gloves.xml"
 			 follows="all"
-			 height="400"
+			 height="425"
 			 layout="topleft"
 			 left="0"
 			 name="edit_gloves_panel"
@@ -356,7 +356,7 @@ left="0"
 		 <panel
 			 filename="panel_edit_undershirt.xml"
 			 follows="all"
-			 height="400"
+			 height="425"
 			 layout="topleft"
 			 left="0"
 			 name="edit_undershirt_panel"
@@ -366,7 +366,7 @@ left="0"
 		 <panel
 			 filename="panel_edit_underpants.xml"
 			 follows="all"
-			 height="400"
+			 height="425"
 			 layout="topleft"
 			 left="0"
 			 name="edit_underpants_panel"
@@ -376,7 +376,7 @@ left="0"
 		 <panel
 			 filename="panel_edit_alpha.xml"
 			 follows="all"
-			 height="400"
+			 height="425"
 			 layout="topleft"
 			 left="0"
 			 name="edit_alpha_panel"
@@ -386,7 +386,7 @@ left="0"
 		 <panel
 			 filename="panel_edit_tattoo.xml"
 			 follows="all"
-			 height="400"
+			 height="425"
 			 layout="topleft"
 			 left="0"
 			 name="edit_tattoo_panel"
@@ -394,65 +394,7 @@ left="0"
 			 visible="false"
 			 width="333" />
 	 </panel>
-     <panel
-        follows="bottom|left|right"
-        height="25"
-        label="gear_buttom_panel"
-        layout="topleft"
-        left="0"
-        name="gear_buttom_panel"
-        top_pad="0"
-        width="333">
-        <button
-            follows="bottom|left"
-            tool_tip="Options"
-            height="25"
-            image_hover_unselected="Toolbar_Left_Over"
-            image_disabled="OptionsMenu_Disabled"
-            image_overlay="OptionsMenu_Off"
-            image_selected="Toolbar_Left_Selected"
-            image_unselected="Toolbar_Left_Off"
-            layout="topleft"
-            left="10"
-            name="friends_viewsort_btn"
-            top="0"
-            width="31" />
-        <button
-            follows="bottom|left"
-            height="25"
-            image_hover_unselected="Toolbar_Middle_Over"
-            image_overlay="AddItem_Off"
-            image_selected="Toolbar_Middle_Selected"
-            image_unselected="Toolbar_Middle_Off"
-            image_disabled="AddItem_Disabled"
-            layout="topleft"
-            left_pad="1"
-            name="add_btn"
-            tool_tip="TODO"
-            width="31" />
-        <icon
-            follows="bottom|left|right"
-            height="25"
-            image_name="Toolbar_Middle_Off"
-            layout="topleft"
-            left_pad="1"
-            name="dummy_right_icon"
-            width="218" >
-        </icon>
-        <button
-            follows="bottom|right"
-            height="25"
-            image_hover_unselected="Toolbar_Right_Over"
-            image_overlay="TrashItem_Off"
-            image_selected="Toolbar_Right_Selected"
-            image_unselected="Toolbar_Right_Off"
-            image_disabled="TrashItem_Disabled"
-            layout="topleft"
-            left_pad="1"
-            name="del_btn"
-            tool_tip="TODO"
-            width="31" />
-     </panel>
+
 	 <panel
 		 follows="bottom|left|right"
 		 height="23"
-- 
cgit v1.2.3


From 4db92e5155f604492cbc8f5053bcd24237e3c3b6 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Fri, 4 Jun 2010 17:40:18 +0100
Subject: EXT-7342 FIXED Updated the link to the Voice Morphing marketing page.
 This link will be broken until the official page goes live.

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

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index a31ee67547..0d14a6b3c8 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3093,7 +3093,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		The session initialization is timed out
 	</string>
   
-  <string name="voice_morphing_url">http://secondlife.com/landing/v0icem0rphingt3st</string>
+  <string name="voice_morphing_url">http://secondlife.com/landing/voicemorphing</string>
 
   <!-- Financial operations strings -->
   <string name="paid_you_ldollars">[NAME] paid you L$[AMOUNT]</string>
-- 
cgit v1.2.3


From 6a660f868a139bb386d5980aa2ceda04d6ae2598 Mon Sep 17 00:00:00 2001
From: Sergei Litovchuk <slitovchuk@productengine.com>
Date: Fri, 4 Jun 2010 19:40:53 +0300
Subject: EXT-6886 FIXED Resized buttons to fix truncations. - Increased "About
 Land" button width and moved it below parcel icons. - Increased
 "Region/Estate" button width (also truncated text in multiple langs). -
 Increased advanced place info accordion minimal height to avoid vertical
 scrolling inside tabs (in all tabs except "For Sale"). - Decreased "Estate"
 and "For Sale" panels height to avoid extra free space.

Reviewed by Paul Guslisty https://codereview.productengine.com/secondlife/r/503/

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_place_profile.xml   | 35 ++++++++++++----------
 1 file changed, 20 insertions(+), 15 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml
index 57ac79686d..c6ac7ac862 100644
--- a/indra/newview/skins/default/xui/en/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml
@@ -2,7 +2,7 @@
 <panel
  background_visible="true"
  follows="all"
- height="570"
+ height="610"
  layout="topleft"
  left="0"
  min_height="350"
@@ -166,7 +166,7 @@
     <scroll_container
      color="DkGray2"
      follows="all"
-     height="532"
+     height="572"
      layout="topleft"
      left="9"
      name="place_scroll"
@@ -176,7 +176,7 @@
         <panel
          bg_alpha_color="DkGray2"
          follows="left|top|right"
-         height="540"
+         height="580"
          layout="topleft"
          left="0"
          min_height="300"
@@ -322,21 +322,22 @@
             <accordion
              fit_parent="true"
              follows="all"
-             height="223"
+             height="268"
              layout="topleft"
              single_expansion="true"
              left="0"
              name="advanced_info_accordion"
-             top_pad="10"
+             top_pad="5"
              width="313">
                 <accordion_tab
-                 height="170"
+                 fit_panel="false"
+                 height="175"
                  layout="topleft"
                  name="parcel_characteristics_tab"
                  title="Parcel">
                     <panel
                      follows="all"
-                     height="160"
+                     height="175"
                      layout="topleft"
                      left="0"
                      name="parcel_characteristics_panel"
@@ -533,8 +534,8 @@
                          name="about_land_btn"
                          right="-5"
                          tab_stop="false"
-                         top="138"
-                         width="90">
+                         top_pad="2"
+                         width="140">
                             <click_callback
                              function="Floater.Show"
                              parameter="about_land" />
@@ -543,7 +544,8 @@
                 </accordion_tab>
                 <accordion_tab
                  expanded="false"
-                 height="150"
+                 fit_panel="false"
+                 height="125"
                  layout="topleft"
                  name="region_information_tab"
                  title="Region">
@@ -662,7 +664,8 @@
                          name="region_info_btn"
                          right="-5"
                          tab_stop="false"
-                         width="105">
+                         top_pad="2"
+                         width="180">
                             <click_callback
                              function="Floater.Show"
                              parameter="region_info" />
@@ -671,13 +674,14 @@
                 </accordion_tab>
                 <accordion_tab
                  expanded="false"
-                 height="190"
+                 fit_panel="false"
+                 height="180"
                  layout="topleft"
                  name="estate_information_tab"
                  title="Estate">
                     <panel
                      follows="all"
-                     height="189"
+                     height="180"
                      layout="topleft"
                      left="0"
                      name="estate_information_panel"
@@ -760,13 +764,14 @@
                 </accordion_tab>
                 <accordion_tab
                  expanded="false"
-                 height="320"
+                 fit_panel="false"
+                 height="290"
                  layout="topleft"
                  name="sales_tab"
                  title="For Sale">
                     <panel
                      follows="all"
-                     height="300"
+                     height="290"
                      layout="topleft"
                      left="0"
                      name="sales_panel"
-- 
cgit v1.2.3


From 65f8d1822d058aee1902238e298f760368b724f6 Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Fri, 4 Jun 2010 20:21:07 +0300
Subject: EXT-7511 FIXED Resolved problem with cropping of item selection
 bottom

Problem reproduced for items which had divider at the bottom. It was caused by non-optimal placement of divider
in item. To fix this, "top" attribute of divider was changed, and when done so it turned out that increase of items
height from implementation of this task was not necessary, so rolled back these changes in xml and code. Also added some padding between flatlists items to avoid cropping of top part of item selection because of divider.

Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/502/

--HG--
branch : product-engine
---
 .../default/xui/en/panel_body_parts_list_item.xml  | 16 ++++++-------
 .../default/xui/en/panel_clothing_list_item.xml    | 26 +++++++++++-----------
 .../skins/default/xui/en/panel_cof_wearables.xml   |  3 +++
 .../xui/en/panel_deletable_wearable_list_item.xml  |  8 +++----
 .../xui/en/panel_dummy_clothing_list_item.xml      |  8 +++----
 5 files changed, 32 insertions(+), 29 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml
index a0bbc8f2ee..4e5f594ffe 100644
--- a/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  follows="top|right|left"
- height="25"
+ height="23"
  layout="topleft"
  left="0"
  name="wearable_item"
@@ -45,7 +45,7 @@
      use_ellipses="true"
      name="item_name"
      text_color="white"
-     top="4"
+     top="5"
      value="..."
      width="359" />
     <panel
@@ -74,10 +74,10 @@
      name="btn_edit_panel"
      layout="topleft"
      follows="top|right"
-     top="0"
+     top="1"
      left_pad="3"
-     height="24"
-     width="27"
+     height="23"
+     width="26"
      tab_stop="false">
          <button 
           name="btn_edit"
@@ -86,8 +86,8 @@
           image_overlay="Edit_Wrench"
           top="0"
           left="0"
-          height="24"
-          width="24"
+          height="23"
+          width="23"
           tab_stop="false" />
       </panel>
     <icon
@@ -97,7 +97,7 @@
      layout="bottomleft"
      left="0"
      name="wearable_type_separator_icon"
-     top="3"
+     top="0"
      visible="true"
      width="380"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml
index e41141f6bd..5d81aebbd5 100644
--- a/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml
@@ -33,7 +33,7 @@
      follows="top|left"
      image_unselected="Toast_CloseBtn"
      image_selected="Toast_CloseBtn"
-     top="2"
+     top="3"
      left="0"
      height="18"
      width="18"
@@ -56,7 +56,7 @@
      use_ellipses="true"
      name="item_name"
      text_color="white"
-     top="4"
+     top="5"
      value="..."
      width="359" />
     <button 
@@ -64,20 +64,20 @@
      layout="topleft"
      follows="top|right"
      image_overlay="UpArrow_Off"
-     top="0"
+     top="1"
      left="0"
-     height="24"
-     width="24"
+     height="23"
+     width="23"
      tab_stop="false" />
     <button 
      name="btn_move_down"
      layout="topleft"
      follows="top|right"
      image_overlay="DownArrow_Off"
-     top="0"
+     top="1"
      left_pad="3"
-     height="24"
-     width="24"
+     height="23"
+     width="23"
      tab_stop="false" />
     <panel
      background_visible="false"
@@ -107,18 +107,18 @@
      follows="top|right"
      top="0"
      left_pad="3"
-     height="24"
-     width="27"
+     height="23"
+     width="26"
      tab_stop="false">
         <button 
          name="btn_edit"
          layout="topleft"
          follows="top|right"
          image_overlay="Edit_Wrench"
-         top="0"
+         top="1"
          left="0"
-         height="24"
-         width="24"
+         height="23"
+         width="23"
          tab_stop="false" />
       </panel>
     <icon
diff --git a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
index 83040a745b..d36c2a4e6f 100644
--- a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
+++ b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
@@ -28,6 +28,7 @@
              allow_select="true"
              follows="all"
              height="10"
+             item_pad="2"
              layout="topleft"
              left="0"
              multi_select="true"
@@ -43,6 +44,7 @@
              allow_select="true"
              follows="all"
              height="10"
+             item_pad="2"
              layout="topleft"
              left="0"
              multi_select="true"
@@ -58,6 +60,7 @@
              allow_select="true"
              follows="all"
              height="10"
+             item_pad="2"
              layout="topleft"
              left="0"
              multi_select="true"
diff --git a/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml
index b006d125ee..45031859f1 100644
--- a/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  follows="top|right|left"
- height="25"
+ height="23"
  layout="topleft"
  left="0"
  name="deletable_wearable_item"
@@ -33,7 +33,7 @@
      follows="top|left"
      image_unselected="Toast_CloseBtn"
      image_selected="Toast_CloseBtn"
-     top="2"
+     top="3"
      left="0"
      height="18"
      width="18"
@@ -56,7 +56,7 @@
      use_ellipses="true"
      name="item_name"
      text_color="white"
-     top="4"
+     top="5"
      value="..."
      width="359" />
     <icon
@@ -66,7 +66,7 @@
      layout="bottomleft"
      left="0"
      name="wearable_type_separator_icon"
-     top="3"
+     top="0"
      visible="true"
      width="380"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml
index 6c43635d49..20652df918 100644
--- a/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  follows="top|right|left"
- height="25"
+ height="23"
  layout="topleft"
  left="0"
  name="dummy_clothing_item"
@@ -56,8 +56,8 @@
      image_overlay="AddItem_Off"
      top="0"
      left="0"
-     height="24"
-     width="24"
+     height="23"
+     width="23"
      tab_stop="false" />
     <icon
      follows="left|right|top"
@@ -66,7 +66,7 @@
      layout="bottomleft"
      left="0"
      name="wearable_type_separator_icon"
-     top="3"
+     top="0"
      visible="true"
      width="380"/>
 </panel>
-- 
cgit v1.2.3


From c393383f4463f40e4574968c0b440c51022be7b9 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Fri, 4 Jun 2010 13:22:00 -0700
Subject: EXT-7502 Save as option while modifiying a body part doesn't prompt
 for name, and just saves changes. reviewed by Nyx

---
 .../newview/skins/default/xui/en/notifications.xml | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 5ead756d20..9af358eff3 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2068,6 +2068,29 @@ Would you be my friend?
     </form>
   </notification>
 
+  <notification
+ icon="alertmodal.tga"
+ label="Save Wearable"
+ name="SaveWearableAs"
+ type="alertmodal">
+    Save item to my inventory as:
+    <form name="form">
+      <input name="message" type="text">
+        [DESC] (new)
+      </input>
+      <button
+       default="true"
+       index="0"
+       name="Offer"
+       text="OK"/>
+      <button
+       index="1"
+       name="Cancel"
+       text="Cancel"/>
+    </form>
+  </notification>
+
+
   <notification
    icon="alertmodal.tga"
    label="Rename Outfit"
-- 
cgit v1.2.3


From 591e309897704cdc9084c2f8613b6c74f5c8a4e6 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Fri, 4 Jun 2010 14:00:15 -0700
Subject: EXT-7545 FIX remove untranslatable strings; add translate="false" to
 en xui

---
 indra/newview/skins/default/xui/da/floater_buy_land.xml   |  3 ---
 indra/newview/skins/default/xui/de/floater_buy_land.xml   |  3 ---
 .../newview/skins/default/xui/de/panel_landmark_info.xml  |  3 ---
 .../newview/skins/default/xui/de/panel_place_profile.xml  | 15 ---------------
 indra/newview/skins/default/xui/en/floater_buy_land.xml   |  3 +++
 .../newview/skins/default/xui/en/panel_landmark_info.xml  |  3 +++
 .../newview/skins/default/xui/en/panel_place_profile.xml  | 15 +++++++++++++++
 indra/newview/skins/default/xui/es/floater_buy_land.xml   |  3 ---
 indra/newview/skins/default/xui/fr/floater_buy_land.xml   |  3 ---
 .../newview/skins/default/xui/fr/panel_landmark_info.xml  |  3 ---
 .../newview/skins/default/xui/fr/panel_place_profile.xml  | 15 ---------------
 indra/newview/skins/default/xui/it/floater_buy_land.xml   |  3 ---
 indra/newview/skins/default/xui/ja/floater_buy_land.xml   |  3 ---
 .../newview/skins/default/xui/ja/panel_landmark_info.xml  |  3 ---
 .../newview/skins/default/xui/ja/panel_place_profile.xml  | 15 ---------------
 indra/newview/skins/default/xui/pl/floater_buy_land.xml   |  3 ---
 indra/newview/skins/default/xui/pt/floater_buy_land.xml   |  3 ---
 17 files changed, 21 insertions(+), 78 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/da/floater_buy_land.xml b/indra/newview/skins/default/xui/da/floater_buy_land.xml
index 970491b41f..f6ee78fa6d 100644
--- a/indra/newview/skins/default/xui/da/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/da/floater_buy_land.xml
@@ -126,9 +126,6 @@ gennemført.
 	<floater.string name="no_parcel_selected">
 		(intet parcel er valgt)
 	</floater.string>
-	<floater.string name="icon_PG" value="Parcel_PG_Dark"/>
-	<floater.string name="icon_M" value="Parcel_M_Dark"/>
-	<floater.string name="icon_R" value="Parcel_R_Dark"/>
 	<text name="region_name_label">
 		Region:
 	</text>
diff --git a/indra/newview/skins/default/xui/de/floater_buy_land.xml b/indra/newview/skins/default/xui/de/floater_buy_land.xml
index 5708a3f80a..5369155cf9 100644
--- a/indra/newview/skins/default/xui/de/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/de/floater_buy_land.xml
@@ -124,9 +124,6 @@ unterstützt [AMOUNT2] Objekte
 	<floater.string name="no_parcel_selected">
 		(keine Parzelle ausgewählt)
 	</floater.string>
-	<floater.string name="icon_PG" value="Parcel_PG_Dark"/>
-	<floater.string name="icon_M" value="Parcel_M_Dark"/>
-	<floater.string name="icon_R" value="Parcel_R_Dark"/>
 	<text name="region_name_label">
 		Region:
 	</text>
diff --git a/indra/newview/skins/default/xui/de/panel_landmark_info.xml b/indra/newview/skins/default/xui/de/panel_landmark_info.xml
index 9cef7b6d35..10cf34c170 100644
--- a/indra/newview/skins/default/xui/de/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/de/panel_landmark_info.xml
@@ -18,9 +18,6 @@
 	<string name="acquired_date">
 		[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
 	</string>
-	<string name="icon_PG" value="parcel_drk_PG"/>
-	<string name="icon_M" value="parcel_drk_M"/>
-	<string name="icon_R" value="parcel_drk_R"/>
 	<button name="back_btn" tool_tip="Hinten"/>
 	<text name="title" value="Ortsprofil"/>
 	<scroll_container name="place_scroll">
diff --git a/indra/newview/skins/default/xui/de/panel_place_profile.xml b/indra/newview/skins/default/xui/de/panel_place_profile.xml
index ed1421aa60..9d1a582b7c 100644
--- a/indra/newview/skins/default/xui/de/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/de/panel_place_profile.xml
@@ -41,21 +41,6 @@
 	<string name="acquired_date">
 		[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
 	</string>
-	<string name="icon_PG" value="parcel_drk_PG"/>
-	<string name="icon_M" value="parcel_drk_M"/>
-	<string name="icon_R" value="parcel_drk_R"/>
-	<string name="icon_Voice" value="parcel_drk_Voice"/>
-	<string name="icon_VoiceNo" value="parcel_drk_VoiceNo"/>
-	<string name="icon_Fly" value="parcel_drk_Fly"/>
-	<string name="icon_FlyNo" value="parcel_drk_FlyNo"/>
-	<string name="icon_Push" value="parcel_drk_Push"/>
-	<string name="icon_PushNo" value="parcel_drk_PushNo"/>
-	<string name="icon_Build" value="parcel_drk_Build"/>
-	<string name="icon_BuildNo" value="parcel_drk_BuildNo"/>
-	<string name="icon_Scripts" value="parcel_drk_Scripts"/>
-	<string name="icon_ScriptsNo" value="parcel_drk_ScriptsNo"/>
-	<string name="icon_Damage" value="parcel_drk_Damage"/>
-	<string name="icon_DamageNo" value="parcel_drk_DamageNo"/>
 	<button name="back_btn" tool_tip="Hinten"/>
 	<text name="title" value="Ortsprofil"/>
 	<scroll_container name="place_scroll">
diff --git a/indra/newview/skins/default/xui/en/floater_buy_land.xml b/indra/newview/skins/default/xui/en/floater_buy_land.xml
index df44b61632..acaa508792 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_land.xml
@@ -174,12 +174,15 @@ supports [AMOUNT2] objects
     </floater.string>
     <floater.string
      name="icon_PG"
+     translate="false"
      value="Parcel_PG_Dark"/>
     <floater.string
      name="icon_M"
+     translate="false"
      value="Parcel_M_Dark"/>
     <floater.string
      name="icon_R"
+     translate="false"
      value="Parcel_R_Dark"/>
     <text
      type="string"
diff --git a/indra/newview/skins/default/xui/en/panel_landmark_info.xml b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
index 25674a1a39..bb73360e0b 100644
--- a/indra/newview/skins/default/xui/en/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
@@ -46,12 +46,15 @@
     <!-- Texture names for rating icons -->
     <string
      name="icon_PG"
+     translate="false"
      value="Parcel_PG_Dark" />
     <string
      name="icon_M"
+     translate="false"
      value="Parcel_M_Dark" />
     <string
      name="icon_R"
+     translate="false"
      value="Parcel_R_Dark" />
     <button
      follows="top|right"
diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml
index 57ac79686d..c9e41edd5a 100644
--- a/indra/newview/skins/default/xui/en/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml
@@ -95,48 +95,63 @@
     <!-- Texture names for parcel permissions icons -->
     <string
      name="icon_PG"
+     translate="false"
      value="Parcel_PG_Dark" />
     <string
      name="icon_M"
+     translate="false"
      value="Parcel_M_Dark" />
     <string
      name="icon_R"
+     translate="false"
      value="Parcel_R_Dark" />
     <string
      name="icon_Voice"
+     translate="false"
      value="Parcel_Voice_Dark" />
     <string
      name="icon_VoiceNo"
+     translate="false"
      value="Parcel_VoiceNo_Dark" />
     <string
      name="icon_Fly"
+     translate="false"
      value="Parcel_Fly_Dark" />
     <string
      name="icon_FlyNo"
+     translate="false"
      value="Parcel_FlyNo_Dark" />
     <string
      name="icon_Push"
+     translate="false"
      value="Parcel_Push_Dark" />
     <string
      name="icon_PushNo"
+     translate="false"
      value="Parcel_PushNo_Dark" />
     <string
      name="icon_Build"
+     translate="false"
      value="Parcel_Build_Dark" />
     <string
      name="icon_BuildNo"
+     translate="false"
      value="Parcel_BuildNo_Dark" />
     <string
      name="icon_Scripts"
+     translate="false"
      value="Parcel_Scripts_Dark" />
     <string
      name="icon_ScriptsNo"
+     translate="false"
      value="Parcel_ScriptsNo_Dark" />
     <string
      name="icon_Damage"
+     translate="false"
      value="Parcel_Damage_Dark" />
     <string
      name="icon_DamageNo"
+     translate="false"
      value="Parcel_DamageNo_Dark" />
     <button
      follows="top|right"
diff --git a/indra/newview/skins/default/xui/es/floater_buy_land.xml b/indra/newview/skins/default/xui/es/floater_buy_land.xml
index a40f65d5d0..74243a4d06 100644
--- a/indra/newview/skins/default/xui/es/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/es/floater_buy_land.xml
@@ -126,9 +126,6 @@ para cubrir esta parcela.
 	<floater.string name="no_parcel_selected">
 		(No se ha seleccionado una parcela)
 	</floater.string>
-	<floater.string name="icon_PG" value="Parcel_PG_Dark"/>
-	<floater.string name="icon_M" value="Parcel_M_Dark"/>
-	<floater.string name="icon_R" value="Parcel_R_Dark"/>
 	<text name="region_name_label">
 		Región:
 	</text>
diff --git a/indra/newview/skins/default/xui/fr/floater_buy_land.xml b/indra/newview/skins/default/xui/fr/floater_buy_land.xml
index 7c9a31a4c3..b7f8f36f81 100644
--- a/indra/newview/skins/default/xui/fr/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/fr/floater_buy_land.xml
@@ -124,9 +124,6 @@ prend en charge [AMOUNT2] objets
 	<floater.string name="no_parcel_selected">
 		(aucune parcelle sélectionnée)
 	</floater.string>
-	<floater.string name="icon_PG" value="Parcel_PG_Dark"/>
-	<floater.string name="icon_M" value="Parcel_M_Dark"/>
-	<floater.string name="icon_R" value="Parcel_R_Dark"/>
 	<text name="region_name_label">
 		Région :
 	</text>
diff --git a/indra/newview/skins/default/xui/fr/panel_landmark_info.xml b/indra/newview/skins/default/xui/fr/panel_landmark_info.xml
index 4001616034..bd29bd676c 100644
--- a/indra/newview/skins/default/xui/fr/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/fr/panel_landmark_info.xml
@@ -18,9 +18,6 @@
 	<string name="acquired_date">
 		[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
 	</string>
-	<string name="icon_PG" value="parcel_drk_PG"/>
-	<string name="icon_M" value="parcel_drk_M"/>
-	<string name="icon_R" value="parcel_drk_R"/>
 	<button name="back_btn" tool_tip="Précédent"/>
 	<text name="title" value="Profil du lieu"/>
 	<scroll_container name="place_scroll">
diff --git a/indra/newview/skins/default/xui/fr/panel_place_profile.xml b/indra/newview/skins/default/xui/fr/panel_place_profile.xml
index 598e94166e..731e045019 100644
--- a/indra/newview/skins/default/xui/fr/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/fr/panel_place_profile.xml
@@ -41,21 +41,6 @@
 	<string name="acquired_date">
 		[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
 	</string>
-	<string name="icon_PG" value="parcel_drk_PG"/>
-	<string name="icon_M" value="parcel_drk_M"/>
-	<string name="icon_R" value="parcel_drk_R"/>
-	<string name="icon_Voice" value="parcel_drk_Voice"/>
-	<string name="icon_VoiceNo" value="parcel_drk_VoiceNo"/>
-	<string name="icon_Fly" value="parcel_drk_Fly"/>
-	<string name="icon_FlyNo" value="parcel_drk_FlyNo"/>
-	<string name="icon_Push" value="parcel_drk_Push"/>
-	<string name="icon_PushNo" value="parcel_drk_PushNo"/>
-	<string name="icon_Build" value="parcel_drk_Build"/>
-	<string name="icon_BuildNo" value="parcel_drk_BuildNo"/>
-	<string name="icon_Scripts" value="parcel_drk_Scripts"/>
-	<string name="icon_ScriptsNo" value="parcel_drk_ScriptsNo"/>
-	<string name="icon_Damage" value="parcel_drk_Damage"/>
-	<string name="icon_DamageNo" value="parcel_drk_DamageNo"/>
 	<button name="back_btn" tool_tip="Précédent"/>
 	<text name="title" value="Profil du lieu"/>
 	<scroll_container name="place_scroll">
diff --git a/indra/newview/skins/default/xui/it/floater_buy_land.xml b/indra/newview/skins/default/xui/it/floater_buy_land.xml
index 2e78168209..f3b30f7048 100644
--- a/indra/newview/skins/default/xui/it/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/it/floater_buy_land.xml
@@ -124,9 +124,6 @@ consente [AMOUNT2] oggetti
 	<floater.string name="no_parcel_selected">
 		(nessun terreno selezionato)
 	</floater.string>
-	<floater.string name="icon_PG" value="Parcel_PG_Dark"/>
-	<floater.string name="icon_M" value="Parcel_M_Dark"/>
-	<floater.string name="icon_R" value="Parcel_R_Dark"/>
 	<text name="region_name_label">
 		Regione:
 	</text>
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_land.xml b/indra/newview/skins/default/xui/ja/floater_buy_land.xml
index a274e25326..34f9d38de1 100644
--- a/indra/newview/skins/default/xui/ja/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/ja/floater_buy_land.xml
@@ -124,9 +124,6 @@
 	<floater.string name="no_parcel_selected">
 		(区画が選定されていません)
 	</floater.string>
-	<floater.string name="icon_PG" value="Parcel_PG_Dark"/>
-	<floater.string name="icon_M" value="Parcel_M_Dark"/>
-	<floater.string name="icon_R" value="Parcel_R_Dark"/>
 	<text name="region_name_label">
 		地域：
 	</text>
diff --git a/indra/newview/skins/default/xui/ja/panel_landmark_info.xml b/indra/newview/skins/default/xui/ja/panel_landmark_info.xml
index 87477c2651..7fca66f90f 100644
--- a/indra/newview/skins/default/xui/ja/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/ja/panel_landmark_info.xml
@@ -18,9 +18,6 @@
 	<string name="acquired_date">
 		[year,datetime,local] [mth,datetime,local] [day,datetime,local] [wkday,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local]
 	</string>
-	<string name="icon_PG" value="parcel_drk_PG"/>
-	<string name="icon_M" value="parcel_drk_M"/>
-	<string name="icon_R" value="parcel_drk_R"/>
 	<button name="back_btn" tool_tip="戻る"/>
 	<text name="title" value="場所のプロフィール"/>
 	<scroll_container name="place_scroll">
diff --git a/indra/newview/skins/default/xui/ja/panel_place_profile.xml b/indra/newview/skins/default/xui/ja/panel_place_profile.xml
index 9de04f0d6a..b897e1d748 100644
--- a/indra/newview/skins/default/xui/ja/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/ja/panel_place_profile.xml
@@ -41,21 +41,6 @@
 	<string name="acquired_date">
 		[year,datetime,local] [mth,datetime,local] [day,datetime,local] [wkday,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local]
 	</string>
-	<string name="icon_PG" value="parcel_drk_PG"/>
-	<string name="icon_M" value="parcel_drk_M"/>
-	<string name="icon_R" value="parcel_drk_R"/>
-	<string name="icon_Voice" value="parcel_drk_Voice"/>
-	<string name="icon_VoiceNo" value="parcel_drk_VoiceNo"/>
-	<string name="icon_Fly" value="parcel_drk_Fly"/>
-	<string name="icon_FlyNo" value="parcel_drk_FlyNo"/>
-	<string name="icon_Push" value="parcel_drk_Push"/>
-	<string name="icon_PushNo" value="parcel_drk_PushNo"/>
-	<string name="icon_Build" value="parcel_drk_Build"/>
-	<string name="icon_BuildNo" value="parcel_drk_BuildNo"/>
-	<string name="icon_Scripts" value="parcel_drk_Scripts"/>
-	<string name="icon_ScriptsNo" value="parcel_drk_ScriptsNo"/>
-	<string name="icon_Damage" value="parcel_drk_Damage"/>
-	<string name="icon_DamageNo" value="parcel_drk_DamageNo"/>
 	<button name="back_btn" tool_tip="戻る"/>
 	<text name="title" value="場所のプロフィール"/>
 	<scroll_container name="place_scroll">
diff --git a/indra/newview/skins/default/xui/pl/floater_buy_land.xml b/indra/newview/skins/default/xui/pl/floater_buy_land.xml
index 3d01129d9b..7b4f459b4e 100644
--- a/indra/newview/skins/default/xui/pl/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/pl/floater_buy_land.xml
@@ -125,9 +125,6 @@ używanie Posiadłości żeby sfinalizować ten zakup.
 	<floater.string name="no_parcel_selected">
 		(Posiadłość nie została wybrana)
 	</floater.string>
-	<floater.string name="icon_PG" value="Parcel_PG_Dark"/>
-	<floater.string name="icon_M" value="Parcel_M_Dark"/>
-	<floater.string name="icon_R" value="Parcel_R_Dark"/>
 	<text name="region_name_label">
 		Region:
 	</text>
diff --git a/indra/newview/skins/default/xui/pt/floater_buy_land.xml b/indra/newview/skins/default/xui/pt/floater_buy_land.xml
index 73b483acf2..5c5ee3b7a0 100644
--- a/indra/newview/skins/default/xui/pt/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/pt/floater_buy_land.xml
@@ -124,9 +124,6 @@ contribuídas para cobrir este lote antes da aquisição se completar.
 	<floater.string name="no_parcel_selected">
 		(nenhum lote selecionado)
 	</floater.string>
-	<floater.string name="icon_PG" value="Parcel_PG_Dark"/>
-	<floater.string name="icon_M" value="Parcel_M_Dark"/>
-	<floater.string name="icon_R" value="Parcel_R_Dark"/>
 	<text name="region_name_label">
 		Região:
 	</text>
-- 
cgit v1.2.3


From 46e1253ee11cd2aca41314ec4e9c053bddd7a0b4 Mon Sep 17 00:00:00 2001
From: Richard Nelson <none@none>
Date: Fri, 4 Jun 2010 14:25:51 -0700
Subject: DEV-50015 FIX Implement changes to the Buy L$ button in the top bar
 of the viewer reviewed by Mani

---
 .../skins/default/xui/en/panel_status_bar.xml      | 34 ++++++++++++----------
 1 file changed, 19 insertions(+), 15 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index 008aa1acc0..43513e1ab6 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -41,32 +41,35 @@
      name="buycurrencylabel">
         L$ [AMT]
     </panel.string>
-    <button
+  <panel
+    height="18"
+    left="-315"
+    width="95"
+    top="1"
+    follows="right|top" 
+    name="balance_bg" 
+    bg_visible="true"
+    background_opaque="true" 
+    bg_opaque_image="bevel_background">
+    <text
      auto_resize="true"
      halign="center"
-	 enabled="false"
      font="SansSerifSmall"
-     follows="right|top"
-     image_overlay=""
-     image_selected="bevel_background"
-     image_unselected="bevel_background"
-     image_pressed="bevel_background"
+     follows="all"
      height="18"
-     right="-275"
-     label_shadow="false"
-     name="buycurrency"
-     label_color_disabled="ButtonLabelColor"
-     image_color_disabled="White"
+     left="0" 
+     name="balance"
      tool_tip="My Balance"
-     pad_left="12"
-     pad_right="12" 
+     v_pad="4"
      top="0"
+     wrap="false" 
+     value="L$20" 
      width="40" />
     <button
      auto_resize="true"
      halign="center"
      font="SansSerifSmall"
-     follows="right|top"
+     follows="right|top|bottom"
      image_hover_unselected="buy_over"
      image_unselected="buy_off"
      image_pressed="buy_press"
@@ -81,6 +84,7 @@
      tool_tip="Click to buy more L$"
      top="0"
      width="55" />
+  </panel>
     <text
      type="string"
      font="SansSerifSmall"
-- 
cgit v1.2.3


From 92b104f4168588985b4c9c66d24e8f67f2b6e49e Mon Sep 17 00:00:00 2001
From: "Nyx (Neal Orman)" <nyx@lindenlab.com>
Date: Fri, 4 Jun 2010 18:43:13 -0400
Subject: VWR-19699 Correct "wear" and "add" behavior

added "add" menu item to clothing right-click menus and corrected
"wear" to mean "replace top wearable of this type"

reviewed by Richard
---
 indra/newview/skins/default/xui/en/menu_wearable_list_item.xml | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
index e645702f93..fa5ca60a19 100644
--- a/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
@@ -8,6 +8,13 @@
         <on_click
          function="Wearable.Wear" />
     </menu_item_call>
+    <menu_item_call
+     label="Add"
+     layout="topleft"
+     name="wear_add">
+        <on_click
+         function="Wearable.Add" />
+    </menu_item_call>
     <menu_item_call
      label="Take Off / Detach"
      layout="topleft"
-- 
cgit v1.2.3


From 8decaaa925532ea31c592aa3dbdd5f14e86797df Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Mon, 7 Jun 2010 13:50:50 +0300
Subject: EXT-7368 FIXED disabled using of accordion's "empty_accordion_text"
 in Friends List.

This patch follows (23f0f13abc8b) and prevent to show two messages about empty Friends list.

Reviewed by Vadim Savchuk.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_people.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index b79ef1e287..da28773c74 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -173,6 +173,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
        		 background_visible="true"
        		 bg_alpha_color="DkGray2"
        		 bg_opaque_color="DkGray2"
+             empty_accordion_text.value=""
              follows="all"
              height="356"
              layout="topleft"
-- 
cgit v1.2.3


From b3aaafffa4bdfc0241401841fa85a03b2f66a651 Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Mon, 7 Jun 2010 14:27:29 +0300
Subject: EXT-7629 FIXED removed redundant label xml attributes

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/520

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/floater_im_session.xml | 1 -
 indra/newview/skins/default/xui/en/panel_outfit_edit.xml  | 7 -------
 2 files changed, 8 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index f537c81860..c9b013099b 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -33,7 +33,6 @@
       name="panel_im_control_panel"
       layout="topleft"
       follows="left"
-      label="IM Control Panel"
       min_width="115" 
       auto_resize="false"
       user_resize="true" />
diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index 40f60d50fb..feee532320 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -5,7 +5,6 @@
  border="false"
  height="600"
  follows="all"
- label="Outfit Edit"
  layout="topleft"
  left="0"
  min_height="350"
@@ -85,7 +84,6 @@
      bevel_style="none"
      follows="top|left|right"
      height="40"
-     label="bottom_panel"
      layout="topleft"
      left="6"
      name="header_panel"
@@ -106,7 +104,6 @@
              bevel_style="none"
              follows="top|right"
              height="38"
-             label="bottom_panel"
              layout="topleft"
              left_pad="5"
              name="outfit_name_and_status"
@@ -160,7 +157,6 @@ It is calculated as border_size + 2*UIResizeBarOverlap
         <layout_panel
          layout="topleft"
          height="187"
-         label="IM Control Panel"
          min_height="100"
          name="outfit_wearables_panel"
          width="313"
@@ -183,7 +179,6 @@ It is calculated as border_size + 2*UIResizeBarOverlap
                  bg_alpha_color="DkGray2"
                  layout="topleft"
                  height="154"
-                 label="add_button_and_combobox"
                  name="add_button_and_combobox"
                  width="311"
                  user_resize="false"
@@ -343,7 +338,6 @@ It is calculated as border_size + 2*UIResizeBarOverlap
      bevel_style="none"
      follows="bottom|left|right"
      height="27"
-     label="bottom_panel"
      layout="topleft"
      left="5"
      name="no_add_wearables_button_bar"
@@ -378,7 +372,6 @@ It is calculated as border_size + 2*UIResizeBarOverlap
      bevel_style="none"
      follows="left|right|bottom"
      height="27"
-     label="add_wearables_button_bar"
      layout="topleft"
      left="5"
      name="add_wearables_button_bar"
-- 
cgit v1.2.3


From 1856436fb93c7dc45821c1791dbbced26151b2c0 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Mon, 7 Jun 2010 17:04:28 +0300
Subject: EXT-7443 FIXED Speak button's layout updated - Reduced right padding
 by 2 px in main locale, remove horizontal align in 'de' locale.

For now all locales have the same center aligning with right padding to ignore space under indicator.

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/519/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/de/panel_bottomtray.xml | 2 +-
 indra/newview/skins/default/xui/en/panel_bottomtray.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/de/panel_bottomtray.xml b/indra/newview/skins/default/xui/de/panel_bottomtray.xml
index d52b8dcf4d..83f67344ca 100644
--- a/indra/newview/skins/default/xui/de/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/de/panel_bottomtray.xml
@@ -9,7 +9,7 @@
 	<layout_stack name="toolbar_stack">
 		<layout_panel name="speak_panel">
 			<talk_button name="talk">
-				<speak_button label="Sprechen" label_selected="Sprechen" name="speak_btn" halign="right" />
+				<speak_button label="Sprechen" label_selected="Sprechen" name="speak_btn" />
 			</talk_button>
 		</layout_panel>
 		<layout_panel name="gesture_panel">
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 82b2405ec9..4eff5bc48a 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -90,7 +90,7 @@
                  label="Speak"
                  label_selected="Speak"
                  name="speak_btn"
-                 pad_right="22"
+                 pad_right="20"
                  tab_stop="true"
                  use_ellipses="true" />
             </talk_button>
-- 
cgit v1.2.3


From 6350930aa9382f0766594db1a6f82d78ba4d43fb Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Tue, 8 Jun 2010 14:40:21 -0400
Subject: EXT-7631 FIXED Bad location of Empty Lost and Found option will lead
 to Critical Inventory loss by Residents

Separated Lost&Found from EmptyTrash as specified in EXT design decision.
---
 .../default/xui/en/menu_inventory_gear_default.xml     | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
index 4e6a07d020..2501e35e93 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
@@ -68,14 +68,6 @@
          function="Inventory.GearDefault.Custom.Action"
          parameter="empty_trash" />
     </menu_item_call>
-    <menu_item_call
-     label="Empty Lost and Found"
-     layout="topleft"
-     name="empty_lostnfound">
-        <on_click
-         function="Inventory.GearDefault.Custom.Action"
-         parameter="empty_lostnfound" />
-    </menu_item_call>
     <menu_item_separator
      layout="topleft" />
     <menu_item_call 
@@ -111,4 +103,14 @@
 			 function="Inventory.GearDefault.Enable"
 			 parameter="find_links" />
         </menu_item_call>
+    <menu_item_separator
+     layout="topleft" />
+    <menu_item_call
+     label="Empty Lost and Found"
+     layout="topleft"
+     name="empty_lostnfound">
+        <on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="empty_lostnfound" />
+    </menu_item_call>
 </menu>
-- 
cgit v1.2.3


From 16247ce9b563f6a145ca029ede234647131aab98 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Tue, 8 Jun 2010 14:44:51 -0400
Subject: EXT-7631 FIXED Bad location of Empty Lost and Found option will lead
 to Critical Inventory loss by Residents

Switched location of Lost&Found versus EmptyTrash items.
---
 .../skins/default/xui/en/menu_inventory_gear_default.xml    | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
index 2501e35e93..62365f7cc2 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
@@ -61,12 +61,12 @@
     <menu_item_separator
      layout="topleft" />
     <menu_item_call
-     label="Empty Trash"
+     label="Empty Lost and Found"
      layout="topleft"
-     name="empty_trash">
+     name="empty_lostnfound">
         <on_click
          function="Inventory.GearDefault.Custom.Action"
-         parameter="empty_trash" />
+         parameter="empty_lostnfound" />
     </menu_item_call>
     <menu_item_separator
      layout="topleft" />
@@ -105,12 +105,13 @@
         </menu_item_call>
     <menu_item_separator
      layout="topleft" />
+
     <menu_item_call
-     label="Empty Lost and Found"
+     label="Empty Trash"
      layout="topleft"
-     name="empty_lostnfound">
+     name="empty_trash">
         <on_click
          function="Inventory.GearDefault.Custom.Action"
-         parameter="empty_lostnfound" />
+         parameter="empty_trash" />
     </menu_item_call>
 </menu>
-- 
cgit v1.2.3


From 62238e524448b358281f8eca83a07bb790a3eab9 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Tue, 8 Jun 2010 11:46:33 -0700
Subject: ND-46735 WIP PT translation and JA linguistic

---
 .../skins/default/xui/ja/menu_bottomtray.xml       |  10 +-
 .../newview/skins/default/xui/ja/notifications.xml |   2 +-
 indra/newview/skins/default/xui/ja/panel_login.xml |   4 +-
 .../newview/skins/default/xui/pt/floater_about.xml |   4 +-
 .../skins/default/xui/pt/floater_about_land.xml    |   3 +
 .../default/xui/pt/floater_avatar_textures.xml     |  73 +++++-----
 indra/newview/skins/default/xui/pt/floater_map.xml |   2 +-
 .../skins/default/xui/pt/floater_moveview.xml      |  36 ++++-
 .../default/xui/pt/floater_preview_notecard.xml    |   4 +-
 .../newview/skins/default/xui/pt/floater_tools.xml |   6 +-
 .../skins/default/xui/pt/menu_attachment_self.xml  |   2 +-
 .../skins/default/xui/pt/menu_avatar_self.xml      |   4 +-
 .../skins/default/xui/pt/menu_bottomtray.xml       |   5 +
 .../default/xui/pt/menu_inspect_self_gear.xml      |   2 +-
 .../skins/default/xui/pt/menu_inventory.xml        |   1 +
 indra/newview/skins/default/xui/pt/menu_login.xml  |   2 +-
 .../skins/default/xui/pt/menu_participant_list.xml |   4 +-
 indra/newview/skins/default/xui/pt/menu_viewer.xml |   4 +-
 .../newview/skins/default/xui/pt/notifications.xml | 109 ++++++++++++--
 .../skins/default/xui/pt/panel_bottomtray.xml      |  23 ++-
 .../skins/default/xui/pt/panel_edit_shape.xml      |  12 +-
 .../skins/default/xui/pt/panel_edit_tattoo.xml     |   1 +
 .../skins/default/xui/pt/panel_edit_wearable.xml   |   6 +
 .../default/xui/pt/panel_group_land_money.xml      |   3 +
 .../skins/default/xui/pt/panel_group_notices.xml   |   1 +
 indra/newview/skins/default/xui/pt/panel_login.xml |  12 +-
 .../skins/default/xui/pt/panel_main_inventory.xml  |  66 ++-------
 .../skins/default/xui/pt/panel_outfit_edit.xml     |  13 +-
 .../newview/skins/default/xui/pt/panel_people.xml  |  12 +-
 .../default/xui/pt/panel_preferences_advanced.xml  |   1 +
 .../default/xui/pt/panel_preferences_chat.xml      |   1 +
 .../default/xui/pt/panel_preferences_graphics1.xml |   7 +-
 .../skins/default/xui/pt/sidepanel_appearance.xml  |   8 +-
 .../skins/default/xui/pt/sidepanel_inventory.xml   |   1 +
 indra/newview/skins/default/xui/pt/strings.xml     | 158 ++++++++++++++++++++-
 35 files changed, 429 insertions(+), 173 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/ja/menu_bottomtray.xml b/indra/newview/skins/default/xui/ja/menu_bottomtray.xml
index 0e69671f06..e5703c559b 100644
--- a/indra/newview/skins/default/xui/ja/menu_bottomtray.xml
+++ b/indra/newview/skins/default/xui/ja/menu_bottomtray.xml
@@ -4,11 +4,11 @@
 	<menu_item_check label="移動ボタン" name="ShowMoveButton"/>
 	<menu_item_check label="視界ボタン" name="ShowCameraButton"/>
 	<menu_item_check label="スナップショットボタン" name="ShowSnapshotButton"/>
-	<menu_item_check label="サイドバーのボタン" name="ShowSidebarButton"/>
-	<menu_item_check label="制作のボタン" name="ShowBuildButton"/>
-	<menu_item_check label="検索のボタン" name="ShowSearchButton"/>
-	<menu_item_check label="地図のボタン" name="ShowWorldMapButton"/>
-	<menu_item_check label="ミニマップのボタン" name="ShowMiniMapButton"/>
+	<menu_item_check label="サイドバーボタン" name="ShowSidebarButton"/>
+	<menu_item_check label="制作ボタン" name="ShowBuildButton"/>
+	<menu_item_check label="検索ボタン" name="ShowSearchButton"/>
+	<menu_item_check label="地図ボタン" name="ShowWorldMapButton"/>
+	<menu_item_check label="ミニマップボタン" name="ShowMiniMapButton"/>
 	<menu_item_call label="切り取り" name="NearbyChatBar_Cut"/>
 	<menu_item_call label="コピー" name="NearbyChatBar_Copy"/>
 	<menu_item_call label="貼り付け" name="NearbyChatBar_Paste"/>
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
index 1ac7677b07..c82f1198a4 100644
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -349,7 +349,7 @@ L$ が不足しているのでこのグループに参加することができ
 		<usetemplate name="okcancelbuttons" notext="もう一度試す" yestext="新しいアカウントを作成"/>
 	</notification>
 	<notification name="InvalidCredentialFormat">
-		「ユーザー名」欄にアバターのファーストネームとラストネーム両方を入力してからログインしてください。
+		「ユーザーネーム」欄にアバターのファーストネームとラストネーム両方を入力してからログインしてください。
 	</notification>
 	<notification name="AddClassified">
 		クラシファイド広告は、検索ディレクトリと [http://secondlife.com/community/classifieds secondlife.com] の「クラシファイド広告」セクションに一週間掲載されます。
diff --git a/indra/newview/skins/default/xui/ja/panel_login.xml b/indra/newview/skins/default/xui/ja/panel_login.xml
index f0ebc67ef5..47d7a88b4c 100644
--- a/indra/newview/skins/default/xui/ja/panel_login.xml
+++ b/indra/newview/skins/default/xui/ja/panel_login.xml
@@ -9,9 +9,9 @@
 	<layout_stack name="login_widgets">
 		<layout_panel name="login">
 			<text name="username_text">
-				ユーザー名：
+				ユーザーネーム：
 			</text>
-			<line_editor label="ユーザー名" name="username_edit" tool_tip="[SECOND_LIFE] ユーザー名"/>
+			<line_editor label="ユーザーネーム" name="username_edit" tool_tip="[SECOND_LIFE] ユーザーネーム"/>
 			<text name="password_text">
 				パスワード：
 			</text>
diff --git a/indra/newview/skins/default/xui/pt/floater_about.xml b/indra/newview/skins/default/xui/pt/floater_about.xml
index 7671f58691..4044110b47 100644
--- a/indra/newview/skins/default/xui/pt/floater_about.xml
+++ b/indra/newview/skins/default/xui/pt/floater_about.xml
@@ -26,9 +26,9 @@ Placa gráfica: [GRAPHICS_CARD]
 
 Versão libcurl: [LIBCURL_VERSION]
 Versão J2C Decoder: [J2C_VERSION]
-Versão do driver de áudio: [AUDIO_DRIVER_VERSION] 
+Versão do driver de áudio: [AUDIO_DRIVER_VERSION]
 Versão Qt Webkit: [QT_WEBKIT_VERSION]
-Versão Vivox: [VIVOX_VERSION]
+Versão do servidor de voz: [VOICE_VERSION]
 	</floater.string>
 	<floater.string name="none">
 		(nenhum)
diff --git a/indra/newview/skins/default/xui/pt/floater_about_land.xml b/indra/newview/skins/default/xui/pt/floater_about_land.xml
index 787836a8bd..56ffcbdece 100644
--- a/indra/newview/skins/default/xui/pt/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/pt/floater_about_land.xml
@@ -63,6 +63,9 @@
 				Nenhum lote selecionado.
 Vá para o menu Mundo &gt; Sobre o terreno ou selecione outro lote para mostrar os detalhes.
 			</panel.string>
+			<panel.string name="time_stamp_template">
+				[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
+			</panel.string>
 			<text name="Name:">
 				Nome:
 			</text>
diff --git a/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml b/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml
index 5fb64f64b3..9473ee7ce9 100644
--- a/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml
@@ -3,41 +3,48 @@
 	<floater.string name="InvalidAvatar">
 		AVATAR INVÁLIDO
 	</floater.string>
-	<text name="composite_label">
-		Texturas compostas
-	</text>
-	<button label="Tombar" label_selected="Tombar" name="Dump"/>
 	<scroll_container name="profile_scroll">
 		<panel name="scroll_content_panel">
-			<texture_picker label="Cabelo" name="hair-baked"/>
-			<texture_picker label="Cabelo" name="hair_grain"/>
-			<texture_picker label="Cabelo alpha" name="hair_alpha"/>
-			<texture_picker label="Cabeça" name="head-baked"/>
-			<texture_picker label="Maquilagem" name="head_bodypaint"/>
-			<texture_picker label="Cabeça Alpha" name="head_alpha"/>
-			<texture_picker label="Tatuagem na cabeça" name="head_tattoo"/>
-			<texture_picker label="Olhos" name="eyes-baked"/>
-			<texture_picker label="Olho" name="eyes_iris"/>
-			<texture_picker label="Olhos Alpha" name="eyes_alpha"/>
-			<texture_picker label="Cintura acima" name="upper-baked"/>
-			<texture_picker label="Pintura corporal, cintura para cima" name="upper_bodypaint"/>
-			<texture_picker label="Camiseta" name="upper_undershirt"/>
-			<texture_picker label="Luvas" name="upper_gloves"/>
-			<texture_picker label="Camisa" name="upper_shirt"/>
-			<texture_picker label="Jaqueta (cima)" name="upper_jacket"/>
-			<texture_picker label="Alpha de cima" name="upper_alpha"/>
-			<texture_picker label="Tatuagem parte de cima" name="upper_tattoo"/>
-			<texture_picker label="Cintura para baixo" name="lower-baked"/>
-			<texture_picker label="Pintura corporal, cintura para baixo" name="lower_bodypaint"/>
-			<texture_picker label="Roupa de baixo" name="lower_underpants"/>
-			<texture_picker label="Meias" name="lower_socks"/>
-			<texture_picker label="Sapatos" name="lower_shoes"/>
-			<texture_picker label="Calças" name="lower_pants"/>
-			<texture_picker label="Jaqueta" name="lower_jacket"/>
-			<texture_picker label="Alpha inferior" name="lower_alpha"/>
-			<texture_picker label="Tatuagem de baixo" name="lower_tattoo"/>
-			<texture_picker label="Saia" name="skirt-baked"/>
-			<texture_picker label="Saia" name="skirt"/>
+			<text name="label">
+				Pronto
+Texturas
+			</text>
+			<text name="composite_label">
+				Compósito:
+Texturas
+			</text>
+			<button label="Enviar IDs para painel" label_selected="Dump" name="Dump"/>
+			<panel name="scroll_content_panel">
+				<texture_picker label="Cabelo" name="hair-baked"/>
+				<texture_picker label="Cabelo" name="hair_grain"/>
+				<texture_picker label="Cabelo alpha" name="hair_alpha"/>
+				<texture_picker label="Cabeça" name="head-baked"/>
+				<texture_picker label="Maquilagem" name="head_bodypaint"/>
+				<texture_picker label="Cabeça Alpha" name="head_alpha"/>
+				<texture_picker label="Tatuagem na cabeça" name="head_tattoo"/>
+				<texture_picker label="Olhos" name="eyes-baked"/>
+				<texture_picker label="Olho" name="eyes_iris"/>
+				<texture_picker label="Olhos Alpha" name="eyes_alpha"/>
+				<texture_picker label="Cintura acima" name="upper-baked"/>
+				<texture_picker label="Pintura corporal, cintura para cima" name="upper_bodypaint"/>
+				<texture_picker label="Camiseta" name="upper_undershirt"/>
+				<texture_picker label="Luvas" name="upper_gloves"/>
+				<texture_picker label="Camisa" name="upper_shirt"/>
+				<texture_picker label="Jaqueta (cima)" name="upper_jacket"/>
+				<texture_picker label="Alpha de cima" name="upper_alpha"/>
+				<texture_picker label="Tatuagem parte de cima" name="upper_tattoo"/>
+				<texture_picker label="Cintura para baixo" name="lower-baked"/>
+				<texture_picker label="Cintura para baixo" name="lower_bodypaint"/>
+				<texture_picker label="Roupa de baixo" name="lower_underpants"/>
+				<texture_picker label="Meias" name="lower_socks"/>
+				<texture_picker label="Sapatos" name="lower_shoes"/>
+				<texture_picker label="Calças" name="lower_pants"/>
+				<texture_picker label="Jaqueta" name="lower_jacket"/>
+				<texture_picker label="Alpha inferior" name="lower_alpha"/>
+				<texture_picker label="Tatuagem de baixo" name="lower_tattoo"/>
+				<texture_picker label="Saia" name="skirt-baked"/>
+				<texture_picker label="Saia" name="skirt"/>
+			</panel>
 		</panel>
 	</scroll_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_map.xml b/indra/newview/skins/default/xui/pt/floater_map.xml
index 3a04528228..f8e4e76752 100644
--- a/indra/newview/skins/default/xui/pt/floater_map.xml
+++ b/indra/newview/skins/default/xui/pt/floater_map.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Map" title="Mini Mapa">
+<floater name="Map" title="">
 	<floater.string name="mini_map_north">
 		N
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/pt/floater_moveview.xml b/indra/newview/skins/default/xui/pt/floater_moveview.xml
index 9c02570076..b1dc65e3af 100644
--- a/indra/newview/skins/default/xui/pt/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/pt/floater_moveview.xml
@@ -6,18 +6,48 @@
 	<string name="walk_back_tooltip">
 		Andar para trás (flecha para baixo ou S)
 	</string>
+	<string name="walk_left_tooltip">
+		Andar para a esquerda (Shift + Seta esquerda ou A)
+	</string>
+	<string name="walk_right_tooltip">
+		Andar para a direita (Shift + Seta direita ou D)
+	</string>
 	<string name="run_forward_tooltip">
 		Correr para frente (flecha para cima ou W)
 	</string>
 	<string name="run_back_tooltip">
 		Correr para trás (flecha para baixo ou S)
 	</string>
+	<string name="run_left_tooltip">
+		Correr para a esquerda (Shift + Seta esquerda ou A)
+	</string>
+	<string name="run_right_tooltip">
+		Correr para a direita (Shift + Seta direita ou D)
+	</string>
 	<string name="fly_forward_tooltip">
 		Voar para frente (flecha para cima ou W)
 	</string>
 	<string name="fly_back_tooltip">
 		Voar para trás (flecha para baixo ou S)
 	</string>
+	<string name="fly_left_tooltip">
+		Voar para a esquerda (Shift + Seta esquerda ou A)
+	</string>
+	<string name="fly_right_tooltip">
+		Voar para a direita (Shift + Seta direita ou D)
+	</string>
+	<string name="fly_up_tooltip">
+		Voar para cima (tecla E)
+	</string>
+	<string name="fly_down_tooltip">
+		Voar para baixo (tecla C)
+	</string>
+	<string name="jump_tooltip">
+		Pular (tecla E)
+	</string>
+	<string name="crouch_tooltip">
+		Agachar (tecla C)
+	</string>
 	<string name="walk_title">
 		Andar
 	</string>
@@ -28,10 +58,12 @@
 		Voar
 	</string>
 	<panel name="panel_actions">
-		<button label="" label_selected="" name="turn left btn" tool_tip="Virar à esquerda (flecha ESQ ou A)"/>
-		<button label="" label_selected="" name="turn right btn" tool_tip="Virar à direita (flecha DIR ou D)"/>
 		<button label="" label_selected="" name="move up btn" tool_tip="Voar para cima (tecla E)"/>
+		<button label="" label_selected="" name="turn left btn" tool_tip="Virar à esquerda (flecha ESQ ou A)"/>
+		<joystick_slide name="move left btn" tool_tip="Andar para a esquerda (Shift + Seta esquerda ou A)"/>
 		<button label="" label_selected="" name="move down btn" tool_tip="Voar para baixo (tecla C)"/>
+		<button label="" label_selected="" name="turn right btn" tool_tip="Virar à direita (flecha DIR ou D)"/>
+		<joystick_slide name="move right btn" tool_tip="Andar para a direita (Shift + Seta direita ou D)"/>
 		<joystick_turn name="forward btn" tool_tip="Andar para frente (flecha para cima ou W)"/>
 		<joystick_turn name="backward btn" tool_tip="Andar para trás (flecha para baixo ou S)"/>
 	</panel>
diff --git a/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml b/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml
index e648a7d873..d094c1b63a 100644
--- a/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml
@@ -9,9 +9,6 @@
 	<floater.string name="Title">
 		Anotação: [NAME]
 	</floater.string>
-	<floater.string label="Salvar" label_selected="Salvar" name="Save">
-		Salvar
-	</floater.string>
 	<text name="desc txt">
 		Descrição:
 	</text>
@@ -19,4 +16,5 @@
 		Carregando...
 	</text_editor>
 	<button label="Salvar" label_selected="Salvar" name="Save"/>
+	<button label="Excluir" label_selected="Excluir" name="Delete"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_tools.xml b/indra/newview/skins/default/xui/pt/floater_tools.xml
index 74b45f1d1e..dbc8b3ffbe 100644
--- a/indra/newview/skins/default/xui/pt/floater_tools.xml
+++ b/indra/newview/skins/default/xui/pt/floater_tools.xml
@@ -67,9 +67,9 @@
 	<text name="RenderingCost" tool_tip="Mostra o cálculo do custo de renderização do objeto">
 		þ: [COUNT]
 	</text>
-	<check_box name="checkbox uniform"/>
-	<text name="checkbox uniform label">
-		Esticar ambos os lados
+	<check_box label="" name="checkbox uniform"/>
+	<text label="Esticar ambos lados" name="checkbox uniform label">
+		Esticar ambos lados
 	</text>
 	<check_box initial_value="true" label="Esticar texturas" name="checkbox stretch textures"/>
 	<check_box initial_value="true" label="Mostrar na grade" name="checkbox snap to grid"/>
diff --git a/indra/newview/skins/default/xui/pt/menu_attachment_self.xml b/indra/newview/skins/default/xui/pt/menu_attachment_self.xml
index de3178b946..5cb1b211cf 100644
--- a/indra/newview/skins/default/xui/pt/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/pt/menu_attachment_self.xml
@@ -5,7 +5,7 @@
 	<menu_item_call label="Tirar" name="Detach"/>
 	<menu_item_call label="Largar" name="Drop"/>
 	<menu_item_call label="Ficar de pé" name="Stand Up"/>
-	<menu_item_call label="Minha aparência" name="Appearance..."/>
+	<menu_item_call label="Trocar de look" name="Change Outfit"/>
 	<menu_item_call label="Meus amigos" name="Friends..."/>
 	<menu_item_call label="Meus grupos" name="Groups..."/>
 	<menu_item_call label="Meu perfil" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/pt/menu_avatar_self.xml b/indra/newview/skins/default/xui/pt/menu_avatar_self.xml
index ccbb921ebc..62055303b5 100644
--- a/indra/newview/skins/default/xui/pt/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/pt/menu_avatar_self.xml
@@ -20,7 +20,9 @@
 		<context_menu label="Tirar  ▶" name="Object Detach"/>
 		<menu_item_call label="Tirar tudo" name="Detach All"/>
 	</context_menu>
-	<menu_item_call label="Minha aparência" name="Appearance..."/>
+	<menu_item_call label="Trocar de look" name="Chenge Outfit"/>
+	<menu_item_call label="Editar meu look" name="Edit Outfit"/>
+	<menu_item_call label="Editar meu corpo" name="Edit My Shape"/>
 	<menu_item_call label="Meus amigos" name="Friends..."/>
 	<menu_item_call label="Meus grupos" name="Groups..."/>
 	<menu_item_call label="Meu perfil" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/pt/menu_bottomtray.xml b/indra/newview/skins/default/xui/pt/menu_bottomtray.xml
index 43b446a67e..479d02512f 100644
--- a/indra/newview/skins/default/xui/pt/menu_bottomtray.xml
+++ b/indra/newview/skins/default/xui/pt/menu_bottomtray.xml
@@ -4,6 +4,11 @@
 	<menu_item_check label="Botão de movimento" name="ShowMoveButton"/>
 	<menu_item_check label="Botão de ver" name="ShowCameraButton"/>
 	<menu_item_check label="Botão de fotos" name="ShowSnapshotButton"/>
+	<menu_item_check label="Botão da Barra lateral" name="ShowSidebarButton"/>
+	<menu_item_check label="Botão Construir" name="ShowBuildButton"/>
+	<menu_item_check label="Botão Buscar" name="ShowSearchButton"/>
+	<menu_item_check label="Botão Mapa" name="ShowWorldMapButton"/>
+	<menu_item_check label="Botão do Mini Mapa" name="ShowMiniMapButton"/>
 	<menu_item_call label="Cortar" name="NearbyChatBar_Cut"/>
 	<menu_item_call label="Copiar" name="NearbyChatBar_Copy"/>
 	<menu_item_call label="Colar" name="NearbyChatBar_Paste"/>
diff --git a/indra/newview/skins/default/xui/pt/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/pt/menu_inspect_self_gear.xml
index effc970eb8..c3e0608954 100644
--- a/indra/newview/skins/default/xui/pt/menu_inspect_self_gear.xml
+++ b/indra/newview/skins/default/xui/pt/menu_inspect_self_gear.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu name="Gear Menu">
 	<menu_item_call label="Ficar de pé" name="stand_up"/>
-	<menu_item_call label="Minha aparência" name="my_appearance"/>
+	<menu_item_call label="Trocar de look" name="change_outfit"/>
 	<menu_item_call label="Meu perfil" name="my_profile"/>
 	<menu_item_call label="Meus amigos" name="my_friends"/>
 	<menu_item_call label="Meus grupos" name="my_groups"/>
diff --git a/indra/newview/skins/default/xui/pt/menu_inventory.xml b/indra/newview/skins/default/xui/pt/menu_inventory.xml
index 345534261a..1b86b37075 100644
--- a/indra/newview/skins/default/xui/pt/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/pt/menu_inventory.xml
@@ -54,6 +54,7 @@
 	<menu_item_call label="Remover item" name="Purge Item"/>
 	<menu_item_call label="Restaurar item" name="Restore Item"/>
 	<menu_item_call label="Abrir" name="Open"/>
+	<menu_item_call label="Abrir original" name="Open Original"/>
 	<menu_item_call label="Propriedades" name="Properties"/>
 	<menu_item_call label="Renomear" name="Rename"/>
 	<menu_item_call label="Copiar item UUID" name="Copy Asset UUID"/>
diff --git a/indra/newview/skins/default/xui/pt/menu_login.xml b/indra/newview/skins/default/xui/pt/menu_login.xml
index 8ea87a06d1..a43ac271a9 100644
--- a/indra/newview/skins/default/xui/pt/menu_login.xml
+++ b/indra/newview/skins/default/xui/pt/menu_login.xml
@@ -2,7 +2,7 @@
 <menu_bar name="Login Menu">
 	<menu label="Eu" name="File">
 		<menu_item_call label="Preferências" name="Preferences..."/>
-		<menu_item_call label="Sair" name="Quit"/>
+		<menu_item_call label="Sair do [APP_NAME]" name="Quit"/>
 	</menu>
 	<menu label="Ajuda" name="Help">
 		<menu_item_call label="Ajuda do [SECOND_LIFE]" name="Second Life Help"/>
diff --git a/indra/newview/skins/default/xui/pt/menu_participant_list.xml b/indra/newview/skins/default/xui/pt/menu_participant_list.xml
index c0db7752af..01f1d4ef80 100644
--- a/indra/newview/skins/default/xui/pt/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/pt/menu_participant_list.xml
@@ -14,8 +14,8 @@
 	<context_menu label="Opções do moderador &gt;" name="Moderator Options">
 		<menu_item_check label="Pode bater papo por escrito" name="AllowTextChat"/>
 		<menu_item_call label="Silenciar este participante" name="ModerateVoiceMuteSelected"/>
-		<menu_item_call label="Silenciar os demais" name="ModerateVoiceMuteOthers"/>
 		<menu_item_call label="Desfazer silenciar deste participante" name="ModerateVoiceUnMuteSelected"/>
-		<menu_item_call label="Desfazer silenciar dos demais" name="ModerateVoiceUnMuteOthers"/>
+		<menu_item_call label="Silenciar todos" name="ModerateVoiceMute"/>
+		<menu_item_call label="Desfazer silenciar para todos" name="ModerateVoiceUnmute"/>
 	</context_menu>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml
index 84ad056df6..b091cc2c97 100644
--- a/indra/newview/skins/default/xui/pt/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml
@@ -7,7 +7,7 @@
 		</menu_item_call>
 		<menu_item_call label="Comprar L$" name="Buy and Sell L$"/>
 		<menu_item_call label="Meu perfil" name="Profile"/>
-		<menu_item_call label="Minha aparência" name="Appearance"/>
+		<menu_item_call label="Trocar de look" name="ChangeOutfit"/>
 		<menu_item_check label="Meu inventário" name="Inventory"/>
 		<menu_item_check label="Meu inventário" name="ShowSidetrayInventory"/>
 		<menu_item_check label="Meus gestos" name="Gestures"/>
@@ -162,6 +162,7 @@
 			<menu_item_check label="Objetos flexíveis" name="Flexible Objects"/>
 		</menu>
 		<menu_item_check label="Executar diversas instâncias" name="Run Multiple Threads"/>
+		<menu_item_check label="Usar plugin de leitura de threads" name="Use Plugin Read Thread"/>
 		<menu_item_call label="Limpar cache de grupo" name="ClearGroupCache"/>
 		<menu_item_check label="Smoothing de mouse" name="Mouse Smoothing"/>
 		<menu label="Atalhos" name="Shortcuts">
@@ -188,7 +189,6 @@
 			<menu_item_call label="Mais zoom" name="Zoom In"/>
 			<menu_item_call label="Zoom padrão" name="Zoom Default"/>
 			<menu_item_call label="Menos zoom" name="Zoom Out"/>
-			<menu_item_call label="Alternar tela inteira" name="Toggle Fullscreen"/>
 		</menu>
 		<menu_item_call label="Mostrar configurações de depuração" name="Debug Settings"/>
 		<menu_item_check label="Show Develop Menu" name="Debug Mode"/>
diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml
index 462dcf2b21..e64940ecb1 100644
--- a/indra/newview/skins/default/xui/pt/notifications.xml
+++ b/indra/newview/skins/default/xui/pt/notifications.xml
@@ -323,6 +323,9 @@ Você precisa de uma conta para entrar no [SECOND_LIFE]. Você gostaria de abrir
 		</url>
 		<usetemplate name="okcancelbuttons" notext="Tentar novamente" yestext="Abrir conta"/>
 	</notification>
+	<notification name="InvalidCredentialFormat">
+		Digite o nome e sobrenome do seu avatar no campo Nome de usuário, depois faça o login novamente.
+	</notification>
 	<notification name="AddClassified">
 		Os anúncios serão publicados na seção &apos;Classificados&apos; das buscas e em [http://secondlife.com/community/classifieds secondlife.com] durante uma semana.
 Escreva seu anúncio e clique em &apos;Publicar...&apos; 
@@ -603,6 +606,11 @@ Esperada [VALIDS]
 	<notification name="CannotEncodeFile">
 		Impossível codificar o arquivo: [FILE]
 	</notification>
+	<notification name="CorruptedProtectedDataStore">
+		Não foi possível fazer a leitura dos dados protegidos, redefinindo.
+   Isso pode ocorrer após mudanças na configuração da rede.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="CorruptResourceFile">
 		Fonte do arquivo corrompida: [FILE]
 	</notification>
@@ -962,6 +970,12 @@ em TODOS OS TERRENOS deste sim?
 
 Por favor, insira um valor maior.
 	</notification>
+	<notification name="ConfirmItemDeleteHasLinks">
+		Pelo menos um dos itens possui links que levam a ele.  Ao excluir o item, os links não funcionarão mais.   Por isso, recomendamos excluir os links primeiro.
+
+Tem certeza de que quer excluir estes items?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmObjectDeleteLock">
 		Pelo menos um dos itens que você selecionou está trancado.
 
@@ -1103,6 +1117,42 @@ Pressione a tecla F1 para ajuda ou aprender mais sobre [SECOND_LIFE].
 Por favor, escolha se o seu avatar é feminino ou masculino. Você pode mudar de idéia depois.
 		<usetemplate name="okcancelbuttons" notext="Feminino" yestext="Masculino"/>
 	</notification>
+	<notification name="CantTeleportToGrid">
+		Não foi possível ir para [SLURL], que fica em outro grid ([GRID]) em relação ao grid atual, ([CURRENT_GRID]).  Feche o Visualizador e tente novamente.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="GeneralCertificateError">
+		Falha de conexão com o servidor.
+[REASON]
+
+SubjectName: [SUBJECT_NAME_STRING]
+IssuerName: [ISSUER_NAME_STRING]
+Válido de: [VALID_FROM]
+Válido até: [VALID_TO]
+MD5 Fingerprint: [SHA1_DIGEST]
+Impressão digital SHA1: [MD5_DIGEST]
+Uso da chave: [KEYUSAGE]
+Uso estendido da chave: [EXTENDEDKEYUSAGE]
+Identificador chave de assunto: [SUBJECTKEYIDENTIFIER]
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="TrustCertificateError">
+		A autoridade de certificação deste servidor é desconhecida.
+
+Dados do certificado:
+SubjectName: [SUBJECT_NAME_STRING]
+IssuerName: [ISSUER_NAME_STRING]
+Válido de: [VALID_FROM]
+Válido até: [VALID_TO]
+MD5 Fingerprint: [SHA1_DIGEST]
+Impressão digital SHA1: [MD5_DIGEST]
+Uso da chave: [KEYUSAGE]
+Uso estendido da chave: [EXTENDEDKEYUSAGE]
+Identificador chave de assunto: [SUBJECTKEYIDENTIFIER]
+
+Confiar nesta autoridade?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Confiança"/>
+	</notification>
 	<notification name="NotEnoughCurrency">
 		[NAME] L$ [PRICE] Você não possui suficientes L$ para fazer isso.
 	</notification>
@@ -1493,9 +1543,9 @@ Ir para o Banco de Conhecimento para maiores informações sobre Classificaçõe
 		Você não é permitido nesta região devido à sua Classificação de maturidade.
 	</notification>
 	<notification name="RegionEntryAccessBlocked_Change">
-		Você não pode entrar nessa região devido à sua seleção de maturidade. 
+		Você não pode entrar nessa região devido à sua seleção de maturidade.
 
-Clique em &apos;Mudar preferência&apos; para aumentar o nível de maturidade e entrar nessa região.  De agora em diante você pode buscar e acessar conteúdo [REGIONMATURITY] .  Para modificar esta configuração, vá à Eu &gt; Preferências &gt; Geral.
+Clique em &apos;Mudar preferência&apos; para aumentar seu nível de maturidade e ganhar acesso imediato. Você então poderá fazer buscas e acessar conteúdo [REGIONMATURITY]. Para modificar o nível de maturidade, use o menu Eu &gt; Preferências &gt; Gerais.
 		<form name="form">
 			<button name="OK" text="Mudar preferência"/>
 			<button default="true" name="Cancel" text="Fechar"/>
@@ -2255,15 +2305,6 @@ Por favor, tente novamente em alguns instantes.
 	</notification>
 	<notification name="ObjectGiveItem">
 		Um objeto chamado [OBJECTFROMNAME] de [NAME_SLURL] lhe deu [OBJECTTYPE]:
-[ITEM_SLURL]
-		<form name="form">
-			<button name="Keep" text="Segure"/>
-			<button name="Discard" text="Descarte"/>
-			<button name="Mute" text="Bloquear"/>
-		</form>
-	</notification>
-	<notification name="ObjectGiveItemUnknownUser">
-		Um objeto chamado [OBJECTFROMNAME] de (residente desconhecido) lhe deu [OBJECTTYPE]:
 [ITEM_SLURL]
 		<form name="form">
 			<button name="Keep" text="Segure"/>
@@ -2583,8 +2624,52 @@ O botão será exibido quando houver espaço suficente.
 	<notification name="ShareNotification">
 		Arraste itens do inventário para uma pessoa no seletor de residentes
 	</notification>
+	<notification name="DeedToGroupFail">
+		Ocorreu uma falha durante a doação ao grupo.
+	</notification>
 	<notification name="AvatarRezNotification">
-		O avatar de &apos;[NAME]&apos; renderizou em [TIME] s.
+		( [EXISTENCE] segundos de vida )
+O avatar de &apos;[NAME]&apos; emergiu em [TIME] segundos.
+	</notification>
+	<notification name="AvatarRezSelfNotification">
+		( [EXISTENCE] segundos de vida )
+Você confeccionou seu look em [TIME] segundos.
+	</notification>
+	<notification name="AvatarRezCloudNotification">
+		( [EXISTENCE] segundos de vida )
+Avatar &apos;[NAME]&apos; transformou-se em nuvem.
+	</notification>
+	<notification name="AvatarRezArrivedNotification">
+		( [EXISTENCE] segundos de vida )
+Avatar &apos;[NAME]&apos; surgiu.
+	</notification>
+	<notification name="AvatarRezLeftCloudNotification">
+		( [EXISTENCE] segundos de vida )
+O avatar de &apos;[NAME]&apos; transformou-se em nuvem depois de [TIME] segundos.
+	</notification>
+	<notification name="AvatarRezEnteredAppearanceNotification">
+		( [EXISTENCE] segundos de vida )
+Avatar &apos;[NAME]&apos; entrou no modo aparência.
+	</notification>
+	<notification name="AvatarRezLeftAppearanceNotification">
+		( [EXISTENCE] segundos de vida )
+Avatar &apos;[NAME]&apos; sair do modo aparecer.
+	</notification>
+	<notification name="AvatarRezLeftNotification">
+		( [EXISTENCE] segundos de vida )
+Avatar &apos;[NAME]&apos; saiu totalmente carregado.
+	</notification>
+	<notification name="ConfirmLeaveCall">
+		Tem certeza de que quer sair desta ligação?
+		<usetemplate ignoretext="Confirmar antes de deixar ligação" name="okcancelignore" notext="Não" yestext="Sim"/>
+	</notification>
+	<notification name="ConfirmMuteAll">
+		Você silenciou todos os participantes de uma ligação de grupo.
+Todos os demais residentes que entrarem na ligação mais tarde também serão silenciados, mesmo se você sair da ligação.
+
+
+Silenciar todos?
+		<usetemplate ignoretext="Confirmar antes de silenciar todos os participantes em ligações de grupo." name="okcancelignore" notext="OK" yestext="Cancelar"/>
 	</notification>
 	<global name="UnsupportedCPU">
 		- A velocidade da sua CPU não suporta os requisitos mínimos exigidos.
diff --git a/indra/newview/skins/default/xui/pt/panel_bottomtray.xml b/indra/newview/skins/default/xui/pt/panel_bottomtray.xml
index 092135bd42..9fd7da55df 100644
--- a/indra/newview/skins/default/xui/pt/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/pt/panel_bottomtray.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="bottom_tray">
-	<string name="SpeakBtnToolTip">
-		Liga e desliga o microfone
-	</string>
-	<string name="VoiceControlBtnToolTip">
-		Mostra/oculta os controles de voz
-	</string>
+	<string name="SpeakBtnToolTip" value="Liga e desliga o microfone"/>
+	<string name="VoiceControlBtnToolTip" value="Mostra/oculta os controles de voz"/>
 	<layout_stack name="toolbar_stack">
 		<layout_panel name="speak_panel">
 			<talk_button name="talk">
@@ -24,6 +20,21 @@
 		<layout_panel name="snapshot_panel">
 			<button label="" name="snapshots" tool_tip="Tirar foto"/>
 		</layout_panel>
+		<layout_panel name="sidebar_btn_panel">
+			<button label="Barra lateral" name="sidebar_btn" tool_tip="Mostra/oculta a barra lateral"/>
+		</layout_panel>
+		<layout_panel name="build_btn_panel">
+			<button label="Construir" name="build_btn" tool_tip="Mostra/oculta ferramentas de Construção"/>
+		</layout_panel>
+		<layout_panel name="search_btn_panel">
+			<button label="Busca" name="search_btn" tool_tip="Mostra/oculta os gestos"/>
+		</layout_panel>
+		<layout_panel name="world_map_btn_panel">
+			<button label="Mapa" name="world_map_btn" tool_tip="Mostra/oculta o Mapa Múndi"/>
+		</layout_panel>
+		<layout_panel name="mini_map_btn_panel">
+			<button label="Mini Mapa" name="mini_map_btn" tool_tip="Mostra/oculta o Mini Mapa"/>
+		</layout_panel>
 		<layout_panel name="im_well_panel">
 			<chiclet_im_well name="im_well">
 				<button name="Unread IM messages" tool_tip="Conversas"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_shape.xml b/indra/newview/skins/default/xui/pt/panel_edit_shape.xml
index 504486c3bb..6b9ac94cac 100644
--- a/indra/newview/skins/default/xui/pt/panel_edit_shape.xml
+++ b/indra/newview/skins/default/xui/pt/panel_edit_shape.xml
@@ -1,14 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_shape_panel">
-	<panel name="avatar_sex_panel">
-		<text name="gender_text">
-			Sexo:
-		</text>
-		<radio_group name="sex_radio">
-			<radio_item label="Feminino" name="radio"/>
-			<radio_item label="Masculino" name="radio2"/>
-		</radio_group>
-	</panel>
+	<text name="avatar_height">
+		[HEIGHT] metros de altura
+	</text>
 	<panel label="Camisa" name="accordion_panel">
 		<accordion name="wearable_accordion">
 			<accordion_tab name="shape_body_tab" title="Corpo"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/pt/panel_edit_tattoo.xml
index 23cde50acc..f85bb3c499 100644
--- a/indra/newview/skins/default/xui/pt/panel_edit_tattoo.xml
+++ b/indra/newview/skins/default/xui/pt/panel_edit_tattoo.xml
@@ -4,5 +4,6 @@
 		<texture_picker label="Tatuagem de cabeça" name="Head Tattoo" tool_tip="Clique para escolher uma foto"/>
 		<texture_picker label="Tatuagem superior" name="Upper Tattoo" tool_tip="Selecione uma foto"/>
 		<texture_picker label="Tatuagem inferior" name="Lower Tattoo" tool_tip="Selecione uma foto"/>
+		<color_swatch label="Cor/Tonalidade" name="Color/Tint" tool_tip="Selecionar a cor"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_wearable.xml b/indra/newview/skins/default/xui/pt/panel_edit_wearable.xml
index a78539f274..f14a04f440 100644
--- a/indra/newview/skins/default/xui/pt/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/pt/panel_edit_wearable.xml
@@ -93,6 +93,12 @@
 	<text name="edit_wearable_title" value="Editando forma"/>
 	<panel label="Camisa" name="wearable_type_panel">
 		<text name="description_text" value="Forma:"/>
+		<radio_group name="sex_radio">
+			<radio_item label="" name="sex_male" tool_tip="Masculino" value="1"/>
+			<radio_item label="" name="sex_female" tool_tip="Feminino" value="0"/>
+		</radio_group>
+		<icon name="male_icon" tool_tip="Masculino"/>
+		<icon name="female_icon" tool_tip="Feminino"/>
 	</panel>
 	<panel label="gear_buttom_panel" name="gear_buttom_panel">
 		<button name="friends_viewsort_btn" tool_tip="Opções"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_land_money.xml b/indra/newview/skins/default/xui/pt/panel_group_land_money.xml
index 6f21b78b10..e57a85a726 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_land_money.xml
@@ -6,6 +6,9 @@
 	<panel.string name="cant_view_group_land_text">
 		Você não está autorizado a acessar terrenos de grupos
 	</panel.string>
+	<panel.string name="epmty_view_group_land_text">
+		Nada consta
+	</panel.string>
 	<panel.string name="cant_view_group_accounting_text">
 		Você não está autorizado a acessar os dados de contabilidade do grupo.
 	</panel.string>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_notices.xml b/indra/newview/skins/default/xui/pt/panel_group_notices.xml
index 4b5a00c761..9ccb85cdf6 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_notices.xml
@@ -39,6 +39,7 @@ Cada grupo pode enviar no máximo 200 avisos/dia
 		<text name="string">
 			Arrastar e soltar o item aqui para anexá-lo:
 		</text>
+		<button label="Inventário" name="open_inventory" tool_tip="Inventário aberto"/>
 		<button label="Tirar" label_selected="Remover o anexo" name="remove_attachment" tool_tip="Remover anexo da notificação."/>
 		<button label="Enviar" label_selected="Enviar" name="send_notice"/>
 		<group_drop_target name="drop_target" tool_tip="Arrastar um item do inventário para a caixa para enviá-lo com o aviso. É preciso ter autorização de cópia e transferência do item para anexá-lo ao aviso."/>
diff --git a/indra/newview/skins/default/xui/pt/panel_login.xml b/indra/newview/skins/default/xui/pt/panel_login.xml
index 588b8deaa3..94a885960a 100644
--- a/indra/newview/skins/default/xui/pt/panel_login.xml
+++ b/indra/newview/skins/default/xui/pt/panel_login.xml
@@ -8,18 +8,15 @@
 	</panel.string>
 	<layout_stack name="login_widgets">
 		<layout_panel name="login">
-			<text name="first_name_text">
-				Primeiro nome:
+			<text name="username_text">
+				Nome de usuário:
 			</text>
-			<line_editor label="Nome" name="first_name_edit" tool_tip="[SECOND_LIFE] First Name"/>
-			<text name="last_name_text">
-				Sobrenome:
-			</text>
-			<line_editor label="Sobrenome" name="last_name_edit" tool_tip="[SECOND_LIFE] Last Name"/>
+			<line_editor label="Nome de usuário" name="username_edit" tool_tip="[SECOND_LIFE] Nome de usuário"/>
 			<text name="password_text">
 				Senha:
 			</text>
 			<check_box label="Lembrar senha" name="remember_check"/>
+			<button label="conectar" name="connect_btn"/>
 			<text name="start_location_text">
 				Começar em:
 			</text>
@@ -27,7 +24,6 @@
 				<combo_box.item label="Última posição" name="MyLastLocation"/>
 				<combo_box.item label="Meu início" name="MyHome"/>
 			</combo_box>
-			<button label="conectar" name="connect_btn"/>
 		</layout_panel>
 		<layout_panel name="links">
 			<text name="create_new_account_text">
diff --git a/indra/newview/skins/default/xui/pt/panel_main_inventory.xml b/indra/newview/skins/default/xui/pt/panel_main_inventory.xml
index 104c3bface..dbf8e4fa52 100644
--- a/indra/newview/skins/default/xui/pt/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/pt/panel_main_inventory.xml
@@ -9,62 +9,20 @@
 	<text name="ItemcountText">
 		Itens:
 	</text>
-	<menu_bar name="Inventory Menu">
-		<menu label="Arquivo" name="File">
-			<menu_item_call label="Abrir" name="Open"/>
-			<menu label="Upload" name="upload">
-				<menu_item_call label="Imagem (L$[COST])..." name="Upload Image"/>
-				<menu_item_call label="Som (L$[COST])..." name="Upload Sound"/>
-				<menu_item_call label="Animação (L$[COST])..." name="Upload Animation"/>
-				<menu_item_call label="Volume (L$[COST] per file)..." name="Bulk Upload"/>
-			</menu>
-			<menu_item_call label="Nova janela" name="New Window"/>
-			<menu_item_call label="Mostrar filtros" name="Show Filters"/>
-			<menu_item_call label="Restabelecer filtros" name="Reset Current"/>
-			<menu_item_call label="Fechar todas as pastas" name="Close All Folders"/>
-			<menu_item_call label="Esvaziar lixeira" name="Empty Trash"/>
-			<menu_item_call label="Esvaziar achados e perdidos" name="Empty Lost And Found"/>
-		</menu>
-		<menu label="Crie" name="Create">
-			<menu_item_call label="Nova pasta" name="New Folder"/>
-			<menu_item_call label="Novo script" name="New Script"/>
-			<menu_item_call label="Nova anotação" name="New Note"/>
-			<menu_item_call label="Novo gesto" name="New Gesture"/>
-			<menu label="Novas roupas" name="New Clothes">
-				<menu_item_call label="Nova camisa" name="New Shirt"/>
-				<menu_item_call label="Novas calças" name="New Pants"/>
-				<menu_item_call label="Novos sapatos" name="New Shoes"/>
-				<menu_item_call label="Novas meias" name="New Socks"/>
-				<menu_item_call label="Nova blusa" name="New Jacket"/>
-				<menu_item_call label="Nova saia" name="New Skirt"/>
-				<menu_item_call label="Novas luvas" name="New Gloves"/>
-				<menu_item_call label="Nova camiseta" name="New Undershirt"/>
-				<menu_item_call label="Novas roupa de baixo" name="New Underpants"/>
-				<menu_item_call label="Novo alpha" name="New Alpha"/>
-				<menu_item_call label="Nova tatuagem" name="New Tattoo"/>
-			</menu>
-			<menu label="Nova parte do corpo" name="New Body Parts">
-				<menu_item_call label="Nova forma" name="New Shape"/>
-				<menu_item_call label="Nova pele" name="New Skin"/>
-				<menu_item_call label="Novo cabelo" name="New Hair"/>
-				<menu_item_call label="Novos olhos" name="New Eyes"/>
-			</menu>
-		</menu>
-		<menu label="Classificar" name="Sort">
-			<menu_item_check label="Por nome" name="By Name"/>
-			<menu_item_check label="Por data" name="By Date"/>
-			<menu_item_check label="Pastas sempre por nome" name="Folders Always By Name"/>
-			<menu_item_check label="Pastas do sistema no topo" name="System Folders To Top"/>
-		</menu>
-	</menu_bar>
 	<filter_editor label="Filtro" name="inventory search editor"/>
 	<tab_container name="inventory filter tabs">
 		<inventory_panel label="Todos os itens" name="All Items"/>
-		<inventory_panel label="Itens recentes" name="Recent Items"/>
+		<recent_inventory_panel label="Itens recentes" name="Recent Items"/>
 	</tab_container>
-	<panel name="bottom_panel">
-		<button name="options_gear_btn" tool_tip="Mostrar opções adicionais"/>
-		<button name="add_btn" tool_tip="Adicionar novo item"/>
-		<dnd_button name="trash_btn" tool_tip="Remover item selecionado"/>
-	</panel>
+	<layout_stack name="bottom_panel">
+		<layout_panel name="options_gear_btn_panel">
+			<button name="options_gear_btn" tool_tip="Mostrar opções adicionais"/>
+		</layout_panel>
+		<layout_panel name="add_btn_panel">
+			<button name="add_btn" tool_tip="Adicionar novo item"/>
+		</layout_panel>
+		<layout_panel name="trash_btn_panel">
+			<dnd_button name="trash_btn" tool_tip="Remover item selecionado"/>
+		</layout_panel>
+	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_outfit_edit.xml b/indra/newview/skins/default/xui/pt/panel_outfit_edit.xml
index 3dc8b4cc75..61e470586e 100644
--- a/indra/newview/skins/default/xui/pt/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/pt/panel_outfit_edit.xml
@@ -2,6 +2,8 @@
 <!-- Side tray Outfit Edit panel -->
 <panel label="Editar look" name="outfit_edit">
 	<string name="No Outfit" value="Nenhum"/>
+	<string name="unsaved_changes" value="Mudanças não salvas"/>
+	<string name="now_editing" value="Editando..."/>
 	<panel.string name="not_available">
 		(N\A)
 	</panel.string>
@@ -21,18 +23,13 @@
 	</panel>
 	<layout_stack name="im_panels">
 		<layout_panel label="Painel de controle de MIs" name="outfit_wearables_panel">
-			<scroll_list name="look_items_list">
-				<scroll_list.columns label="Ver item" name="look_item"/>
-				<scroll_list.columns label="Ordenar itens" name="look_item_sort"/>
-			</scroll_list>
 			<panel label="bottom_panel" name="edit_panel"/>
 		</layout_panel>
 		<layout_panel name="add_wearables_panel">
-			<filter_editor label="Filtro" name="look_item_filter"/>
+			<text name="add_to_outfit_label" value="Adicionar ao look:"/>
 			<layout_stack name="filter_panels">
-				<layout_panel label="Painel de controle de MIs" name="filter_button_panel">
-					<text name="add_to_outfit_label" value="Adicionar ao look:"/>
-					<button label="O" name="filter_button"/>
+				<layout_panel label="Painel de controle de MIs" name="filter_panel">
+					<filter_editor label="Filtro" name="look_item_filter"/>
 				</layout_panel>
 			</layout_stack>
 			<panel label="add_wearables_button_bar" name="add_wearables_button_bar">
diff --git a/indra/newview/skins/default/xui/pt/panel_people.xml b/indra/newview/skins/default/xui/pt/panel_people.xml
index 17f5b6cbac..efeea89fa9 100644
--- a/indra/newview/skins/default/xui/pt/panel_people.xml
+++ b/indra/newview/skins/default/xui/pt/panel_people.xml
@@ -2,9 +2,9 @@
 <!-- Side tray panel -->
 <panel label="Pessoas" name="people_panel">
 	<string name="no_recent_people" value="Ninguém, recentemente. Em busca de alguém para conversar? Use a [secondlife:///app/search/people Busca] ou o [secondlife:///app/worldmap Mapa-Múndi]."/>
-	<string name="no_filtered_recent_people" value="Não encontrou o que procura? Tente fazer uma [secondlife:///app/search/groups Busca]."/>
+	<string name="no_filtered_recent_people" value="Não encontrou o que procura? Tente buscar no [secondlife:///app/search/people/[SEARCH_TERM] Search]."/>
 	<string name="no_one_near" value="Ninguém por perto Em busca de alguém para conversar? Use a [secondlife:///app/search/people Busca] ou o [secondlife:///app/worldmap Mapa-Múndi]."/>
-	<string name="no_one_filtered_near" value="Não encontrou o que procura? Tente fazer uma [secondlife:///app/search/groups Busca]."/>
+	<string name="no_one_filtered_near" value="Não encontrou o que procura? Tente buscar no [secondlife:///app/search/people/[SEARCH_TERM] Search]."/>
 	<string name="no_friends_online" value="Nenhum amigo online"/>
 	<string name="no_friends" value="Nenhum amigo"/>
 	<string name="no_friends_msg">
@@ -12,11 +12,11 @@
 Em busca de alguém para conversar? Procure no [secondlife:///app/worldmap Mapa-Múndi].
 	</string>
 	<string name="no_filtered_friends_msg">
-		Não encontrou o que procura? Tente fazer uma [secondlife:///app/search/groups Busca].
+		Não encontrou o que procura? Tente buscar no [secondlife:///app/search/people/[SEARCH_TERM] Search].
 	</string>
 	<string name="people_filter_label" value="Filtro de pessoas"/>
 	<string name="groups_filter_label" value="Filtro de grupos"/>
-	<string name="no_filtered_groups_msg" value="Não encontrou o que procura? Tente fazer uma [secondlife:///app/search/groups Busca]."/>
+	<string name="no_filtered_groups_msg" value="Não encontrou o que procura? Tente buscar no [secondlife:///app/search/groups/[SEARCH_TERM] Search]."/>
 	<string name="no_groups_msg" value="À procura de grupos interessantes? Tente fazer uma [secondlife:///app/search/groups Busca]."/>
 	<filter_editor label="Filtro" name="filter_input"/>
 	<tab_container name="tabs">
@@ -55,8 +55,8 @@ Em busca de alguém para conversar? Procure no [secondlife:///app/worldmap Mapa-
 		<button label="Perfil" name="view_profile_btn" tool_tip="Exibir fotografia, grupos e outras informações dos residentes" width="50"/>
 		<button label="MI" name="im_btn" tool_tip="Iniciar MI" width="24"/>
 		<button label="Chamada" name="call_btn" tool_tip="Ligar para este residente" width="61"/>
-		<button label="Compartilhar" name="share_btn" width="82"/>
-		<button label="Teletransporte" name="teleport_btn" tool_tip="Oferecer teletransporte"  width="86"/>
+		<button label="Compartilhar" name="share_btn" tool_tip="Compartilhar item de inventário" width="82"/>
+		<button label="Teletransporte" name="teleport_btn" tool_tip="Oferecer teletransporte" width="86"/>
 		<button label="Perfil do grupo" name="group_info_btn" tool_tip="Exibir informação de grupo"/>
 		<button label="Bate-papo de grupo" name="chat_btn" tool_tip="Iniciar bate-papo"/>
 		<button label="Ligar para o grupo" name="group_call_btn" tool_tip="Ligar para este grupo"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml
index 6f2cae0476..885aafc350 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml
@@ -13,6 +13,7 @@
 	</text>
 	<check_box label="Construção/Edição" name="edit_camera_movement" tool_tip="Use o posicionamento automático da câmera quando entrar e sair do modo de edição"/>
 	<check_box label="Aparência" name="appearance_camera_movement" tool_tip="Use o posicionamento automático da câmera quando em modo de edição"/>
+	<check_box initial_value="1" label="Barra lateral" name="appearance_sidebar_positioning" tool_tip="Usar posicionamento automático da câmera na barra lateral"/>
 	<check_box label="Mostre-me em visão de mouse" name="first_person_avatar_visible"/>
 	<check_box label="Teclas de seta sempre me movem" name="arrow_keys_move_avatar_check"/>
 	<check_box label="Dê dois toques e pressione para correr" name="tap_tap_hold_to_run"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
index e566fde27c..02b0ef35fe 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
@@ -45,6 +45,7 @@
 	</text>
 	<check_box initial_value="true" label="Executar animação digitada quando estiver conversando" name="play_typing_animation"/>
 	<check_box label="Enviar MIs por email se estiver desconectado" name="send_im_to_email"/>
+	<check_box label="Ativar MIs e bate-papos de texto simples" name="plain_text_chat_history"/>
 	<text name="show_ims_in_label">
 		Mostrar MIs em:
 	</text>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
index eb38323940..ccf213099e 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Gráficos" name="Display panel">
-	<text name="UI Size:">
-		Interface:
-	</text>
 	<text name="QualitySpeed">
 		Qualidade e velocidade:
 	</text>
@@ -53,6 +50,10 @@ rápido
 			m
 		</text>
 		<slider label="Contador máx. de partículas:" name="MaxParticleCount"/>
+		<slider label="Distância máx. desenho avatar:" name="MaxAvatarDrawDistance"/>
+		<text name="DrawDistanceMeterText3">
+			m
+		</text>
 		<slider label="Qualidade de Pós-processamento:" name="RenderPostProcess"/>
 		<text name="MeshDetailText">
 			Detalhes de Malha:
diff --git a/indra/newview/skins/default/xui/pt/sidepanel_appearance.xml b/indra/newview/skins/default/xui/pt/sidepanel_appearance.xml
index b8bbb4051a..f075f45b8f 100644
--- a/indra/newview/skins/default/xui/pt/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/pt/sidepanel_appearance.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Looks" name="appearance panel">
 	<string name="No Outfit" value="Nenhum"/>
+	<string name="Unsaved Changes" value="Mudanças não salvas"/>
+	<string name="Now Wearing" value="Look atual..."/>
 	<panel name="panel_currentlook">
-		<text name="currentlook_title">
-			(não salvo)
+		<button label="E" name="editappearance_btn"/>
+		<button label="O" name="openoutfit_btn"/>
+		<text name="currentlook_status">
+			(Status)
 		</text>
 	</panel>
 	<filter_editor label="Filtrar looks" name="Filter"/>
diff --git a/indra/newview/skins/default/xui/pt/sidepanel_inventory.xml b/indra/newview/skins/default/xui/pt/sidepanel_inventory.xml
index f634236cd2..31c96cad4c 100644
--- a/indra/newview/skins/default/xui/pt/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/pt/sidepanel_inventory.xml
@@ -4,6 +4,7 @@
 		<panel name="button_panel">
 			<button label="Perfil" name="info_btn"/>
 			<button label="Compartilhar" name="share_btn"/>
+			<button label="Comprar" name="shop_btn"/>
 			<button label="Vestir" name="wear_btn"/>
 			<button label="Tocar" name="play_btn"/>
 			<button label="Teletransportar" name="teleport_btn"/>
diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml
index 51b6581d42..f865124009 100644
--- a/indra/newview/skins/default/xui/pt/strings.xml
+++ b/indra/newview/skins/default/xui/pt/strings.xml
@@ -88,6 +88,24 @@
 	<string name="LoginDownloadingClothing">
 		Baixando roupas...
 	</string>
+	<string name="InvalidCertificate">
+		O servidor respondeu com um certificado inválido ou corrompido. Por favor contate o administrador do Grid.
+	</string>
+	<string name="CertInvalidHostname">
+		Um hostname inválido foi usado para acessar o servidor. Verifique o SLURL ou hostname do Grid.
+	</string>
+	<string name="CertExpired">
+		O certificado dado pelo Grid parece estar vencido.  Verifique o relógio do sistema ou contate o administrador do Grid.
+	</string>
+	<string name="CertKeyUsage">
+		O certificado dado pelo servidor não pôde ser usado para SSL.  Por favor contate o administrador do Grid.
+	</string>
+	<string name="CertBasicConstraints">
+		A cadeia de certificados do servidor tinha certificados demais.  Por favor contate o administrador do Grid.
+	</string>
+	<string name="CertInvalidSignature">
+		A assinatura do certificado dado pelo servidor do Grid não pôde ser verificada.  Por favor contate o administrador do Grid.
+	</string>
 	<string name="LoginFailedNoNetwork">
 		Erro de rede: Não foi possível estabelecer a conexão, verifique sua conexão de rede.
 	</string>
@@ -819,6 +837,42 @@
 	<string name="invalid">
 		Inválido
 	</string>
+	<string name="shirt_not_worn">
+		Camisa não vestida
+	</string>
+	<string name="pants_not_worn">
+		Calças não vestidas
+	</string>
+	<string name="shoes_not_worn">
+		Sapatos não calçados
+	</string>
+	<string name="socks_not_worn">
+		Meias não calçadas
+	</string>
+	<string name="jacket_not_worn">
+		Jaqueta não vestida
+	</string>
+	<string name="gloves_not_worn">
+		Luvas não calçadas
+	</string>
+	<string name="undershirt_not_worn">
+		Camiseta não vestida
+	</string>
+	<string name="underpants_not_worn">
+		Roupa de baixo não vestida
+	</string>
+	<string name="skirt_not_worn">
+		Saia não vestida
+	</string>
+	<string name="alpha_not_worn">
+		Alpha não vestido
+	</string>
+	<string name="tattoo_not_worn">
+		Tatuagem não usada
+	</string>
+	<string name="invalid_not_worn">
+		inválido
+	</string>
 	<string name="NewWearable">
 		Novo [WEARABLE_ITEM]
 	</string>
@@ -889,7 +943,10 @@
 		Pressione ESC para retornar para visão do mundo
 	</string>
 	<string name="InventoryNoMatchingItems">
-		Não encontrou o que procura? Tente fazer uma [secondlife:///app/search/groups Busca].
+		Não encontrou o que procura? Tente buscar no [secondlife:///app/search/people/[SEARCH_TERM] Search].
+	</string>
+	<string name="PlacesNoMatchingItems">
+		Não encontrou o que procura? Tente buscar no [secondlife:///app/search/groups/[SEARCH_TERM] Search].
 	</string>
 	<string name="FavoritesNoMatchingItems">
 		Arraste um marco para adicioná-lo aos seus favoritos.
@@ -919,6 +976,7 @@
 	<string name="Wave" value="Acenar"/>
 	<string name="HelloAvatar" value="Olá, avatar!"/>
 	<string name="ViewAllGestures" value="Ver todos&gt;&gt;"/>
+	<string name="GetMoreGestures" value="Mais &gt;&gt;"/>
 	<string name="Animations" value="Animações,"/>
 	<string name="Calling Cards" value="Cartões de visitas,"/>
 	<string name="Clothing" value="Vestuário,"/>
@@ -1542,6 +1600,9 @@
 	<string name="MuteGroup">
 		(grupo)
 	</string>
+	<string name="MuteExternal">
+		(Externo)
+	</string>
 	<string name="RegionNoCovenant">
 		Não foi definido um contrato para essa região.
 	</string>
@@ -3299,11 +3360,14 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="answered_call">
 		Ligação atendida
 	</string>
-	<string name="started_call">
-		Iniciou uma ligação de voz
+	<string name="you_started_call">
+		Você iniciou uma ligação de voz
+	</string>
+	<string name="you_joined_call">
+		Você entrou na ligação
 	</string>
-	<string name="joined_call">
-		Entrou na ligação
+	<string name="name_started_call">
+		[NAME] iniciou uma ligação de voz
 	</string>
 	<string name="ringing-im">
 		Entrando em ligação de voz...
@@ -3502,6 +3566,90 @@ Denunciar abuso
 	<string name="Contents">
 		Conteúdo
 	</string>
+	<string name="Gesture">
+		Gesto
+	</string>
+	<string name="Male Gestures">
+		Gestos masculinos
+	</string>
+	<string name="Female Gestures">
+		Gestos femininos
+	</string>
+	<string name="Other Gestures">
+		Outros gestos
+	</string>
+	<string name="Speech Gestures">
+		Gestos da fala
+	</string>
+	<string name="Common Gestures">
+		Gestos comuns
+	</string>
+	<string name="Male - Excuse me">
+		Perdão - masculino
+	</string>
+	<string name="Male - Get lost">
+		Deixe-me em paz - masculino
+	</string>
+	<string name="Male - Blow kiss">
+		Mandar beijo - masculino
+	</string>
+	<string name="Male - Boo">
+		Vaia - masculino
+	</string>
+	<string name="Male - Bored">
+		Maçante - masculino
+	</string>
+	<string name="Male - Hey">
+		Ôpa! - masculino
+	</string>
+	<string name="Male - Laugh">
+		Risada - masculino
+	</string>
+	<string name="Male - Repulsed">
+		Quero distância! - masculino
+	</string>
+	<string name="Male - Shrug">
+		Encolher de ombros - masculino
+	</string>
+	<string name="Male - Stick tougue out">
+		Mostrar a língua - masculino
+	</string>
+	<string name="Male - Wow">
+		Wow - masculino
+	</string>
+	<string name="FeMale - Excuse me">
+		Perdão - masc/fem
+	</string>
+	<string name="FeMale - Get lost">
+		Deixe-me em paz - feminino
+	</string>
+	<string name="FeMale - Blow kiss">
+		Mandar beijo - masc/fem
+	</string>
+	<string name="FeMale - Boo">
+		Vaia - masc/fem
+	</string>
+	<string name="Female - Bored">
+		Maçante - feminino
+	</string>
+	<string name="Female - Hey">
+		Ôpa - feminino
+	</string>
+	<string name="Female - Laugh">
+		Risada - feminina
+	</string>
+	<string name="Female - Repulsed">
+		Quero distância! - feminino
+	</string>
+	<string name="Female - Shrug">
+		Encolher ombros - feminino
+	</string>
+	<string name="Female - Stick tougue out">
+		Mostrar a língua - feminino
+	</string>
+	<string name="Female - Wow">
+		Wow - feminino
+	</string>
 	<string name="AvatarBirthDateFormat">
 		[mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt]
 	</string>
-- 
cgit v1.2.3


From 935a9d0cf9057d743dad302d5466417b8f068d93 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Tue, 8 Jun 2010 11:46:46 -0700
Subject: ND-46735 WIP PT translation, new files

---
 indra/newview/skins/default/xui/pt/floater_buy_currency_html.xml  | 2 ++
 indra/newview/skins/default/xui/pt/panel_body_parts_list_item.xml | 4 ++++
 .../skins/default/xui/pt/panel_bodyparts_list_button_bar.xml      | 5 +++++
 .../skins/default/xui/pt/panel_clothing_list_button_bar.xml       | 5 +++++
 indra/newview/skins/default/xui/pt/panel_clothing_list_item.xml   | 4 ++++
 indra/newview/skins/default/xui/pt/panel_cof_wearables.xml        | 8 ++++++++
 .../skins/default/xui/pt/panel_deletable_wearable_list_item.xml   | 4 ++++
 .../skins/default/xui/pt/panel_dummy_clothing_list_item.xml       | 4 ++++
 8 files changed, 36 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/pt/floater_buy_currency_html.xml
 create mode 100644 indra/newview/skins/default/xui/pt/panel_body_parts_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/pt/panel_bodyparts_list_button_bar.xml
 create mode 100644 indra/newview/skins/default/xui/pt/panel_clothing_list_button_bar.xml
 create mode 100644 indra/newview/skins/default/xui/pt/panel_clothing_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/pt/panel_cof_wearables.xml
 create mode 100644 indra/newview/skins/default/xui/pt/panel_deletable_wearable_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/pt/panel_dummy_clothing_list_item.xml

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/pt/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/pt/floater_buy_currency_html.xml
new file mode 100644
index 0000000000..24e41ac8c8
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_buy_currency_html.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_buy_currency_html" title="COMPRAR MOEDA"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/pt/panel_body_parts_list_item.xml
new file mode 100644
index 0000000000..de764d8025
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_body_parts_list_item.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="wearable_item">
+	<text name="item_name" value="..."/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/pt/panel_bodyparts_list_button_bar.xml
new file mode 100644
index 0000000000..094a03553b
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_bodyparts_list_button_bar.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="clothing_list_button_bar_panel">
+	<button label="Trocar" name="switch_btn"/>
+	<button label="Comprar &gt;" name="bodyparts_shop_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/pt/panel_clothing_list_button_bar.xml
new file mode 100644
index 0000000000..bfdc7290d2
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_clothing_list_button_bar.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="clothing_list_button_bar_panel">
+	<button label="Adicionar +" name="add_btn"/>
+	<button label="Comprar &gt;" name="clothing_shop_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/pt/panel_clothing_list_item.xml
new file mode 100644
index 0000000000..de764d8025
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_clothing_list_item.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="wearable_item">
+	<text name="item_name" value="..."/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_cof_wearables.xml b/indra/newview/skins/default/xui/pt/panel_cof_wearables.xml
new file mode 100644
index 0000000000..3e4b12b001
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_cof_wearables.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="cof_wearables">
+	<accordion name="cof_wearables_accordion">
+		<accordion_tab name="tab_attachments" title="Anexos"/>
+		<accordion_tab name="tab_clothing" title="Vestuário"/>
+		<accordion_tab name="tab_body_parts" title="Corpo"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/pt/panel_deletable_wearable_list_item.xml
new file mode 100644
index 0000000000..91d90a5660
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_deletable_wearable_list_item.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="deletable_wearable_item">
+	<text name="item_name" value="..."/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/pt/panel_dummy_clothing_list_item.xml
new file mode 100644
index 0000000000..6af84de0c7
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_dummy_clothing_list_item.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="dummy_clothing_item">
+	<text name="item_name" value="..."/>
+</panel>
-- 
cgit v1.2.3


From 9b9a79084c1d6bdee0b8a988b21b0b34512ead49 Mon Sep 17 00:00:00 2001
From: Richard Nelson <none@none>
Date: Mon, 7 Jun 2010 17:17:36 -0700
Subject: added missing help_topics for kate

---
 indra/newview/skins/default/xui/en/panel_edit_wearable.xml     | 1 +
 indra/newview/skins/default/xui/en/panel_outfit_edit.xml       | 1 +
 indra/newview/skins/default/xui/en/panel_outfits_inventory.xml | 1 +
 3 files changed, 3 insertions(+)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
index 67ff71cef1..9537df3582 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
@@ -7,6 +7,7 @@
  label="Wearable"
  layout="topleft"
 left="0"
+ help_topic="edit_wearable"
  name="panel_edit_wearable"
 	top="0"
  width="333">
diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index 769f9b7bbf..ca05c36392 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -7,6 +7,7 @@
  follows="all"
  label="Outfit Edit"
  layout="topleft"
+ help_topic="edit_outfit"
  left="0"
  min_height="350"
  name="outfit_edit"
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
index 13e1f5ba5c..de1f2cf31b 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
@@ -30,6 +30,7 @@
            height="490"
            name="outfitslist_tab"
            background_visible="true"
+           help_topic="my_outfits_tab"
            follows="all"
            label="MY OUTFITS"
            layout="topleft"
-- 
cgit v1.2.3


From b46826c8210cda7e0c35741fe1f8e3787cc6e6e6 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Tue, 8 Jun 2010 15:01:35 +0100
Subject: EXT-7521 FIXED Snapshot floater not remembering whether to show the
 advanced panel. Also removes some redundant code, and registers UI callbacks
 for use from XUI.

Reviewed by: Tofu
---
 .../skins/default/xui/en/floater_snapshot.xml      | 192 ++++++++++++---------
 1 file changed, 115 insertions(+), 77 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index f3d297c303..7d81c3e551 100644
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -38,91 +38,129 @@
     left="20"
     top_pad="-30"
     name="new_snapshot_btn"
-    width="23" />
+    width="23"
+    commit_callback.function="Snapshot.Refresh"/>
   <line_editor
     border_style="line"
     border_thickness="1"
-	  follows="left|top"
-	  height="20"
-		layout="topleft"
+    follows="left|top"
+    height="20"
+    layout="topleft"
     left="10"
-		max_length="500"
+    max_length="500"
     name="description"
-	  top_pad="15"
-	  width="230"
+    top_pad="15"
+    width="230"
     label="Description"/>
+  <panel
+   top_pad="20"
+   left="10"
+   height="83"
+   name="panel_snapshot_main"
+   width="130">
+    <button
+     label="Share Snapshot"
+     name="share"
+     top="0"
+     left="0"
+     width="130"
+     commit_callback.function="Snapshot.ShowButtons"
+     commit_callback.parameter="share"/>
+    <button
+     label="Save Snapshot"
+     name="save"
+     top_pad="7"
+     left_delta="0"
+     width="130"
+     commit_callback.function="Snapshot.ShowButtons"
+     commit_callback.parameter="save"/>
+    <button
+     label="Set As Profile Pic"
+     name="set_profile_pic"
+     top_pad="7"
+     left_delta="0"
+     width="130"/>
+  </panel>
+  <panel
+   top_delta="0"
+   left_delta="0"
+   height="83"
+   name="panel_snapshot_share"
+   width="130">
+    <button
+     label="Share to Web"
+     name="share_to_web"
+     top="0"
+     left="0"
+     visible="false"
+     width="130"/>
+    <button
+     label="Email Snapshot"
+     name="share_to_email"
+     top_pad="7"
+     left_delta="0"
+     width="130"/>
+    <button
+     label="Back"
+     name="cancel_share"
+     top_pad="7"
+     left_delta="0"
+     width="130"
+     commit_callback.function="Snapshot.ShowButtons"
+     commit_callback.parameter="main"/>
+  </panel>
+  <panel
+   top_delta="0"
+   left_delta="0"
+   height="83"
+   name="panel_snapshot_save"
+   width="130">
+    <button
+     label="Save to My Inventory"
+     name="save_to_inventory"
+     top="0"
+     left="0"
+     width="130"/>
+    <button
+     label="Save to My Computer"
+     name="save_to_computer"
+     top_pad="7"
+     left_delta="0"
+     width="130"/>
+    <button
+     label="Back"
+     name="cancel_save"
+     top_pad="7"
+     left_delta="0"
+     width="130"
+     commit_callback.function="Snapshot.ShowButtons"
+     commit_callback.parameter="main"/>
+  </panel>
   <button
-   label="Share Snapshot" 
-   name="share" 
-   top_pad="20" 
-   left="10" 
-   width="130"/>
+   follows="left"
+   height="22"
+   layout="topleft"
+   left="210"
+   name="show_advanced"
+   image_overlay="TabIcon_Close_Off"
+   bottom_delta="0"
+   width="30"
+   commit_callback.function="Snapshot.ShowAdvanced"/>
   <button
-   label="Share to Web" 
-   name="share_to_web" 
-   top_delta="0" 
-   left="10" 
+   follows="left"
+   height="22"
+   layout="topleft"
+   left="210"
+   name="hide_advanced"
+   image_overlay="TabIcon_Open_Off"
+   top_delta="0"
    visible="false"
-   width="130"/>
-  <button
-   label="Save to My Inventory" 
-   name="save_to_inventory" 
-   top_delta="0" 
-   left="10" 
-   width="130"/>
-  <button
-   label="Save Snapshot" 
-   name="save" 
-   top_pad="7" 
-   left="10" 
-   width="130"/>
-  <button
-   label="Email Snapshot" 
-   name="share_to_email" 
-   top_delta="0" 
-   left="10" 
-   width="130"/>
-  <button
-   label="Save to My Computer" 
-   name="save_to_computer" 
-   top_delta="0" 
-   left="10" 
-   width="130"/>
-  <button
-   label="Set As Profile Pic" 
-   name="set_profile_pic" 
-   top_pad="7" 
-   left="10" 
-   width="130"/>
-  <button
-   label="Back" 
-   name="cancel" 
-   top_delta="0" 
-   left="10" 
-   width="130"/>
-  <button
-     follows="left"
-     height="22"
-     layout="topleft"
-     left="210"
-    name="show_advanced"
-    image_overlay="TabIcon_Close_Off"
-    top_delta="1"
-    width="30"/>
-  <button
-     follows="left"
-     height="22"
-     layout="topleft"
-     left="210"
-     visible="false" 
-     name="hide_advanced"
-     image_overlay="TabIcon_Open_Off"
-     top_delta="0"
-     width="30"/>
+   width="30"
+   commit_callback.function="Snapshot.HideAdvanced"/>
   <panel 
-    visible="false" 
-    left="250" 
-    top="17"    
-    name="snapshot_advanced" 
-    filename="panel_snapshot_advanced.xml"/>
+   visible="false"
+   left="250"
+   top="17"
+   name="snapshot_advanced"
+   filename="panel_snapshot_advanced.xml"/>
 </floater>
-- 
cgit v1.2.3


From 9d1e7cbb4e9998c7ba460051c4d39198250c4965 Mon Sep 17 00:00:00 2001
From: Vladimir Pchelko <pchelko@productengine.com>
Date: Tue, 8 Jun 2010 21:41:28 +0300
Subject: EXT-6933 FIXED According to behavior in viewer-1.2: minimal price
 value was changed to 0.

Problem description:
Minimal price value was 1.

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/510/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/sidepanel_item_info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
index c816fd1479..b736f5e29c 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -395,7 +395,7 @@ top_pad="10"
 			    label_width="75"
 			    left="120"
 			    width="170"
-			    min_val="1"
+			    min_val="0"
 			    height="23"
 			    max_val="999999999"
 			    top_pad="10"/>
-- 
cgit v1.2.3


From d7eefeafeaea5e515c805c88058154a1e6a5d68e Mon Sep 17 00:00:00 2001
From: Vladimir Pchelko <pchelko@productengine.com>
Date: Tue, 8 Jun 2010 22:14:56 +0300
Subject: EXT-7604 FIXED Button overlay image and size were changed.

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/518/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_group_notices.xml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml
index 19fe2ea874..6523b0d491 100644
--- a/indra/newview/skins/default/xui/en/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml
@@ -74,16 +74,14 @@ Maximum 200 per group daily
     </text>
       <button
        follows="top|left"
-       height="18"
-       image_selected="AddItem_Press"
-       image_unselected="AddItem_Off"
-       image_disabled="AddItem_Disabled"
+       height="23"
+       image_overlay="AddItem_Off"
        layout="topleft"
        left="5"
        name="create_new_notice"
        tool_tip="Create a new notice"
-     top_delta="-3"
-       width="18" />
+       top_delta="-3"
+       width="23" />
      <button
      follows="top|left"
      height="23"
-- 
cgit v1.2.3


From ae43801f44d6c1c23bb6aea17452c7ddcdec65a3 Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Tue, 8 Jun 2010 23:30:56 +0300
Subject: EXT-6655 Fixed Made the default busy message repsonse localizable
 with already existing account settings

- The root of busy response problem is that this text is located in non-localizable xml and, to make things worse, may be changed by user. So usual translation approach is little help here. So busy response was set the following way(EXT-5885)- on first run, string was written there from strings xml and was never changed later without direct user actions. So after changin locale message always remained the same.

- To make this string localize each time locale is changed and if it is the same as default message, new setting was added- BusyResponseChanged which is TRUE if user's busy message differ's from default. If it is true, we do nothing when locale changes, otherwise we set default message from current locale as user's busy message.

- Old transitional code from DEV-24146 was removed in this diff including unnecessary "BusyModeResponse2" setting(it is not needed because we'll anyway have to set busy message to default after first run of viewer after this fix and now busy response will be stored in "BusyModeResponse").

Warning! If user modified busy response message before this fix, it will be reset to default after first postfix run.

Reviewed by Richard Linden at https://codereview.productengine.com/secondlife/r/350/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_preferences_general.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index 1c68d59993..a69e8d29b0 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -348,7 +348,7 @@
        Busy mode response:
     </text>
     <text_editor
-     control_name="BusyModeResponse2"
+     control_name="BusyModeResponse"
       text_readonly_color="LabelDisabledColor"
       bg_writeable_color="LtGray"
       use_ellipses="false"
-- 
cgit v1.2.3


From 0d5da282de9c0891b0af654b2f9b6f0e66204732 Mon Sep 17 00:00:00 2001
From: Vladimir Pchelko <pchelko@productengine.com>
Date: Wed, 9 Jun 2010 13:46:10 +0300
Subject: EXT-7640 FIXED Added new option to viewer avatar height that allows
 users to see their height in either feet or meters

Feature details:

Added new property HeightUnits.
Implemented logic that build TextBox label correctly according to document
https://docs.google.com/a/productengine.com/Doc?docid=0AXxJWUubGIsoZGhqZDcya3JfMWdybXNwdGd0&hl=en -> 'Mockup - Edit Shape'

Reviewed by Vadim Savchuk, Neal Orman, Mike Antipov at https://codereview.productengine.com/secondlife/r/531/

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_edit_shape.xml      | 29 ++++++++++++----------
 1 file changed, 16 insertions(+), 13 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_edit_shape.xml b/indra/newview/skins/default/xui/en/panel_edit_shape.xml
index cf15fb0455..d295f5fe4a 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_shape.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_shape.xml
@@ -8,19 +8,22 @@
 	 name="edit_shape_panel"
 	 top_pad="10"
 	 width="333" >
-	 <text
-		 follows="top|left|right"
-		 font="SansSerifSmallBold"
-		 halign="right"
-		 height="12"
-		 layout="topleft"
-		 left="0"
-		 name="avatar_height"
-		 text_color="EmphasisColor"
-		 top="0"
-		 width="310">
-		 [HEIGHT] Meters tall
-	 </text>
+     <string name="meters">Meters</string>
+     <string name="feet">Feet</string>
+     <string name="height">Height:</string>
+     <string name="heigth_label_color" translate="false">White_50</string>
+     <string name="heigth_value_label_color" translate="false">White</string>
+     <text
+         follows="top|left|right"
+         font="SansSerifSmallBold"
+         halign="right"
+         height="12"
+         layout="topleft"
+         left="0"
+         name="avatar_height"
+         top="0"
+         width="310">
+     </text>
      <panel
          border="false"
          bg_alpha_color="DkGray2"
-- 
cgit v1.2.3


From a3a037ea7dfb6148bd74565b4546b2829fca9a27 Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Wed, 9 Jun 2010 15:39:11 +0300
Subject: EXT-6710 FIXED Updated inventory items sharing behavior according to
 comments: "Andrey ProductEngine added a comment - 02/Jun/10 03:21 AM" and
 "Grumpity ProductEngine added a comment - 02/Jun/10 03:25 AM" of EXT-6710
 issue.

1 Reused 'ShareNotification' with updated message.
2 Made allert message box scrollable(done by Yuri Chebotarev).
3 Updated word words_separator in strings.xml.
4 Made friends list tab of avatar picker be opened on 'share with avatar' action.

reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/525/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/notifications.xml | 2 +-
 indra/newview/skins/default/xui/en/strings.xml       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 439f67e7b1..76a41a3b13 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6207,7 +6207,7 @@ The button will be shown when there is enough space for it.
    icon="notifytip.tga"
    name="ShareNotification"
    type="notifytip">
-Drag items from inventory onto a person in the resident picker
+Select residents to share with.
   </notification>
   <notification
    icon="notifytip.tga"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 0d14a6b3c8..361af0e8fb 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3181,7 +3181,7 @@ Abuse Report</string>
 
   <!-- language specific white-space characters, delimiters, spacers, item separation symbols -->
   <string name="sentences_separator" value=" "></string>
-  <string name="words_separator">, </string>
+  <string name="words_separator" value=", "/>
   
   <string name="server_is_down">
 	Despite our best efforts, something unexpected has gone wrong.
-- 
cgit v1.2.3


From 206aab29dc93579360a6df6a2a99857fb955d072 Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Wed, 9 Jun 2010 15:48:48 +0300
Subject: EXT-7577 FIXED added filtering add wearables panel (list and folder
 views) according to the current user's selection

- added filtering add wearables panel (list and folder views) according to the current user's selection (rules for showing a particular view and setting a particular filtering are specified in the table at https://jira.secondlife.com/browse/EXT-7577)
- minor refactoring

Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/534/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_outfit_edit.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index c9802a269c..741f60669a 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -51,6 +51,7 @@
     <string name="Filter.All" value="All"/>
     <string name="Filter.Clothes/Body" value="Clothes/Body"/>
     <string name="Filter.Objects" value="Objects"/>
+    <string name="Filter.Custom" value="Custom filter"/>
 
 
     <button
-- 
cgit v1.2.3


From 4976323af8fae67a06e856bc9801635da5bfd79f Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Wed, 9 Jun 2010 18:52:52 +0300
Subject: EXT-7616 FIXED "Rename" outfit context menu item is now called
 "Rename Outfit".

Trivial change, not reviewed.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/menu_outfit_gear.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
index b5eda8e999..c4e31ed180 100644
--- a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
@@ -170,7 +170,7 @@
 
     <menu_item_separator />
     <menu_item_call
-     label="Rename"
+     label="Rename Outfit"
      layout="topleft"
      name="rename">
         <on_click
-- 
cgit v1.2.3


From e414a91d7fb8ffea664bf1c035cb0bab3c4ece7e Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Wed, 9 Jun 2010 17:09:42 -0400
Subject: EXT-7430 : Create art overlay for inventory icons that are links

Took out explicit _Link icons and replaced with overlay.
Removed links overlays from non-main-inventory-floater panels.
---
 .../skins/default/xui/en/panel_main_inventory.xml    | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index d65b86f007..2a53b3e2fa 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -42,7 +42,7 @@
   <filter_editor
    text_pad_left="10"
    follows="left|top|right"
- height="23"
+   height="23"
    label="Filter Inventory"
    layout="topleft"
    left="10"
@@ -68,10 +68,10 @@
      top_pad="10"
      width="312">
     <inventory_panel
-        bg_opaque_color="DkGray2"
-   bg_alpha_color="DkGray2"
-   background_visible="true"
-   background_opaque="true"
+     bg_opaque_color="DkGray2"
+     bg_alpha_color="DkGray2"
+     background_visible="true"
+     background_opaque="true"
      border="false"
      bevel_style="none"
      follows="all"
@@ -82,13 +82,14 @@
      left="0"
      name="All Items"
      sort_order_setting="InventorySortOrder"
+	 show_item_link_overlays="true"
      top="16"
      width="288" />
     <recent_inventory_panel
-        bg_opaque_color="DkGray2"
-   bg_alpha_color="DkGray2"
-   background_visible="true"
-   background_opaque="true"
+     bg_opaque_color="DkGray2"
+     bg_alpha_color="DkGray2"
+     background_visible="true"
+     background_opaque="true"
      border="false"
      bevel_style="none"
      follows="all"
@@ -98,6 +99,7 @@
      layout="topleft"
      left_delta="0"
      name="Recent Items"
+	 show_item_link_overlays="true"
      width="290" />
   </tab_container>
   <layout_stack
-- 
cgit v1.2.3


From 7629a39a6df70b2a04cd1e4f259b32a863c355f6 Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Thu, 10 Jun 2010 14:30:07 +0300
Subject: EXT-7644 FIXED Avoided duplication of 'Save as' dialogs. reviewed by
 Vadim Savchuk at https://codereview.productengine.com/secondlife/r/554/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/notifications.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 76a41a3b13..aca3b750c8 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2066,6 +2066,7 @@ Would you be my friend?
        name="Cancel"
        text="Cancel"/>
     </form>
+    <unique/>
   </notification>
 
   <notification
-- 
cgit v1.2.3


From 9ed013048be5a17ea91200e7d9b3db32d7c61da2 Mon Sep 17 00:00:00 2001
From: Vladimir Pchelko <pchelko@productengine.com>
Date: Thu, 10 Jun 2010 20:45:53 +0300
Subject: EXT-7768 FIXED Default accordion widget's message was removed (set to
 empty). reviewed by Vadim Savchuk at
 https://codereview.productengine.com/secondlife/r/561/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/widgets/accordion.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/widgets/accordion.xml b/indra/newview/skins/default/xui/en/widgets/accordion.xml
index b817ba56ca..05d7447a6f 100644
--- a/indra/newview/skins/default/xui/en/widgets/accordion.xml
+++ b/indra/newview/skins/default/xui/en/widgets/accordion.xml
@@ -8,7 +8,6 @@
      height="100"
      h_pad="10"
      name="no_visible_items_msg"
-     value="There are no visible content here."
      v_pad="15"
      width="200"
      wrap="true "/>
-- 
cgit v1.2.3


From 968c7cf90685acbe8554a1843d5bb0c9fd9658e7 Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Thu, 10 Jun 2010 21:33:07 +0300
Subject: EXT-7511 FIXED Resolved newly reported problems in appearance UI

- Selection top cropping problem reproduces only for some systems and is caused by deeper problems in flatlist, so in this case it was fixed via workaround (increasing of item pad in flatlists) and the cause of it is in new ticket- EXT-7752 (Flatlist selection is a bit different on different systems).

- '+' button now has a 3 px pad from right for consistensy with "wrench" from other items.

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/549/

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_cof_wearables.xml     |  6 +++---
 .../xui/en/panel_dummy_clothing_list_item.xml        | 20 +++++++++++++++-----
 2 files changed, 18 insertions(+), 8 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
index d36c2a4e6f..f016c27b0a 100644
--- a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
+++ b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
@@ -28,7 +28,7 @@
              allow_select="true"
              follows="all"
              height="10"
-             item_pad="2"
+             item_pad="3"
              layout="topleft"
              left="0"
              multi_select="true"
@@ -44,7 +44,7 @@
              allow_select="true"
              follows="all"
              height="10"
-             item_pad="2"
+             item_pad="3"
              layout="topleft"
              left="0"
              multi_select="true"
@@ -60,7 +60,7 @@
              allow_select="true"
              follows="all"
              height="10"
-             item_pad="2"
+             item_pad="3"
              layout="topleft"
              left="0"
              multi_select="true"
diff --git a/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml
index 20652df918..b1f4cbb079 100644
--- a/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml
@@ -49,16 +49,26 @@
      top="4"
      value="..."
      width="359" />
-    <button 
-     name="btn_add"
+    <panel
+     name="btn_add_panel"
      layout="topleft"
      follows="top|right"
-     image_overlay="AddItem_Off"
      top="0"
      left="0"
      height="23"
-     width="23"
-     tab_stop="false" />
+     width="26"
+     tab_stop="false">
+      <button 
+       name="btn_add"
+       layout="topleft"
+       follows="top|right"
+       image_overlay="AddItem_Off"
+       top="0"
+       left="0"
+       height="23"
+       width="23"
+       tab_stop="false" />
+    </panel>
     <icon
      follows="left|right|top"
      height="3"
-- 
cgit v1.2.3


From aa96a6a4e8ebd86b8dc8da530b79f6cbb0365b04 Mon Sep 17 00:00:00 2001
From: Xiaohong Bao <bao@lindenlab.com>
Date: Thu, 10 Jun 2010 12:51:25 -0600
Subject: EXT-7760: FIXED:  only 10 avatars render non-impostored

---
 .../default/xui/en/panel_preferences_graphics1.xml | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index 266fd6cb5e..ccd99c6fb5 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -372,30 +372,18 @@
     decimal_digits="0"
     follows="left|top"
     height="16"
-    increment="2"
-    initial_value="35"
-    label="Max. avatar draw distance:"
+    increment="1"
+    initial_value="12"
+    label="Max. # of non-impostor avatars:"
     label_width="185"
     layout="topleft"
     left_delta="0"
     max_val="65"
     min_val="1"
-    name="MaxAvatarDrawDistance"
+    name="MaxNumberAvatarDrawn"
     top_pad="4"
     width="290" />
-    <text
-    type="string"
-    length="1"
-    follows="left|top"
-    height="12"
-    layout="topleft"
-    left_delta="291"
-    name="DrawDistanceMeterText3"
-    top_delta="0"
-    width="128">
-      m
-    </text>
-		<slider
+    <slider
 		control_name="RenderGlowResolutionPow"
 		decimal_digits="0"
 		follows="left|top"
-- 
cgit v1.2.3


From 99bf3245bd89afebcf1d00bf45d5367c1a83bee1 Mon Sep 17 00:00:00 2001
From: Vladimir Pchelko <pchelko@productengine.com>
Date: Thu, 10 Jun 2010 21:54:23 +0300
Subject: EXT-7622 FIXED Menu items order was updated - according to Design
 Spec. reviewed by Vadim Savchuk at
 https://codereview.productengine.com/secondlife/r/563/

--HG--
branch : product-engine
---
 .../skins/default/xui/en/menu_wearable_list_item.xml       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
index fa5ca60a19..430a7b6444 100644
--- a/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
@@ -37,13 +37,6 @@
      label="Attach to HUD  ▶"
      layout="topleft"
      name="wearable_attach_to_hud" />
-    <menu_item_call
-     label="Object Profile"
-     layout="topleft"
-     name="object_profile">
-        <on_click
-         function="Attachment.Profile" />
-    </menu_item_call>
     <menu_item_call
      label="Take Off"
      layout="topleft"
@@ -58,6 +51,13 @@
         <on_click
          function="Wearable.Edit" />
     </menu_item_call>
+    <menu_item_call
+     label="Object Profile"
+     layout="topleft"
+     name="object_profile">
+        <on_click
+         function="Attachment.Profile" />
+    </menu_item_call>
     <menu_item_call
      label="Show Original"
      layout="topleft"
-- 
cgit v1.2.3


From d8adbf8438765dc994aeb2208c45e71184fc0347 Mon Sep 17 00:00:00 2001
From: "Andrew A. de Laix" <alain@lindenlab.com>
Date: Thu, 10 Jun 2010 15:37:07 -0700
Subject: Fix EXT-7167: updated status url to status.secondlifegrid.net.

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

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 0d14a6b3c8..1f4e40a43d 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3186,7 +3186,7 @@ Abuse Report</string>
   <string name="server_is_down">
 	Despite our best efforts, something unexpected has gone wrong.
 
-	Please check secondlife.com/status to see if there is a known problem with the service.  
+	Please check status.secondlifegrid.net to see if there is a known problem with the service.  
         If you continue to experience problems, please check your network and firewall setup.
   </string>
 
-- 
cgit v1.2.3


From 1ae5d134293ee119a4430e27ebe0d83ae041cad0 Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Thu, 10 Jun 2010 16:43:26 -0700
Subject: Tidy up XUI and make correct Buy Currency HTML floater correct size.
 http://lltrial.onjira.com/browse/VI-155

---
 .../default/xui/en/floater_buy_currency_html.xml   | 34 +++++++++++-----------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml
index 4643f66bd8..23d510f0cf 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
- legacy_header_height="18"
  can_resize="false"
- height="280"
+ can_close="true"
+ width="422"
+ height="202"
  layout="topleft"
- min_height="280"
- min_width="450"
  name="floater_buy_currency_html"
  help_topic="floater_buy_currency_html"
  save_rect="true"
  single_instance="true"
  title="BUY CURRENCY"
- width="452">
- <floater.string
-      name="buy_currency_url" translate="false">
-        https://quick-buy-www.jeff.ooze.lindenlab.com/en/display
- </floater.string>
-    <web_browser
-     bottom="278"
-     follows="left|right|top|bottom"
-     layout="topleft"
-     left="2"
-     name="browser"
-     top="18"
-     width="450" />
+>
+  <floater.string
+    name="buy_currency_url" translate="false">
+    https://quick-buy-www.quick-b.ooze.lindenlab.com/[LANGUAGE]/display/?sa=[SPECIFIC_AMOUNT]&amp;sum=[SUM]&amp;msg=[MSG]&amp;bal=[BAL]
+  </floater.string>
+  <web_browser
+    follows="all"
+    layout="topleft"
+    left="1"
+    right="-1" 
+    top="1"
+    bottom="-1" 
+    ignore_ui_scale="false"
+    name="browser"/>
 </floater>
-- 
cgit v1.2.3


From 63577b8fe3f2b46da70e373364028ae45faf4e06 Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Thu, 10 Jun 2010 16:53:40 -0700
Subject: Update QuickBuy URL in viewer with 'correct' one.
 http://lltrial.onjira.com/browse/VI-147

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

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml
index 23d510f0cf..4b990fa566 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml
@@ -13,7 +13,7 @@
 >
   <floater.string
     name="buy_currency_url" translate="false">
-    https://quick-buy-www.quick-b.ooze.lindenlab.com/[LANGUAGE]/display/?sa=[SPECIFIC_AMOUNT]&amp;sum=[SUM]&amp;msg=[MSG]&amp;bal=[BAL]
+    https://quick-buy.secondlife.com/[LANGUAGE]/display/?sa=[SPECIFIC_AMOUNT]&amp;sum=[SUM]&amp;msg=[MSG]&amp;bal=[BAL]
   </floater.string>
   <web_browser
     follows="all"
-- 
cgit v1.2.3


From 56d9e64b6da662ef8729ab203bab6142309a79f0 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Fri, 11 Jun 2010 10:26:53 +0300
Subject: EXT-7047 FIXED Overridden tab container's max tab width. Added
 paddings to status message text in inventory folder view.

Also fixed crash in LLPanelPlaceProfile if login after places Panel is opened and hidden in UI Preview Tool:
 * added removing of an idle function when instance is destroyed.

Message text has been wrapped into several lines in EXT-7564 (1869e99b5ce2)

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/558/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_places.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml
index 33f895e13a..638e190e8f 100644
--- a/indra/newview/skins/default/xui/en/panel_places.xml
+++ b/indra/newview/skins/default/xui/en/panel_places.xml
@@ -37,6 +37,7 @@ background_visible="true"
      left="6"
      name="Places Tabs"
      tab_min_width="80"
+     tab_max_width="157"
      tab_height="30"
      tab_group="1"
      tab_position="top"
-- 
cgit v1.2.3


From eb1929c8f97f256264cac620871e4b498d985d68 Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Fri, 11 Jun 2010 17:19:40 +0300
Subject: EXT-6726 WIP Improved the way we disable irrelevant items of the My
 Outfits gear menu.

* Made the "Wear" and "Take Off" items mutually exclusive (i.e. only one of them is now shown).
* Hide all context-dependant items ("Wear", "Take off", "Rename", "Delete") when no outfit selected.

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/566/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/menu_outfit_gear.xml | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
index c4e31ed180..8e7ef7f0b5 100644
--- a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
@@ -11,6 +11,9 @@
         <on_enable
          function="Gear.OnEnable"
          parameter="wear" />
+        <on_visible
+         function="Gear.OnVisible"
+         parameter="wear" />
     </menu_item_call>
     <menu_item_call
      label="Take Off - Remove from Current Outfit"
@@ -21,9 +24,12 @@
         <on_enable
          function="Gear.OnEnable"
          parameter="take_off" />
+        <on_visible
+         function="Gear.OnVisible"
+         parameter="take_off" />
     </menu_item_call>
 
-            <menu_item_separator />
+            <menu_item_separator name="sepatator1" />
             <!-- copied (with minor modifications) from menu_inventory_add.xml -->
             <!--  *TODO: generate dynamically? -->
             <menu
@@ -168,7 +174,7 @@
             </menu>
             <!-- copied from menu_inventory_add.xml -->
 
-    <menu_item_separator />
+    <menu_item_separator name="sepatator2" />
     <menu_item_call
      label="Rename Outfit"
      layout="topleft"
@@ -178,6 +184,9 @@
         <on_enable
          function="Gear.OnEnable"
          parameter="rename" />
+        <on_visible
+         function="Gear.OnVisible"
+         parameter="rename" />
     </menu_item_call>
     <menu_item_call
      label="Delete Outfit"
@@ -188,5 +197,8 @@
         <on_enable
          function="Gear.OnEnable"
          parameter="delete" />
+        <on_visible
+         function="Gear.OnVisible"
+         parameter="delete" />
     </menu_item_call>
 </menu>
-- 
cgit v1.2.3


From ad048d4b6a114c11848ecf3147f1be93db00abe2 Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Fri, 11 Jun 2010 17:25:56 +0300
Subject: EXT-7807 FIXED Hide inappropriate outfit context menu items.

Hide the following outfit context menu items instead of disabling them:
* Wear - Replace Current Outfit
* Wear - Add to Current Outfit"
* Take Off - Remove from Current Outfit
* Edit Outfit
* Delete Outfit

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/565/

--HG--
branch : product-engine
---
 .../newview/skins/default/xui/en/menu_outfit_tab.xml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/menu_outfit_tab.xml b/indra/newview/skins/default/xui/en/menu_outfit_tab.xml
index 67559638d9..e084216a69 100644
--- a/indra/newview/skins/default/xui/en/menu_outfit_tab.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_tab.xml
@@ -8,8 +8,8 @@
      name="wear_replace">
         <on_click
          function="Outfit.WearReplace" />
-        <on_enable
-         function="Outfit.OnEnable"
+        <on_visible
+         function="Outfit.OnVisible"
          parameter="wear_replace" />
     </menu_item_call>
     <menu_item_call
@@ -18,8 +18,8 @@
      name="wear_add">
         <on_click
          function="Outfit.WearAdd" />
-        <on_enable
-         function="Outfit.OnEnable"
+        <on_visible
+         function="Outfit.OnVisible"
          parameter="wear_add" />
     </menu_item_call>
     <menu_item_call
@@ -28,8 +28,8 @@
      name="take_off">
         <on_click
          function="Outfit.TakeOff" />
-        <on_enable
-         function="Outfit.OnEnable"
+        <on_visible
+         function="Outfit.OnVisible"
          parameter="take_off" />
     </menu_item_call>
     <menu_item_call
@@ -38,8 +38,8 @@
      name="edit">
         <on_click
          function="Outfit.Edit" />
-        <on_enable
-         function="Outfit.OnEnable"
+        <on_visible
+         function="Outfit.OnVisible"
          parameter="edit" />
     </menu_item_call>
     <menu_item_separator />
@@ -59,8 +59,8 @@
      name="delete">
         <on_click
          function="Outfit.Delete" />
-        <on_enable
-         function="Outfit.OnEnable"
+        <on_visible
+         function="Outfit.OnVisible"
          parameter="delete" />
     </menu_item_call>
 </context_menu>
-- 
cgit v1.2.3


From 680ef887a24dd8adb35514bcf10ca60671867fee Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Fri, 11 Jun 2010 17:47:11 +0300
Subject: EXT-7625 FIXED Removed inappropriate items from the Add Wearables
 panel context menu.

We can now distinguish LLWearableItemsList instances used in My Outfits
from the one used in the Add Wearable panels, and show/enable different menu items for them.

Being limited in time, I implemented this via a XUI parameter called "standalone":
the Add Wearable list is standalone, the others aren't.
Although it would be of course more flexible to have separate subclasses.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/outfit_accordion_tab.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml
index 44437d01eb..bdfa928b1d 100644
--- a/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml
+++ b/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml
@@ -19,6 +19,6 @@
      multi_select="true"
      name="wearable_items_list"
      translate="false"
-     use_internal_context_menu="false"
+     standalone="false"
     />
 </accordion_tab>
-- 
cgit v1.2.3


From 641ec3da61221ffd13cb7d1777c28505a54e2d58 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 10 Jun 2010 14:50:48 -0700
Subject: EXT-7701 language change

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

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml b/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml
index a71b293f31..e05ddf9815 100644
--- a/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml
+++ b/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml
@@ -11,6 +11,6 @@
      name="no_items_msg"
      v_pad="10"
      h_pad="10"
-     value="There are no any items in the list"
+     value="No matches found"
      wrap="true" />
 </flat_list_view>
\ No newline at end of file
-- 
cgit v1.2.3


From 92768103af4e90dd3e0017cf2048c4a8641391b7 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 10 Jun 2010 15:30:32 -0700
Subject: EXT-7781 WIP Editing Shape: Labels on the previews are unreadable

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

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_scrolling_param.xml b/indra/newview/skins/default/xui/en/panel_scrolling_param.xml
index 19eb4bb0d6..9aa0ff1ea1 100644
--- a/indra/newview/skins/default/xui/en/panel_scrolling_param.xml
+++ b/indra/newview/skins/default/xui/en/panel_scrolling_param.xml
@@ -12,6 +12,7 @@
      layout="topleft"
      left="12"
      name="min param text"
+     text_color="EmphasisColor" 
      top="120"
      width="120" />
     <text
@@ -20,6 +21,7 @@
      layout="topleft"
      left="155"
      name="max param text"
+     text_color="EmphasisColor" 
      top_delta="0"
      width="120" />
     <text
-- 
cgit v1.2.3


From 7127fa493c98ae922f09c966a91e0d9d3679f60b Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 10 Jun 2010 17:07:45 -0700
Subject: EXT-7750 - Wearing list does not need to be bold or show link or worn

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

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
index de1f2cf31b..7a7f910171 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
@@ -48,6 +48,7 @@
            mouse_opaque="true"
            name="cof_tab"
            start_folder="Current Outfit"
+           use_label_suffix="false" 
            width="315" />
    </tab_container>
 	 <panel
-- 
cgit v1.2.3


From 809fea74633bcb3358eed9f80059822c6664bf54 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 10 Jun 2010 17:08:45 -0700
Subject: EXT-7781 FIX Editing Shape: Labels on the previews are unreadable

---
 indra/newview/skins/default/xui/en/panel_scrolling_param.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_scrolling_param.xml b/indra/newview/skins/default/xui/en/panel_scrolling_param.xml
index 9aa0ff1ea1..78d64620a5 100644
--- a/indra/newview/skins/default/xui/en/panel_scrolling_param.xml
+++ b/indra/newview/skins/default/xui/en/panel_scrolling_param.xml
@@ -12,7 +12,8 @@
      layout="topleft"
      left="12"
      name="min param text"
-     text_color="EmphasisColor" 
+     text_color="EmphasisColor"
+     font_shadow="hard"
      top="120"
      width="120" />
     <text
@@ -22,6 +23,7 @@
      left="155"
      name="max param text"
      text_color="EmphasisColor" 
+     font_shadow="hard"
      top_delta="0"
      width="120" />
     <text
-- 
cgit v1.2.3


From 9a3432857d790a003a12fd9ebb7b2ab6f9dcc347 Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Fri, 11 Jun 2010 21:44:46 +0300
Subject: EXT-7376 FIXED Arranged position of "back" button in sidetray panels
 according to requirements from ticket.

Arranged position of "back" buttons in sidetray via xml.

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/562/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_classified_info.xml     | 4 ++--
 indra/newview/skins/default/xui/en/panel_edit_classified.xml     | 4 ++--
 indra/newview/skins/default/xui/en/panel_edit_pick.xml           | 6 +++---
 indra/newview/skins/default/xui/en/panel_edit_wearable.xml       | 5 +++--
 indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml | 4 ++--
 indra/newview/skins/default/xui/en/panel_landmark_info.xml       | 6 +++---
 indra/newview/skins/default/xui/en/panel_outfit_edit.xml         | 4 ++--
 indra/newview/skins/default/xui/en/panel_pick_info.xml           | 6 +++---
 indra/newview/skins/default/xui/en/panel_place_profile.xml       | 4 ++--
 indra/newview/skins/default/xui/en/panel_profile_view.xml        | 6 +++---
 indra/newview/skins/default/xui/en/sidepanel_appearance.xml      | 2 +-
 indra/newview/skins/default/xui/en/sidepanel_item_info.xml       | 4 ++--
 12 files changed, 28 insertions(+), 27 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_classified_info.xml b/indra/newview/skins/default/xui/en/panel_classified_info.xml
index 859cc82e81..976f6d6cd0 100644
--- a/indra/newview/skins/default/xui/en/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml
@@ -47,7 +47,7 @@
      layout="topleft"
      name="back_btn"
      picture_style="true"
-     left="9"
+     left="10"
      tab_stop="false"
      top="2"
      width="30" />
@@ -56,7 +56,7 @@
      font="SansSerifHugeBold"
      height="26"
      layout="topleft"
-     left_pad="10"
+     left_pad="4"
      name="title"
      text_color="LtGray"
      top="0"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_classified.xml b/indra/newview/skins/default/xui/en/panel_edit_classified.xml
index 1b4f547f9d..6744a7b9c2 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_classified.xml
@@ -31,7 +31,7 @@
      layout="topleft"
      name="back_btn"
      picture_style="true"
-     left="7"
+     left="10"
      tab_stop="false"
      top="2"
      width="30" />
@@ -42,7 +42,7 @@
      font="SansSerifHugeBold"
      height="26"
      layout="topleft"
-     left_pad="10"
+     left_pad="4"
      name="title"
      text_color="LtGray"
      top="0"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
index 589ea10e8d..dc83b334b5 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
@@ -24,7 +24,7 @@
      image_unselected="BackButton_Off"
      layout="topleft"
      name="back_btn"
-     left="7"
+     left="10"
      tab_stop="false"
      top="2"
      width="30" />
@@ -35,10 +35,10 @@
      font="SansSerifHugeBold"
      height="26"
      layout="topleft"
-     left_pad="10"
+     left_pad="4"
      name="title"
      text_color="LtGray"
-     top="0"
+     top="2"
      width="250">
         Edit Pick
     </text>
diff --git a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
index 645ee8a435..950c4a5fdb 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
@@ -141,15 +141,16 @@ left="0"
      layout="topleft"
      name="back_btn"
      left="11"
-     top="7" />
+     top="3" />
 	<text
 	 follows="top|left"
 	 font="SansSerifHugeBold"
 	 height="22"
 	 layout="topleft"
-	 left_pad="15"
+	 left_pad="8"
 	 name="edit_wearable_title"
 	 text_color="white"
+   top="3" 
 	 value="Editing Shape"
 	 width="270" />
      <panel
diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
index 58b78cfa02..e4eb9afb29 100644
--- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
@@ -57,9 +57,9 @@ background_visible="true"
       font="SansSerifHugeBold"
      h_pad="0"
       height="26"
-      left_pad="10"
+      left_pad="8"
      text_color="LtGray"
-      top="0"
+      top="1"
      use_ellipses="true"
       width="275"
       follows="top|left|right"
diff --git a/indra/newview/skins/default/xui/en/panel_landmark_info.xml b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
index bb73360e0b..55fef5aaf7 100644
--- a/indra/newview/skins/default/xui/en/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
@@ -63,7 +63,7 @@
      image_pressed="BackButton_Press"
      image_unselected="BackButton_Off"
      layout="topleft"
-     left="8"
+     left="9"
      name="back_btn"
      tool_tip="Back"
      tab_stop="false"
@@ -74,10 +74,10 @@
      font="SansSerifHugeBold"
      height="26"
      layout="topleft"
-     left_pad="10"
+     left_pad="7"
      name="title"
      text_color="LtGray"
-     top="2"
+     top="3"
      use_ellipses="true"
      value="Place Profile"
      width="280" />
diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index 741f60669a..decdeca00d 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -64,14 +64,14 @@
      name="back_btn"
      left="5"
      tab_stop="false"
-     top="2"
+     top="1"
      width="30" />
     <text
      follows="top|right"
      font="SansSerifHugeBold"
      height="26"
      layout="topleft"
-     left_pad="20"
+     left_pad="10"
      name="title"
      text_color="LtGray"
      top="0"
diff --git a/indra/newview/skins/default/xui/en/panel_pick_info.xml b/indra/newview/skins/default/xui/en/panel_pick_info.xml
index 49e1d16f6a..1d01bcb8a5 100644
--- a/indra/newview/skins/default/xui/en/panel_pick_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml
@@ -18,7 +18,7 @@
      image_unselected="BackButton_Off"
      layout="topleft"
      name="back_btn"
-     left="7"
+     left="10"
      tab_stop="false"
      top="2"
      width="30" />
@@ -27,10 +27,10 @@
      font="SansSerifHugeBold"
      height="26"
      layout="topleft"
-     left_pad="10"
+     left_pad="4"
      name="title"
      text_color="LtGray"
-     top="0"
+     top="2"
      value="Pick Info"
      use_ellipses="true"
      width="275" />
diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml
index 59f1f6d638..55e0184282 100644
--- a/indra/newview/skins/default/xui/en/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml
@@ -160,7 +160,7 @@
      image_pressed="BackButton_Press"
      image_unselected="BackButton_Off"
      layout="topleft"
-     left="7"
+     left="8"
      name="back_btn"
      tool_tip="Back"
      tab_stop="false"
@@ -174,7 +174,7 @@
      left_pad="10"
      name="title"
      text_color="LtGray"
-     top="2"
+     top="4"
      use_ellipses="true"
      value="Place Profile"
      width="280" />
diff --git a/indra/newview/skins/default/xui/en/panel_profile_view.xml b/indra/newview/skins/default/xui/en/panel_profile_view.xml
index cc5ba334d6..d9030fc0d6 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml
@@ -24,7 +24,7 @@
      image_unselected="BackButton_Off"
      layout="topleft"
      name="back"
-     left="9"
+     left="10"
      tab_stop="false"
      top="2"
      width="30" />
@@ -38,10 +38,10 @@
       font="SansSerifHugeBold"
       height="26"
       layout="topleft"
-      left_pad="10"
+      left_pad="5"
       name="user_name"
       text_color="LtGray"
-      top="0"
+      top="2"
       value="(Loading...)"
       use_ellipses="true"
       width="275" />
diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
index ae08a13793..227c470d14 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@@ -144,7 +144,7 @@ width="333">
    left="5"
    min_height="410"
    name="panel_outfit_edit"
-   top="5"
+   top="2"
    visible="false" 
    width="320"/>
    <panel
diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
index b736f5e29c..e2bd6f375e 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -55,10 +55,10 @@
      font="SansSerifHugeBold"
      height="26"
      layout="topleft"
-     left_pad="10"
+     left_pad="3"
      name="title"
      text_color="LtGray"
-     top="0"
+     top="2"
      use_ellipses="true"
      value="Object Profile"
      width="275" />
-- 
cgit v1.2.3


From b729267b98dd9895d0b1d166374a94fc7d35e833 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Fri, 11 Jun 2010 17:49:57 -0700
Subject: ND-47147 WIP IT translation for set11

---
 .../newview/skins/default/xui/it/floater_about.xml |   4 +-
 .../skins/default/xui/it/floater_about_land.xml    |   3 +
 .../default/xui/it/floater_avatar_textures.xml     |  73 ++++-----
 indra/newview/skins/default/xui/it/floater_map.xml |   2 +-
 .../skins/default/xui/it/floater_moveview.xml      |  36 ++++-
 .../default/xui/it/floater_preview_notecard.xml    |   4 +-
 .../newview/skins/default/xui/it/floater_tools.xml |  10 +-
 .../skins/default/xui/it/menu_attachment_self.xml  |   2 +-
 .../skins/default/xui/it/menu_avatar_self.xml      |   4 +-
 .../skins/default/xui/it/menu_bottomtray.xml       |   5 +
 .../default/xui/it/menu_inspect_self_gear.xml      |   2 +-
 .../skins/default/xui/it/menu_inventory.xml        |   1 +
 indra/newview/skins/default/xui/it/menu_login.xml  |   2 +-
 .../skins/default/xui/it/menu_participant_list.xml |   4 +-
 indra/newview/skins/default/xui/it/menu_viewer.xml |   4 +-
 .../newview/skins/default/xui/it/notifications.xml | 107 ++++++++++++--
 .../skins/default/xui/it/panel_bottomtray.xml      |  23 ++-
 .../skins/default/xui/it/panel_edit_shape.xml      |  12 +-
 .../skins/default/xui/it/panel_edit_tattoo.xml     |   1 +
 .../skins/default/xui/it/panel_edit_wearable.xml   |   6 +
 .../default/xui/it/panel_group_land_money.xml      |   3 +
 .../skins/default/xui/it/panel_group_notices.xml   |   1 +
 indra/newview/skins/default/xui/it/panel_login.xml |  12 +-
 .../skins/default/xui/it/panel_main_inventory.xml  |  66 ++-------
 .../skins/default/xui/it/panel_outfit_edit.xml     |  15 +-
 .../newview/skins/default/xui/it/panel_people.xml  |  10 +-
 .../default/xui/it/panel_preferences_advanced.xml  |   1 +
 .../default/xui/it/panel_preferences_chat.xml      |   1 +
 .../default/xui/it/panel_preferences_graphics1.xml |   7 +-
 .../skins/default/xui/it/sidepanel_appearance.xml  |   8 +-
 .../skins/default/xui/it/sidepanel_inventory.xml   |   1 +
 indra/newview/skins/default/xui/it/strings.xml     | 164 ++++++++++++++++++++-
 32 files changed, 425 insertions(+), 169 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/it/floater_about.xml b/indra/newview/skins/default/xui/it/floater_about.xml
index 55e699612c..026b7b7616 100644
--- a/indra/newview/skins/default/xui/it/floater_about.xml
+++ b/indra/newview/skins/default/xui/it/floater_about.xml
@@ -27,9 +27,9 @@ Scheda grafica: [GRAPHICS_CARD]
 
 Versione libcurl: [LIBCURL_VERSION]
 Versione J2C Decoder: [J2C_VERSION]
-Versione Audio Driver: [AUDIO_DRIVER_VERSION]
+Versione Driver audio: [AUDIO_DRIVER_VERSION]
 Versione Qt Webkit: [QT_WEBKIT_VERSION]
-Versione Vivox: [VIVOX_VERSION]
+Versione Server voice: [VOICE_VERSION]
 	</floater.string>
 	<floater.string name="none">
 		(nessuno)
diff --git a/indra/newview/skins/default/xui/it/floater_about_land.xml b/indra/newview/skins/default/xui/it/floater_about_land.xml
index c55f79738e..942b79b7d3 100644
--- a/indra/newview/skins/default/xui/it/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/it/floater_about_land.xml
@@ -63,6 +63,9 @@
 				Nessun appezzamento selezionato.
 Vai al menu Mondo &gt; Informazioni sul terreno oppure seleziona un altro appezzamento per vederne i dettagli.
 			</panel.string>
+			<panel.string name="time_stamp_template">
+				[wkday,datetime,local] [day,datetime,local] [mth,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
+			</panel.string>
 			<text name="Name:">
 				Nome:
 			</text>
diff --git a/indra/newview/skins/default/xui/it/floater_avatar_textures.xml b/indra/newview/skins/default/xui/it/floater_avatar_textures.xml
index 2935f0fdb6..b6376973cd 100644
--- a/indra/newview/skins/default/xui/it/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/it/floater_avatar_textures.xml
@@ -3,41 +3,48 @@
 	<floater.string name="InvalidAvatar">
 		AVATAR NON VALIDO
 	</floater.string>
-	<text name="composite_label">
-		Texture Composite
-	</text>
-	<button label="Deposito" label_selected="Deposito" name="Dump"/>
 	<scroll_container name="profile_scroll">
 		<panel name="scroll_content_panel">
-			<texture_picker label="Capigliature" name="hair-baked"/>
-			<texture_picker label="Capigliature" name="hair_grain"/>
-			<texture_picker label="Alpha dei capelli" name="hair_alpha"/>
-			<texture_picker label="Testa" name="head-baked"/>
-			<texture_picker label="Makeup" name="head_bodypaint"/>
-			<texture_picker label="Alpha della testa" name="head_alpha"/>
-			<texture_picker label="Tatuaggio della testa" name="head_tattoo"/>
-			<texture_picker label="Occhi" name="eyes-baked"/>
-			<texture_picker label="Occhio" name="eyes_iris"/>
-			<texture_picker label="Alpha degli occhi" name="eyes_alpha"/>
-			<texture_picker label="Parte superiore del corpo" name="upper-baked"/>
-			<texture_picker label="Bodypaint parte superiore del corpo" name="upper_bodypaint"/>
-			<texture_picker label="Maglietta intima" name="upper_undershirt"/>
-			<texture_picker label="Guanti" name="upper_gloves"/>
-			<texture_picker label="Camicia" name="upper_shirt"/>
-			<texture_picker label="Parte superiore della giacca" name="upper_jacket"/>
-			<texture_picker label="Alpha superiore" name="upper_alpha"/>
-			<texture_picker label="Tatuaggio superiore" name="upper_tattoo"/>
-			<texture_picker label="Parte inferiore del corpo" name="lower-baked"/>
-			<texture_picker label="Bodypaint parte inferiore del corpo" name="lower_bodypaint"/>
-			<texture_picker label="Slip" name="lower_underpants"/>
-			<texture_picker label="Calzini" name="lower_socks"/>
-			<texture_picker label="Scarpe" name="lower_shoes"/>
-			<texture_picker label="Pantaloni" name="lower_pants"/>
-			<texture_picker label="Giacca" name="lower_jacket"/>
-			<texture_picker label="Alpha inferiore" name="lower_alpha"/>
-			<texture_picker label="Tattuaggio inferiore" name="lower_tattoo"/>
-			<texture_picker label="Gonna" name="skirt-baked"/>
-			<texture_picker label="Gonna" name="skirt"/>
+			<text name="label">
+				Baking delle
+texture
+			</text>
+			<text name="composite_label">
+				Composito
+Texture
+			</text>
+			<button label="Memorizza gli ID sulla console" label_selected="Dump" name="Dump"/>
+			<panel name="scroll_content_panel">
+				<texture_picker label="Capigliature" name="hair-baked"/>
+				<texture_picker label="Capigliature" name="hair_grain"/>
+				<texture_picker label="Alpha dei capelli" name="hair_alpha"/>
+				<texture_picker label="Testa" name="head-baked"/>
+				<texture_picker label="Makeup" name="head_bodypaint"/>
+				<texture_picker label="Alpha della testa" name="head_alpha"/>
+				<texture_picker label="Tatuaggio della testa" name="head_tattoo"/>
+				<texture_picker label="Occhi" name="eyes-baked"/>
+				<texture_picker label="Occhio" name="eyes_iris"/>
+				<texture_picker label="Alpha degli occhi" name="eyes_alpha"/>
+				<texture_picker label="Parte superiore del corpo" name="upper-baked"/>
+				<texture_picker label="Bodypaint parte superiore del corpo" name="upper_bodypaint"/>
+				<texture_picker label="Maglietta intima" name="upper_undershirt"/>
+				<texture_picker label="Guanti" name="upper_gloves"/>
+				<texture_picker label="Camicia" name="upper_shirt"/>
+				<texture_picker label="Parte superiore della giacca" name="upper_jacket"/>
+				<texture_picker label="Alpha superiore" name="upper_alpha"/>
+				<texture_picker label="Tatuaggio superiore" name="upper_tattoo"/>
+				<texture_picker label="Parte inferiore del corpo" name="lower-baked"/>
+				<texture_picker label="BodyPaint parte inferiore del corpo" name="lower_bodypaint"/>
+				<texture_picker label="Slip" name="lower_underpants"/>
+				<texture_picker label="Calzini" name="lower_socks"/>
+				<texture_picker label="Scarpe" name="lower_shoes"/>
+				<texture_picker label="Pantaloni" name="lower_pants"/>
+				<texture_picker label="Giacca" name="lower_jacket"/>
+				<texture_picker label="Alpha inferiore" name="lower_alpha"/>
+				<texture_picker label="Tattuaggio inferiore" name="lower_tattoo"/>
+				<texture_picker label="Gonna" name="skirt-baked"/>
+				<texture_picker label="Gonna" name="skirt"/>
+			</panel>
 		</panel>
 	</scroll_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_map.xml b/indra/newview/skins/default/xui/it/floater_map.xml
index 70ab8dcb5a..d1e9c98e79 100644
--- a/indra/newview/skins/default/xui/it/floater_map.xml
+++ b/indra/newview/skins/default/xui/it/floater_map.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Map" title="Mini mappa">
+<floater name="Map" title="">
 	<floater.string name="mini_map_north">
 		N
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/it/floater_moveview.xml b/indra/newview/skins/default/xui/it/floater_moveview.xml
index 26d861c566..cdafdb0089 100644
--- a/indra/newview/skins/default/xui/it/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/it/floater_moveview.xml
@@ -6,18 +6,48 @@
 	<string name="walk_back_tooltip">
 		Cammina indietro (premi freccia giù o S)
 	</string>
+	<string name="walk_left_tooltip">
+		Cammina a sinistra (premi Maiusc + freccia sinistra o A)
+	</string>
+	<string name="walk_right_tooltip">
+		Cammina a destra (premi Maiusc + freccia destra o D)
+	</string>
 	<string name="run_forward_tooltip">
 		Corri in avanti (premi freccia su o W)
 	</string>
 	<string name="run_back_tooltip">
 		Corri indietro (premi freccia giù o S)
 	</string>
+	<string name="run_left_tooltip">
+		Corri a sinistra (premi Maiusc + freccia sinistra o A)
+	</string>
+	<string name="run_right_tooltip">
+		Corri a destra (premi Maiusc + freccia destra o D)
+	</string>
 	<string name="fly_forward_tooltip">
 		Vola in avanti (premi freccia su o W)
 	</string>
 	<string name="fly_back_tooltip">
 		Vola indietro (premi freccia giù o S)
 	</string>
+	<string name="fly_left_tooltip">
+		Vola a sinistra (premi Maiusc + freccia sinistra o A)
+	</string>
+	<string name="fly_right_tooltip">
+		Vola a destra (premi Maiusc + freccia destra o D)
+	</string>
+	<string name="fly_up_tooltip">
+		Vola in alto (premi E)
+	</string>
+	<string name="fly_down_tooltip">
+		Vola in basso (premi C)
+	</string>
+	<string name="jump_tooltip">
+		Salta (premi E)
+	</string>
+	<string name="crouch_tooltip">
+		Accovacciarsi (premi C)
+	</string>
 	<string name="walk_title">
 		Cammina
 	</string>
@@ -28,10 +58,12 @@
 		Vola
 	</string>
 	<panel name="panel_actions">
+		<button label="" label_selected="" name="move up btn" tool_tip="Vola in alto (premi E)"/>
 		<button label="" label_selected="" name="turn left btn" tool_tip="Gira a sinistra (premi freccia sinistra o A)"/>
+		<joystick_slide name="move left btn" tool_tip="Cammina a sinistra (premi Maiusc + freccia sinistra o A)"/>
+		<button label="" label_selected="" name="move down btn" tool_tip="Vola in basso (premi C)"/>
 		<button label="" label_selected="" name="turn right btn" tool_tip="Gira a destra (premi freccia destra o D)"/>
-		<button label="" label_selected="" name="move up btn" tool_tip="Vola in alto, premi E"/>
-		<button label="" label_selected="" name="move down btn" tool_tip="Vola in basso, premi C"/>
+		<joystick_slide name="move right btn" tool_tip="Cammina a destra (premi Maiusc + freccia destra o D)"/>
 		<joystick_turn name="forward btn" tool_tip="Cammina in avanti (premi freccia su o W)"/>
 		<joystick_turn name="backward btn" tool_tip="Cammina indietro (premi freccia giù o S)"/>
 	</panel>
diff --git a/indra/newview/skins/default/xui/it/floater_preview_notecard.xml b/indra/newview/skins/default/xui/it/floater_preview_notecard.xml
index 70e28dde35..7ec229f9d3 100644
--- a/indra/newview/skins/default/xui/it/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/it/floater_preview_notecard.xml
@@ -9,9 +9,6 @@
 	<floater.string name="Title">
 		Biglietto: [NAME]
 	</floater.string>
-	<floater.string label="Salva" label_selected="Salva" name="Save">
-		Salva
-	</floater.string>
 	<text name="desc txt">
 		Descrizione:
 	</text>
@@ -19,4 +16,5 @@
 		In caricamento...
 	</text_editor>
 	<button label="Salva" label_selected="Salva" name="Save"/>
+	<button label="Elimina" label_selected="Elimina" name="Delete"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_tools.xml b/indra/newview/skins/default/xui/it/floater_tools.xml
index 04d61b97ff..68d193ff33 100644
--- a/indra/newview/skins/default/xui/it/floater_tools.xml
+++ b/indra/newview/skins/default/xui/it/floater_tools.xml
@@ -67,9 +67,9 @@
 	<text name="RenderingCost" tool_tip="Mostra il costo di rendering calcolato per questo oggetto">
 		þ: [COUNT]
 	</text>
-	<check_box name="checkbox uniform"/>
-	<text name="checkbox uniform label">
-		Ridimens. simmetricamente
+	<check_box label="" name="checkbox uniform"/>
+	<text label="Allunga entrambi i lati" name="checkbox uniform label">
+		Allunga entrambi i lati
 	</text>
 	<check_box initial_value="true" label="Ridimensiona le texture" name="checkbox stretch textures"/>
 	<check_box initial_value="true" label="Posiziona nella griglia" name="checkbox snap to grid"/>
@@ -445,8 +445,8 @@
 			<check_box label="Inverti" name="checkbox flip s"/>
 			<spinner label="Verticale (V)" name="TexScaleV"/>
 			<check_box label="Inverti" name="checkbox flip t"/>
-			<spinner label="Rotazione˚" name="TexRot" />
-			<spinner label="Ripetizioni / Metro" name="rptctrl" />
+			<spinner label="Rotazione˚" name="TexRot"/>
+			<spinner label="Ripetizioni / Metro" name="rptctrl"/>
 			<button label="Applica" label_selected="Applica" name="button apply"/>
 			<text name="tex offset">
 				Bilanciamento della texture
diff --git a/indra/newview/skins/default/xui/it/menu_attachment_self.xml b/indra/newview/skins/default/xui/it/menu_attachment_self.xml
index 054f4802e6..c480a2fe0e 100644
--- a/indra/newview/skins/default/xui/it/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/it/menu_attachment_self.xml
@@ -5,7 +5,7 @@
 	<menu_item_call label="Stacca" name="Detach"/>
 	<menu_item_call label="Lascia" name="Drop"/>
 	<menu_item_call label="Alzati" name="Stand Up"/>
-	<menu_item_call label="Il mio aspetto" name="Appearance..."/>
+	<menu_item_call label="Cambia vestiario" name="Change Outfit"/>
 	<menu_item_call label="I miei amici..." name="Friends..."/>
 	<menu_item_call label="I miei gruppi" name="Groups..."/>
 	<menu_item_call label="Il mio profilo" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/it/menu_avatar_self.xml b/indra/newview/skins/default/xui/it/menu_avatar_self.xml
index d73d97d499..7796d41286 100644
--- a/indra/newview/skins/default/xui/it/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/it/menu_avatar_self.xml
@@ -20,7 +20,9 @@
 		<context_menu label="Stacca  ▶" name="Object Detach"/>
 		<menu_item_call label="Stacca tutto" name="Detach All"/>
 	</context_menu>
-	<menu_item_call label="Il mio aspetto" name="Appearance..."/>
+	<menu_item_call label="Cambia vestiario" name="Chenge Outfit"/>
+	<menu_item_call label="Modifica il mio vestiario" name="Edit Outfit"/>
+	<menu_item_call label="Modifica la figura corporea" name="Edit My Shape"/>
 	<menu_item_call label="I miei amici..." name="Friends..."/>
 	<menu_item_call label="I miei gruppi" name="Groups..."/>
 	<menu_item_call label="Il mio profilo" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/it/menu_bottomtray.xml b/indra/newview/skins/default/xui/it/menu_bottomtray.xml
index 7203d002d2..8ca5b24b48 100644
--- a/indra/newview/skins/default/xui/it/menu_bottomtray.xml
+++ b/indra/newview/skins/default/xui/it/menu_bottomtray.xml
@@ -4,6 +4,11 @@
 	<menu_item_check label="Tasto Movimento" name="ShowMoveButton"/>
 	<menu_item_check label="Tasto Visuale" name="ShowCameraButton"/>
 	<menu_item_check label="Tasto Foto" name="ShowSnapshotButton"/>
+	<menu_item_check label="Pulsante barra laterale" name="ShowSidebarButton"/>
+	<menu_item_check label="Pulsante Costruisci" name="ShowBuildButton"/>
+	<menu_item_check label="Pulsante Cerca" name="ShowSearchButton"/>
+	<menu_item_check label="Pulsante Mappa" name="ShowWorldMapButton"/>
+	<menu_item_check label="Pulsante Mini mappa" name="ShowMiniMapButton"/>
 	<menu_item_call label="Taglia" name="NearbyChatBar_Cut"/>
 	<menu_item_call label="Copia" name="NearbyChatBar_Copy"/>
 	<menu_item_call label="Incolla" name="NearbyChatBar_Paste"/>
diff --git a/indra/newview/skins/default/xui/it/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/it/menu_inspect_self_gear.xml
index 33229bb7c0..80edae8a2b 100644
--- a/indra/newview/skins/default/xui/it/menu_inspect_self_gear.xml
+++ b/indra/newview/skins/default/xui/it/menu_inspect_self_gear.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu name="Gear Menu">
 	<menu_item_call label="Alzati" name="stand_up"/>
-	<menu_item_call label="Il mio aspetto" name="my_appearance"/>
+	<menu_item_call label="Cambia vestiario" name="change_outfit"/>
 	<menu_item_call label="Il mio profilo" name="my_profile"/>
 	<menu_item_call label="I miei amici..." name="my_friends"/>
 	<menu_item_call label="I miei gruppi" name="my_groups"/>
diff --git a/indra/newview/skins/default/xui/it/menu_inventory.xml b/indra/newview/skins/default/xui/it/menu_inventory.xml
index 3b36198774..b127f8b816 100644
--- a/indra/newview/skins/default/xui/it/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/it/menu_inventory.xml
@@ -54,6 +54,7 @@
 	<menu_item_call label="Elimina oggetto" name="Purge Item"/>
 	<menu_item_call label="Ripristina oggetto" name="Restore Item"/>
 	<menu_item_call label="Apri" name="Open"/>
+	<menu_item_call label="Apri originale" name="Open Original"/>
 	<menu_item_call label="Proprietà" name="Properties"/>
 	<menu_item_call label="Rinomina" name="Rename"/>
 	<menu_item_call label="Copia UUID dell&apos;oggetto" name="Copy Asset UUID"/>
diff --git a/indra/newview/skins/default/xui/it/menu_login.xml b/indra/newview/skins/default/xui/it/menu_login.xml
index 904b819198..0a6d803058 100644
--- a/indra/newview/skins/default/xui/it/menu_login.xml
+++ b/indra/newview/skins/default/xui/it/menu_login.xml
@@ -2,7 +2,7 @@
 <menu_bar name="Login Menu">
 	<menu label="Io" name="File">
 		<menu_item_call label="Preferenze" name="Preferences..."/>
-		<menu_item_call label="Chiudi" name="Quit"/>
+		<menu_item_call label="Esci da [APP_NAME]" name="Quit"/>
 	</menu>
 	<menu label="Aiuto" name="Help">
 		<menu_item_call label="Aiuto di [SECOND_LIFE]" name="Second Life Help"/>
diff --git a/indra/newview/skins/default/xui/it/menu_participant_list.xml b/indra/newview/skins/default/xui/it/menu_participant_list.xml
index 71f1a9a0da..f70b886a1e 100644
--- a/indra/newview/skins/default/xui/it/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/it/menu_participant_list.xml
@@ -14,8 +14,8 @@
 	<context_menu label="Opzioni moderatore  &gt;" name="Moderator Options">
 		<menu_item_check label="Consenti chat di testo" name="AllowTextChat"/>
 		<menu_item_call label="Disattiva audio di questo participante" name="ModerateVoiceMuteSelected"/>
-		<menu_item_call label="Disattiva audio di tutti gli altri" name="ModerateVoiceMuteOthers"/>
 		<menu_item_call label="Riattiva audio di questo participante" name="ModerateVoiceUnMuteSelected"/>
-		<menu_item_call label="Riattiva audio di tutti gli altri" name="ModerateVoiceUnMuteOthers"/>
+		<menu_item_call label="Disattiva audio di tutti" name="ModerateVoiceMute"/>
+		<menu_item_call label="Riattiva audio di tutti" name="ModerateVoiceUnmute"/>
 	</context_menu>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_viewer.xml b/indra/newview/skins/default/xui/it/menu_viewer.xml
index a5923ac42b..999f89a80d 100644
--- a/indra/newview/skins/default/xui/it/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/it/menu_viewer.xml
@@ -7,7 +7,7 @@
 		</menu_item_call>
 		<menu_item_call label="Compra L$" name="Buy and Sell L$"/>
 		<menu_item_call label="Il mio profilo" name="Profile"/>
-		<menu_item_call label="Il mio aspetto" name="Appearance"/>
+		<menu_item_call label="Cambia vestiario" name="ChangeOutfit"/>
 		<menu_item_check label="Il mio inventario" name="Inventory"/>
 		<menu_item_check label="Il mio inventario" name="ShowSidetrayInventory"/>
 		<menu_item_check label="Le mie gesture" name="Gestures"/>
@@ -162,6 +162,7 @@
 			<menu_item_check label="Oggetti flessibili" name="Flexible Objects"/>
 		</menu>
 		<menu_item_check label="Esegui thread multipli" name="Run Multiple Threads"/>
+		<menu_item_check label="Usa thread lettura plugin" name="Use Plugin Read Thread"/>
 		<menu_item_call label="Pulisci cache di gruppo" name="ClearGroupCache"/>
 		<menu_item_check label="Fluidità mouse" name="Mouse Smoothing"/>
 		<menu label="Scorciatoie" name="Shortcuts">
@@ -188,7 +189,6 @@
 			<menu_item_call label="Zoom avanti" name="Zoom In"/>
 			<menu_item_call label="Zoom predefinito" name="Zoom Default"/>
 			<menu_item_call label="Zoom indietro" name="Zoom Out"/>
-			<menu_item_call label="Alterna schermo intero" name="Toggle Fullscreen"/>
 		</menu>
 		<menu_item_call label="Mostra impostazioni di debug" name="Debug Settings"/>
 		<menu_item_check label="Mostra menu sviluppo" name="Debug Mode"/>
diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml
index 4739e5cce9..058353da38 100644
--- a/indra/newview/skins/default/xui/it/notifications.xml
+++ b/indra/newview/skins/default/xui/it/notifications.xml
@@ -326,6 +326,9 @@ Hai bisogno di un account per entrare in [SECOND_LIFE]. Ne vuoi creare uno adess
 		</url>
 		<usetemplate name="okcancelbuttons" notext="Riprova" yestext="Crea un nuovo account"/>
 	</notification>
+	<notification name="InvalidCredentialFormat">
+		Immetti sia il nome che il cognome del tuo avatar nel campo del nome utente, quindi effettua l&apos;accesso.
+	</notification>
 	<notification name="AddClassified">
 		L&apos;inserzione comparirà nella sezione &apos;Annunci&apos; della Ricerca e su [http://secondlife.com/community/classifieds secondlife.com] per una settimana.
 Compila la tua inserzione, quindi clicca &apos;Pubblica...&apos; per aggiungerla all&apos;elenco degli annunci.
@@ -608,6 +611,11 @@ Attese [VALIDS]
 	<notification name="CannotEncodeFile">
 		Impossibile codificare il file: [FILE]
 	</notification>
+	<notification name="CorruptedProtectedDataStore">
+		Poiché non è possibile leggere i dati protetti, ora verranno ripristinati.
+   Ciò può succedere alla modifica delle impostazioni di rete.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="CorruptResourceFile">
 		File risorsa corrotto: [FILE]
 	</notification>
@@ -968,6 +976,12 @@ su TUTTI I TERRENI di questa sim?
 
 Introduci un prezzo più alto.
 	</notification>
+	<notification name="ConfirmItemDeleteHasLinks">
+		Almeno uno degli oggetti selezionati è collegato tramite link ad altri oggetti.  Se elimini l&apos;oggetto, i relativi link non funzioneranno più.  Pertanto si consiglia vivamente di eliminare prima i link.
+
+Sei sicuro di volere eliminare gli oggetti?
+		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmObjectDeleteLock">
 		Almeno uno degli elementi selezionati è bloccato.
 
@@ -1117,6 +1131,42 @@ Premi F1 in qualunque momento per la guida o per apprendere altre cose di [SECON
 Scegli un avatar maschile o femminile. Puoi sempre cambiare idea più tardi.
 		<usetemplate name="okcancelbuttons" notext="Femminile" yestext="Maschile"/>
 	</notification>
+	<notification name="CantTeleportToGrid">
+		Impossibile effettuare il teleport su [SLURL], in quanto si trova su una griglia ([GRID]) diversa da quella attuale ([CURRENT_GRID]).  Chiudi il viewer e prova nuovamente.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="GeneralCertificateError">
+		Impossibile collegarsi al server.
+[REASON]
+
+Nome oggetto: [SUBJECT_NAME_STRING]
+Nome emittente: [ISSUER_NAME_STRING]
+Valido da: [VALID_FROM]
+Valido fino a: [VALID_TO]
+Impronta MD5: [SHA1_DIGEST]
+Impronta SHA1: [MD5_DIGEST]
+Uso chiave: [KEYUSAGE]
+Uso chiave estesa: [EXTENDEDKEYUSAGE]
+Identificatore chiave oggetto: [SUBJECTKEYIDENTIFIER]
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="TrustCertificateError">
+		Autorità di certificazione di questo server sconosciuta.
+
+Informazioni sul certificato:
+Nome oggetto: [SUBJECT_NAME_STRING]
+Nome emittente: [ISSUER_NAME_STRING]
+Valido da: [VALID_FROM]
+Valido fino a: [VALID_TO]
+Impronta MD5: [SHA1_DIGEST]
+Impronta SHA1: [MD5_DIGEST]
+Uso chiave: [KEYUSAGE]
+Uso chiave estesa: [EXTENDEDKEYUSAGE]
+Identificatore chiave oggetto: [SUBJECTKEYIDENTIFIER]
+
+Accettare questa autorità?
+		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="Accetta"/>
+	</notification>
 	<notification name="NotEnoughCurrency">
 		[NAME] [PRICE]L$ Non hai abbastanza L$ per farlo.
 	</notification>
@@ -1512,7 +1562,7 @@ Vuoi andare alla Knowledge Base per ulteriori informazioni sulle categorie di ac
 	<notification name="RegionEntryAccessBlocked_Change">
 		Non ti è consentito entrare in quella regione a causa della tua categoria di accesso impostata nelle preferenze.
 
-Puoi cliccare su Cambia preferenze per modificare la categoria di accesso e quindi riuscire ad entrare. Da adesso potrai accedere ai contenuti [REGIONMATURITY] ed effettuare ricerche in questa categoria. Se in seguito tu volessi cambiare di nuovo le tue impostazioni, apri la finestra di dialogo da Io &gt; Preferenze &gt; Generale.
+Clicca su Cambia preferenze per modificare la categoria di accesso e potere entrare subito. Ciò ti consentirà di effettuare ricerche di contenuti di categoria [REGIONMATURITY]. Potrai modificare queste impostazioni in un secondo momento da Io &gt; Preferenze &gt; Generali.
 		<form name="form">
 			<button name="OK" text="Cambia preferenza"/>
 			<button default="true" name="Cancel" text="Chiudi"/>
@@ -2276,15 +2326,6 @@ Riprova tra qualche istante.
 	</notification>
 	<notification name="ObjectGiveItem">
 		Un oggetto denominato [OBJECTFROMNAME] di proprietà di [NAME_SLURL] ti ha dato questo [OBJECTTYPE]:
-[ITEM_SLURL]
-		<form name="form">
-			<button name="Keep" text="Prendi"/>
-			<button name="Discard" text="Rifiuta"/>
-			<button name="Mute" text="Blocca"/>
-		</form>
-	</notification>
-	<notification name="ObjectGiveItemUnknownUser">
-		Un oggetto chiamato [OBJECTFROMNAME] di proprietà di (residente sconosciuto) ti ha dato questo [OBJECTTYPE]:
 [ITEM_SLURL]
 		<form name="form">
 			<button name="Keep" text="Prendi"/>
@@ -2604,8 +2645,52 @@ Il pulsante verrà visualizzato quando lo spazio sarà sufficiente.
 	<notification name="ShareNotification">
 		Trascina articoli dell&apos;inventario su una persona nel selettore residenti
 	</notification>
+	<notification name="DeedToGroupFail">
+		Cessione al gruppo non riuscita.
+	</notification>
 	<notification name="AvatarRezNotification">
-		Avatar &apos;[NAME]&apos; rezzato in [TIME] secondi.
+		( presente da [EXISTENCE] secondi )
+Nuvola avatar &apos;[NAME]&apos; risolta in [TIME] secondi.
+	</notification>
+	<notification name="AvatarRezSelfNotification">
+		( presente da [EXISTENCE] secondi )
+Baking dei vestiti eseguito in [TIME] secondi.
+	</notification>
+	<notification name="AvatarRezCloudNotification">
+		( presente da [EXISTENCE] secondi )
+Avatar &apos;[NAME]&apos; trasformato in nuvola.
+	</notification>
+	<notification name="AvatarRezArrivedNotification">
+		( presente da [EXISTENCE] secondi )
+È comparso l&apos;avatar &apos;[NAME]&apos;.
+	</notification>
+	<notification name="AvatarRezLeftCloudNotification">
+		( presente da [EXISTENCE] secondi )
+Avatar &apos;[NAME]&apos; partito dopo [TIME] secondi sotto forma di nuvola.
+	</notification>
+	<notification name="AvatarRezEnteredAppearanceNotification">
+		( presente da [EXISTENCE] secondi )
+Avatar &apos;[NAME]&apos; è entrato nella modalità aspetto.
+	</notification>
+	<notification name="AvatarRezLeftAppearanceNotification">
+		( presente da [EXISTENCE] secondi )
+Avatar &apos;[NAME]&apos; ha lasciato la modalità aspetto.
+	</notification>
+	<notification name="AvatarRezLeftNotification">
+		( presente da [EXISTENCE] secondi )
+Avatar &apos;[NAME]&apos; è partito completamente caricato.
+	</notification>
+	<notification name="ConfirmLeaveCall">
+		Sei sicuro di volere uscire dalla chiamata?
+		<usetemplate ignoretext="Conferma prima di uscire dalla chiamata" name="okcancelignore" notext="No" yestext="Sì"/>
+	</notification>
+	<notification name="ConfirmMuteAll">
+		Hai scelto di disattivare l&apos;audio di tutti i partecipanti alla chiamata di gruppo.
+In questo modo verrà disattivato l&apos;audio anche di tutti i residenti che si
+uniscono alla chiamata in un secondo momento, anche dopo che tu ti fossi scollegato.
+
+Disattiva audio di tutti?
+		<usetemplate ignoretext="Conferma prima di disattivare l&apos;audio di tutti i partecipanti alla chiamata di gruppo" name="okcancelignore" notext="Ok" yestext="Annulla"/>
 	</notification>
 	<global name="UnsupportedCPU">
 		- La velocità della tua CPU non soddisfa i requisiti minimi.
diff --git a/indra/newview/skins/default/xui/it/panel_bottomtray.xml b/indra/newview/skins/default/xui/it/panel_bottomtray.xml
index c0218fad5e..e4d99cc402 100644
--- a/indra/newview/skins/default/xui/it/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/it/panel_bottomtray.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="bottom_tray">
-	<string name="SpeakBtnToolTip">
-		Accende o spegne il microfono
-	</string>
-	<string name="VoiceControlBtnToolTip">
-		Mostra o nasconde il pannello di regolazione voce
-	</string>
+	<string name="SpeakBtnToolTip" value="Accende o spegne il microfono"/>
+	<string name="VoiceControlBtnToolTip" value="Mostra o nasconde il pannello di regolazione voce"/>
 	<layout_stack name="toolbar_stack">
 		<layout_panel name="speak_panel">
 			<talk_button name="talk">
@@ -24,6 +20,21 @@
 		<layout_panel name="snapshot_panel">
 			<button label="" name="snapshots" tool_tip="Scatta una foto"/>
 		</layout_panel>
+		<layout_panel name="sidebar_btn_panel">
+			<button label="Barra laterale" name="sidebar_btn" tool_tip="Mostra o nasconde la barra laterale"/>
+		</layout_panel>
+		<layout_panel name="build_btn_panel">
+			<button label="Costruisci" name="build_btn" tool_tip="Mostra o nasconde gli strumenti di costruzione"/>
+		</layout_panel>
+		<layout_panel name="search_btn_panel">
+			<button label="Cerca" name="search_btn" tool_tip="Mostra o nasconde la ricerca"/>
+		</layout_panel>
+		<layout_panel name="world_map_btn_panel">
+			<button label="Mappa" name="world_map_btn" tool_tip="Mostra o nasconde la mappa del mondo"/>
+		</layout_panel>
+		<layout_panel name="mini_map_btn_panel">
+			<button label="Mini mappa" name="mini_map_btn" tool_tip="Mostra o nasconde la mini mappa"/>
+		</layout_panel>
 		<layout_panel name="im_well_panel">
 			<chiclet_im_well name="im_well">
 				<button name="Unread IM messages" tool_tip="Conversazioni"/>
diff --git a/indra/newview/skins/default/xui/it/panel_edit_shape.xml b/indra/newview/skins/default/xui/it/panel_edit_shape.xml
index 7e1ba43756..ab77548f26 100644
--- a/indra/newview/skins/default/xui/it/panel_edit_shape.xml
+++ b/indra/newview/skins/default/xui/it/panel_edit_shape.xml
@@ -1,14 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_shape_panel">
-	<panel name="avatar_sex_panel">
-		<text name="gender_text">
-			Sesso:
-		</text>
-		<radio_group name="sex_radio">
-			<radio_item label="Femmina" name="radio"/>
-			<radio_item label="Maschio" name="radio2"/>
-		</radio_group>
-	</panel>
+	<text name="avatar_height">
+		Statura: [HEIGHT] metri
+	</text>
 	<panel label="Camicia" name="accordion_panel">
 		<accordion name="wearable_accordion">
 			<accordion_tab name="shape_body_tab" title="Corpo"/>
diff --git a/indra/newview/skins/default/xui/it/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/it/panel_edit_tattoo.xml
index d8cfa15b25..d76fb62c53 100644
--- a/indra/newview/skins/default/xui/it/panel_edit_tattoo.xml
+++ b/indra/newview/skins/default/xui/it/panel_edit_tattoo.xml
@@ -4,5 +4,6 @@
 		<texture_picker label="Tatuaggio della testa" name="Head Tattoo" tool_tip="Clicca per scegliere una fotografia"/>
 		<texture_picker label="Tatuaggio superiore" name="Upper Tattoo" tool_tip="Clicca per scegliere una fotografia"/>
 		<texture_picker label="Tattuaggio inferiore" name="Lower Tattoo" tool_tip="Clicca per scegliere una fotografia"/>
+		<color_swatch label="Colore/Tinta" name="Color/Tint" tool_tip="Clicca per aprire il selettore dei colori"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_edit_wearable.xml b/indra/newview/skins/default/xui/it/panel_edit_wearable.xml
index 1135a582f5..3d8aa858db 100644
--- a/indra/newview/skins/default/xui/it/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/it/panel_edit_wearable.xml
@@ -93,6 +93,12 @@
 	<text name="edit_wearable_title" value="Modifica della figura corporea"/>
 	<panel label="Camicia" name="wearable_type_panel">
 		<text name="description_text" value="Figura corporea:"/>
+		<radio_group name="sex_radio">
+			<radio_item label="" name="sex_male" tool_tip="Maschio" value="1"/>
+			<radio_item label="" name="sex_female" tool_tip="Femmina" value="0"/>
+		</radio_group>
+		<icon name="male_icon" tool_tip="Maschio"/>
+		<icon name="female_icon" tool_tip="Femmina"/>
 	</panel>
 	<panel label="gear_buttom_panel" name="gear_buttom_panel">
 		<button name="friends_viewsort_btn" tool_tip="Opzioni"/>
diff --git a/indra/newview/skins/default/xui/it/panel_group_land_money.xml b/indra/newview/skins/default/xui/it/panel_group_land_money.xml
index 1e3ef5e657..16cc91cd9d 100644
--- a/indra/newview/skins/default/xui/it/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/it/panel_group_land_money.xml
@@ -6,6 +6,9 @@
 	<panel.string name="cant_view_group_land_text">
 		Non sei autorizzato a vedere quali terreni appartengono al gruppo.
 	</panel.string>
+	<panel.string name="epmty_view_group_land_text">
+		Nessuna voce
+	</panel.string>
 	<panel.string name="cant_view_group_accounting_text">
 		Non sei autorizzato a visionare le informazioni finanziarie del gruppo.
 	</panel.string>
diff --git a/indra/newview/skins/default/xui/it/panel_group_notices.xml b/indra/newview/skins/default/xui/it/panel_group_notices.xml
index 9dac282de9..8dd945830e 100644
--- a/indra/newview/skins/default/xui/it/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/it/panel_group_notices.xml
@@ -40,6 +40,7 @@ Massimo 200 per gruppo al giorno
 		<text name="string">
 			Trascina e rilascia qui l&apos;oggetto da allegare:
 		</text>
+		<button label="Inventario" name="open_inventory" tool_tip="Apri l&apos;inventario"/>
 		<button label="Rimuovi" label_selected="Rimuovi allegato" name="remove_attachment" tool_tip="Rimuovi allegato dal tuo avviso"/>
 		<button label="Invia" label_selected="Invia" name="send_notice"/>
 		<group_drop_target name="drop_target" tool_tip="Trascina un oggetto dall&apos;inventario ín questa casella per spedirlo con questo avviso. Devi avere i diritti per la copia e il trasferimento per poter allegare l&apos;oggetto."/>
diff --git a/indra/newview/skins/default/xui/it/panel_login.xml b/indra/newview/skins/default/xui/it/panel_login.xml
index 287e938d57..473bcfa88d 100644
--- a/indra/newview/skins/default/xui/it/panel_login.xml
+++ b/indra/newview/skins/default/xui/it/panel_login.xml
@@ -8,18 +8,15 @@
 	</panel.string>
 	<layout_stack name="login_widgets">
 		<layout_panel name="login">
-			<text name="first_name_text">
-				Nome:
+			<text name="username_text">
+				Nome utente:
 			</text>
-			<line_editor label="Nome" name="first_name_edit" tool_tip="[SECOND_LIFE] First Name"/>
-			<text name="last_name_text">
-				Cognome:
-			</text>
-			<line_editor label="Cognome" name="last_name_edit" tool_tip="[SECOND_LIFE] Last Name"/>
+			<line_editor label="Nome utente" name="username_edit" tool_tip="Nome utente [SECOND_LIFE]"/>
 			<text name="password_text">
 				Password:
 			</text>
 			<check_box label="Ricorda password" name="remember_check"/>
+			<button label="Accedi" name="connect_btn"/>
 			<text name="start_location_text">
 				Inizia da:
 			</text>
@@ -28,7 +25,6 @@
 				<combo_box.item label="Casa mia" name="MyHome"/>
 				<combo_box.item label="&lt;Scrivi nome regione&gt;" name="Typeregionname"/>
 			</combo_box>
-			<button label="Accedi" name="connect_btn"/>
 		</layout_panel>
 		<layout_panel name="links">
 			<text name="create_new_account_text">
diff --git a/indra/newview/skins/default/xui/it/panel_main_inventory.xml b/indra/newview/skins/default/xui/it/panel_main_inventory.xml
index 878daf1e6b..446b51ffa3 100644
--- a/indra/newview/skins/default/xui/it/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/it/panel_main_inventory.xml
@@ -9,62 +9,20 @@
 	<text name="ItemcountText">
 		Oggetti:
 	</text>
-	<menu_bar name="Inventory Menu">
-		<menu label="File" name="File">
-			<menu_item_call label="Apri" name="Open"/>
-			<menu label="Carica nel server" name="upload">
-				<menu_item_call label="Immagine ([COST]L$)..." name="Upload Image"/>
-				<menu_item_call label="Suono ([COST]L$)..." name="Upload Sound"/>
-				<menu_item_call label="Animazione ([COST]L$)..." name="Upload Animation"/>
-				<menu_item_call label="In blocco ([COST]L$ per file)..." name="Bulk Upload"/>
-			</menu>
-			<menu_item_call label="Nuova finestra" name="New Window"/>
-			<menu_item_call label="Mostra filtri" name="Show Filters"/>
-			<menu_item_call label="Ripristina filtri" name="Reset Current"/>
-			<menu_item_call label="Chiudi tutte le cartelle" name="Close All Folders"/>
-			<menu_item_call label="Svuota cestino" name="Empty Trash"/>
-			<menu_item_call label="Svuota oggetti smarriti" name="Empty Lost And Found"/>
-		</menu>
-		<menu label="Crea" name="Create">
-			<menu_item_call label="Nuova cartella" name="New Folder"/>
-			<menu_item_call label="Nuovo script" name="New Script"/>
-			<menu_item_call label="Nuovo biglietto" name="New Note"/>
-			<menu_item_call label="Nuova gesture" name="New Gesture"/>
-			<menu label="Maglietta intima" name="New Clothes">
-				<menu_item_call label="Nuova camicia" name="New Shirt"/>
-				<menu_item_call label="Nuovi pantaloni" name="New Pants"/>
-				<menu_item_call label="Nuove scarpe" name="New Shoes"/>
-				<menu_item_call label="Nuove calze" name="New Socks"/>
-				<menu_item_call label="Nuova giacca" name="New Jacket"/>
-				<menu_item_call label="Nuova gonna" name="New Skirt"/>
-				<menu_item_call label="Nuovi guanti" name="New Gloves"/>
-				<menu_item_call label="Nuova maglietta intima" name="New Undershirt"/>
-				<menu_item_call label="Nuovi slip" name="New Underpants"/>
-				<menu_item_call label="Nuovo Alfa (trasparenza)" name="New Alpha"/>
-				<menu_item_call label="Nuovo tatuaggio" name="New Tattoo"/>
-			</menu>
-			<menu label="Nuove parti del corpo" name="New Body Parts">
-				<menu_item_call label="Nuova figura corporea" name="New Shape"/>
-				<menu_item_call label="Nuova pelle" name="New Skin"/>
-				<menu_item_call label="Nuovi capelli" name="New Hair"/>
-				<menu_item_call label="Nuovi occhi" name="New Eyes"/>
-			</menu>
-		</menu>
-		<menu label="Ordina" name="Sort">
-			<menu_item_check label="In base al nome" name="By Name"/>
-			<menu_item_check label="In base alla data" name="By Date"/>
-			<menu_item_check label="Cartelle sempre in base al nome" name="Folders Always By Name"/>
-			<menu_item_check label="Cartelle di sistema all&apos;inizio" name="System Folders To Top"/>
-		</menu>
-	</menu_bar>
 	<filter_editor label="Filtro" name="inventory search editor"/>
 	<tab_container name="inventory filter tabs">
 		<inventory_panel label="Tutti gli elementi" name="All Items"/>
-		<inventory_panel label="Elementi recenti" name="Recent Items"/>
+		<recent_inventory_panel label="Elementi recenti" name="Recent Items"/>
 	</tab_container>
-	<panel name="bottom_panel">
-		<button name="options_gear_btn" tool_tip="Mostra opzioni addizionali"/>
-		<button name="add_btn" tool_tip="Aggiungi nuovo elemento"/>
-		<dnd_button name="trash_btn" tool_tip="Rimuovi l&apos;articolo selezionato"/>
-	</panel>
+	<layout_stack name="bottom_panel">
+		<layout_panel name="options_gear_btn_panel">
+			<button name="options_gear_btn" tool_tip="Mostra opzioni addizionali"/>
+		</layout_panel>
+		<layout_panel name="add_btn_panel">
+			<button name="add_btn" tool_tip="Aggiungi nuovo elemento"/>
+		</layout_panel>
+		<layout_panel name="trash_btn_panel">
+			<dnd_button name="trash_btn" tool_tip="Rimuovi l&apos;articolo selezionato"/>
+		</layout_panel>
+	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_outfit_edit.xml b/indra/newview/skins/default/xui/it/panel_outfit_edit.xml
index 516181e0e9..bd2202b60e 100644
--- a/indra/newview/skins/default/xui/it/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/it/panel_outfit_edit.xml
@@ -2,6 +2,8 @@
 <!-- Side tray Outfit Edit panel -->
 <panel label="Modifica del vestiario" name="outfit_edit">
 	<string name="No Outfit" value="Nessun vestiario"/>
+	<string name="unsaved_changes" value="Modifiche non salvate"/>
+	<string name="now_editing" value="Modifica di"/>
 	<panel.string name="not_available">
 		(non pert.)
 	</panel.string>
@@ -15,24 +17,19 @@
 	<text name="title" value="Modifica vestiario"/>
 	<panel label="bottom_panel" name="header_panel">
 		<panel label="bottom_panel" name="outfit_name_and_status">
-			<text name="status" value="Modifica..."/>
+			<text name="status" value="Modifica di..."/>
 			<text name="curr_outfit_name" value="[Current Outfit]"/>
 		</panel>
 	</panel>
 	<layout_stack name="im_panels">
 		<layout_panel label="Pannello di controllo IM" name="outfit_wearables_panel">
-			<scroll_list name="look_items_list">
-				<scroll_list.columns label="Articolo look" name="look_item"/>
-				<scroll_list.columns label="Ordina in base agli articoli del vestiario" name="look_item_sort"/>
-			</scroll_list>
 			<panel label="bottom_panel" name="edit_panel"/>
 		</layout_panel>
 		<layout_panel name="add_wearables_panel">
-			<filter_editor label="Filtro" name="look_item_filter"/>
+			<text name="add_to_outfit_label" value="Aggiungi al vestiario:"/>
 			<layout_stack name="filter_panels">
-				<layout_panel label="Pannello di controllo IM" name="filter_button_panel">
-					<text name="add_to_outfit_label" value="Aggiungi al vestiario:"/>
-					<button label="V" name="filter_button"/>
+				<layout_panel label="Pannello di controllo IM" name="filter_panel">
+					<filter_editor label="Filtro" name="look_item_filter"/>
 				</layout_panel>
 			</layout_stack>
 			<panel label="add_wearables_button_bar" name="add_wearables_button_bar">
diff --git a/indra/newview/skins/default/xui/it/panel_people.xml b/indra/newview/skins/default/xui/it/panel_people.xml
index c469da014a..056e424436 100644
--- a/indra/newview/skins/default/xui/it/panel_people.xml
+++ b/indra/newview/skins/default/xui/it/panel_people.xml
@@ -2,9 +2,9 @@
 <!-- Side tray panel -->
 <panel label="Persone" name="people_panel">
 	<string name="no_recent_people" value="Nessuna persona recente. Stai cercando persone da frequentare? Prova la [secondlife:///app/search/people Ricerca] o la [secondlife:///app/worldmap Mappa del mondo]."/>
-	<string name="no_filtered_recent_people" value="Non riesci a trovare quello che cerchi? Prova [secondlife:///app/search/people Cerca]."/>
+	<string name="no_filtered_recent_people" value="Non riesci a trovare quello che cerchi? Prova [secondlife:///app/search/people/[SEARCH_TERM] Cerca]."/>
 	<string name="no_one_near" value="Nessuno vicino. Stai cercando persone da frequentare? Try la [secondlife:///app/search/people Ricerca] o la [secondlife:///app/worldmap Mappa del mondo]."/>
-	<string name="no_one_filtered_near" value="Non riesci a trovare quello che cerchi? Prova [secondlife:///app/search/people Cerca]."/>
+	<string name="no_one_filtered_near" value="Non riesci a trovare quello che cerchi? Prova [secondlife:///app/search/people/[SEARCH_TERM] Cerca]."/>
 	<string name="no_friends_online" value="Nessun amico online"/>
 	<string name="no_friends" value="Nessun amico"/>
 	<string name="no_friends_msg">
@@ -12,11 +12,11 @@
 Stai cercando persone da frequentare? Prova la [secondlife:///app/worldmap Mappa del mondo].
 	</string>
 	<string name="no_filtered_friends_msg">
-		Non riesci a trovare quello che cerchi? Prova [secondlife:///app/search/people Cerca].
+		Non riesci a trovare quello che cerchi? Prova [secondlife:///app/search/people/[SEARCH_TERM] Cerca].
 	</string>
 	<string name="people_filter_label" value="Filtro persone"/>
 	<string name="groups_filter_label" value="Filtro gruppi"/>
-	<string name="no_filtered_groups_msg" value="Non riesci a trovare quello che cerchi? Prova [secondlife:///app/search/groups Cerca]."/>
+	<string name="no_filtered_groups_msg" value="Non riesci a trovare quello che cerchi? Prova [secondlife:///app/search/groups/[SEARCH_TERM] Cerca]."/>
 	<string name="no_groups_msg" value="Stai cercando gruppi di cui far parte? Prova [secondlife:///app/search/groups Cerca]."/>
 	<filter_editor label="Filtro" name="filter_input"/>
 	<tab_container name="tabs">
@@ -55,7 +55,7 @@ Stai cercando persone da frequentare? Prova la [secondlife:///app/worldmap Mappa
 		<button label="Profilo" name="view_profile_btn" tool_tip="Mostra immagine, gruppi e altre informazioni del residente"/>
 		<button label="IM" name="im_btn" tool_tip="Apri una sessione messaggio istantaneo"/>
 		<button label="Chiama" name="call_btn" tool_tip="Chiama questo residente"/>
-		<button label="Condividi" name="share_btn"/>
+		<button label="Condividi" name="share_btn" tool_tip="Condividi un oggetto dell&apos;inventario"/>
 		<button label="Teleport" name="teleport_btn" tool_tip="Offri teleport"/>
 		<button label="Profilo del gruppo" name="group_info_btn" tool_tip="Mostra informazioni gruppo"/>
 		<button label="Chat di gruppo" name="chat_btn" tool_tip="Apri sessione chat"/>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml
index 09e19f4bc0..7c3f32ad7b 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml
@@ -13,6 +13,7 @@
 	</text>
 	<check_box label="Costruire/Modificare" name="edit_camera_movement" tool_tip="Utilizza il posizionamento automatico della fotocamera entrando o uscendo dalla modalità modifica"/>
 	<check_box label="Aspetto fisico" name="appearance_camera_movement" tool_tip="Utilizza il posizionamento automatico della camera in modalità modifica"/>
+	<check_box initial_value="1" label="Barra laterale" name="appearance_sidebar_positioning" tool_tip="Utilizza il posizionamento automatico della fotocamera per la barra laterale"/>
 	<check_box label="Visualizzami in modalità soggettiva" name="first_person_avatar_visible"/>
 	<check_box label="Le frecce di direzione mi fanno sempre spostare" name="arrow_keys_move_avatar_check"/>
 	<check_box label="Doppio click e tieni premuto per correre" name="tap_tap_hold_to_run"/>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
index 28df9d2e43..fb8ddf607d 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
@@ -45,6 +45,7 @@
 	</text>
 	<check_box initial_value="true" label="Simula la battitura tasti quando scrivi" name="play_typing_animation"/>
 	<check_box label="Quando sono OFF-LINE, spediscimi gli IM in una e-mail" name="send_im_to_email"/>
+	<check_box label="Attiva IM in testo semplice e cronologia chat" name="plain_text_chat_history"/>
 	<text name="show_ims_in_label">
 		Mostra gli IM in:
 	</text>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml
index 5bd0cfb106..37857473aa 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Grafica" name="Display panel">
-	<text name="UI Size:">
-		Dimensioni UI:
-	</text>
 	<text name="QualitySpeed">
 		Qualità e velocità:
 	</text>
@@ -52,6 +49,10 @@
 			m
 		</text>
 		<slider label="Conteggio massimo particelle:" name="MaxParticleCount"/>
+		<slider label="Distanza visual. max avatar:" name="MaxAvatarDrawDistance"/>
+		<text name="DrawDistanceMeterText3">
+			m
+		</text>
 		<slider label="Qualità in post-produzione:" name="RenderPostProcess"/>
 		<text name="MeshDetailText">
 			Dettagli reticolo:
diff --git a/indra/newview/skins/default/xui/it/sidepanel_appearance.xml b/indra/newview/skins/default/xui/it/sidepanel_appearance.xml
index c2e99b5573..df25772ffb 100644
--- a/indra/newview/skins/default/xui/it/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/it/sidepanel_appearance.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Vestiario" name="appearance panel">
 	<string name="No Outfit" value="Nessun vestiario"/>
+	<string name="Unsaved Changes" value="Modifiche non salvate"/>
+	<string name="Now Wearing" value="Abbigliamento attuale..."/>
 	<panel name="panel_currentlook">
-		<text name="currentlook_title">
-			(non salvato)
+		<button label="M" name="editappearance_btn"/>
+		<button label="A" name="openoutfit_btn"/>
+		<text name="currentlook_status">
+			(Stato)
 		</text>
 	</panel>
 	<filter_editor label="Filtri per il vestiario" name="Filter"/>
diff --git a/indra/newview/skins/default/xui/it/sidepanel_inventory.xml b/indra/newview/skins/default/xui/it/sidepanel_inventory.xml
index 8a391c882c..0d862a0ff7 100644
--- a/indra/newview/skins/default/xui/it/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/it/sidepanel_inventory.xml
@@ -4,6 +4,7 @@
 		<panel name="button_panel">
 			<button label="Profilo" name="info_btn"/>
 			<button label="Condividi" name="share_btn"/>
+			<button label="Acquisti" name="shop_btn"/>
 			<button label="Indossa" name="wear_btn"/>
 			<button label="Riproduci" name="play_btn"/>
 			<button label="Teleport" name="teleport_btn"/>
diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml
index 9a6c648c8e..67cd4c35b2 100644
--- a/indra/newview/skins/default/xui/it/strings.xml
+++ b/indra/newview/skins/default/xui/it/strings.xml
@@ -94,6 +94,24 @@
 	<string name="LoginDownloadingClothing">
 		Sto caricando i vestiti...
 	</string>
+	<string name="InvalidCertificate">
+		Il server ha inviato un certificato non valido o errato. Rivolgiti all&apos;amministratore della griglia.
+	</string>
+	<string name="CertInvalidHostname">
+		Per accedere al server è stato utilizzato un nome host non valido; controlla lo SLURL o il nome host della griglia.
+	</string>
+	<string name="CertExpired">
+		Il certificato inviato dalla griglia sembra essere scaduto.  Controlla l&apos;orologio del sistema o rivolgiti all&apos;amministratore della griglia.
+	</string>
+	<string name="CertKeyUsage">
+		Impossibile utilizzare per SSl il certificato inviato dal server.  Rivolgiti all&apos;amministratore della griglia.
+	</string>
+	<string name="CertBasicConstraints">
+		Nella catena dei certificati del server erano presenti troppi certificati.  Rivolgiti all&apos;amministratore della griglia.
+	</string>
+	<string name="CertInvalidSignature">
+		Impossibile verificare la firma del certificato inviato dal server della griglia.  Rivolgiti all&apos;amministratore della griglia.
+	</string>
 	<string name="LoginFailedNoNetwork">
 		Errore di rete: Non è stato possibile stabilire un collegamento, controlla la tua connessione.
 	</string>
@@ -825,6 +843,42 @@
 	<string name="invalid">
 		non valido
 	</string>
+	<string name="shirt_not_worn">
+		Camicia non indossata
+	</string>
+	<string name="pants_not_worn">
+		Pantaloni non indossati
+	</string>
+	<string name="shoes_not_worn">
+		Scarpe non indossate
+	</string>
+	<string name="socks_not_worn">
+		Calzini non indossati
+	</string>
+	<string name="jacket_not_worn">
+		Giacca non indossata
+	</string>
+	<string name="gloves_not_worn">
+		Guanti non indossati
+	</string>
+	<string name="undershirt_not_worn">
+		Maglietta intima non indossata
+	</string>
+	<string name="underpants_not_worn">
+		Slip non indossati
+	</string>
+	<string name="skirt_not_worn">
+		Gonna non indossata
+	</string>
+	<string name="alpha_not_worn">
+		Alpha non portato
+	</string>
+	<string name="tattoo_not_worn">
+		Tatuaggio non portato
+	</string>
+	<string name="invalid_not_worn">
+		non valido
+	</string>
 	<string name="NewWearable">
 		Nuovo [WEARABLE_ITEM]
 	</string>
@@ -895,7 +949,10 @@
 		Premi ESC per tornare in visualizzazione normale
 	</string>
 	<string name="InventoryNoMatchingItems">
-		Non riesci a trovare quello che cerchi? Prova [secondlife:///app/search/all Cerca].
+		Non riesci a trovare quello che cerchi? Prova [secondlife:///app/search/all/[SEARCH_TERM] Cerca].
+	</string>
+	<string name="PlacesNoMatchingItems">
+		Non riesci a trovare quello che cerchi? Prova [secondlife:///app/search/places/[SEARCH_TERM] Cerca].
 	</string>
 	<string name="FavoritesNoMatchingItems">
 		Trascina qui un punto di riferimento per aggiungerlo ai Preferiti.
@@ -925,6 +982,7 @@
 	<string name="Wave" value="Saluta con la mano"/>
 	<string name="HelloAvatar" value="Ciao, avatar!"/>
 	<string name="ViewAllGestures" value="Visualizza tutto &gt;&gt;"/>
+	<string name="GetMoreGestures" value="Altre &gt;&gt;"/>
 	<string name="Animations" value="Animazioni,"/>
 	<string name="Calling Cards" value="Biglietti da visita,"/>
 	<string name="Clothing" value="Vestiti,"/>
@@ -1537,16 +1595,19 @@
 		Il residente al quale hai inviato un messaggio è in modalità &apos;occupato&apos;, ovvero ha chiesto di non essere disturbato.  Il tuo messaggio comparirà nel suo pannello IM, dove potrà essere letto in un secondo momento.
 	</string>
 	<string name="MuteByName">
-		(in base al nome)
+		(In base al nome)
 	</string>
 	<string name="MuteAgent">
 		(Residente)
 	</string>
 	<string name="MuteObject">
-		(oggetto)
+		(Oggetto)
 	</string>
 	<string name="MuteGroup">
-		(gruppo)
+		(Gruppo)
+	</string>
+	<string name="MuteExternal">
+		(esterno)
 	</string>
 	<string name="RegionNoCovenant">
 		Non esiste alcun regolamento per questa proprietà.
@@ -3306,11 +3367,14 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
 	<string name="answered_call">
 		Risposto alla chiamata
 	</string>
-	<string name="started_call">
-		Chiamata vocale iniziata
+	<string name="you_started_call">
+		Hai iniziato una chiamata vocale
+	</string>
+	<string name="you_joined_call">
+		Ti sei collegato alla chiamata in voce
 	</string>
-	<string name="joined_call">
-		Si è collegato alla chiamata in voce
+	<string name="name_started_call">
+		[NAME] ha iniziato una chiamata vocale
 	</string>
 	<string name="ringing-im">
 		Collegamento alla chiamata vocale...
@@ -3509,6 +3573,90 @@ Segnala abuso
 	<string name="Contents">
 		Contenuto
 	</string>
+	<string name="Gesture">
+		Gesture
+	</string>
+	<string name="Male Gestures">
+		Gesture maschili
+	</string>
+	<string name="Female Gestures">
+		Gesture femminili
+	</string>
+	<string name="Other Gestures">
+		Altre gesture
+	</string>
+	<string name="Speech Gestures">
+		Gesture del parlato
+	</string>
+	<string name="Common Gestures">
+		Gesture comuni
+	</string>
+	<string name="Male - Excuse me">
+		Maschio - Chiedere scusa
+	</string>
+	<string name="Male - Get lost">
+		Maschio - Levati dai piedi!
+	</string>
+	<string name="Male - Blow kiss">
+		Maschio - Butta un bacio
+	</string>
+	<string name="Male - Boo">
+		Maschio - Bu
+	</string>
+	<string name="Male - Bored">
+		Maschio - Annoiato
+	</string>
+	<string name="Male - Hey">
+		Maschio - Ehi
+	</string>
+	<string name="Male - Laugh">
+		Maschio - Ridere
+	</string>
+	<string name="Male - Repulsed">
+		Maschio - Disgustato
+	</string>
+	<string name="Male - Shrug">
+		Maschio - Spallucce
+	</string>
+	<string name="Male - Stick tougue out">
+		Maschio - Tira fuori la lingua
+	</string>
+	<string name="Male - Wow">
+		Maschio - Accipicchia
+	</string>
+	<string name="FeMale - Excuse me">
+		Femmina - Chiedere scusa
+	</string>
+	<string name="FeMale - Get lost">
+		Femmina - Levati dai piedi!
+	</string>
+	<string name="FeMale - Blow kiss">
+		Femmina - Butta un bacio
+	</string>
+	<string name="FeMale - Boo">
+		Femmina - Bu
+	</string>
+	<string name="Female - Bored">
+		Femmina - Annoiata
+	</string>
+	<string name="Female - Hey">
+		Femmina - Ehi
+	</string>
+	<string name="Female - Laugh">
+		Femmina - Ridere
+	</string>
+	<string name="Female - Repulsed">
+		Femmina - Disgustata
+	</string>
+	<string name="Female - Shrug">
+		Femmina - Spallucce
+	</string>
+	<string name="Female - Stick tougue out">
+		Femmina - Tira fuori la lingua
+	</string>
+	<string name="Female - Wow">
+		Femmina - Accipicchia
+	</string>
 	<string name="AvatarBirthDateFormat">
 		[day,datetime,slt]/[mthnum,datetime,slt]/[year,datetime,slt]
 	</string>
-- 
cgit v1.2.3


From 5bf8c727c73c98310496be63e9c67a8124e80afe Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Fri, 11 Jun 2010 17:50:11 -0700
Subject: ND-47147 WIP IT translation for set11 new files

---
 indra/newview/skins/default/xui/it/floater_buy_currency_html.xml  | 2 ++
 indra/newview/skins/default/xui/it/panel_body_parts_list_item.xml | 4 ++++
 .../skins/default/xui/it/panel_bodyparts_list_button_bar.xml      | 5 +++++
 .../skins/default/xui/it/panel_clothing_list_button_bar.xml       | 5 +++++
 indra/newview/skins/default/xui/it/panel_clothing_list_item.xml   | 4 ++++
 indra/newview/skins/default/xui/it/panel_cof_wearables.xml        | 8 ++++++++
 .../skins/default/xui/it/panel_deletable_wearable_list_item.xml   | 4 ++++
 .../skins/default/xui/it/panel_dummy_clothing_list_item.xml       | 4 ++++
 8 files changed, 36 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/it/floater_buy_currency_html.xml
 create mode 100644 indra/newview/skins/default/xui/it/panel_body_parts_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/it/panel_bodyparts_list_button_bar.xml
 create mode 100644 indra/newview/skins/default/xui/it/panel_clothing_list_button_bar.xml
 create mode 100644 indra/newview/skins/default/xui/it/panel_clothing_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/it/panel_cof_wearables.xml
 create mode 100644 indra/newview/skins/default/xui/it/panel_deletable_wearable_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/it/panel_dummy_clothing_list_item.xml

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/it/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/it/floater_buy_currency_html.xml
new file mode 100644
index 0000000000..4a1bf33403
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_buy_currency_html.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_buy_currency_html" title="ACQUISTA VALUTA"/>
diff --git a/indra/newview/skins/default/xui/it/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/it/panel_body_parts_list_item.xml
new file mode 100644
index 0000000000..de764d8025
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_body_parts_list_item.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="wearable_item">
+	<text name="item_name" value="..."/>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/it/panel_bodyparts_list_button_bar.xml
new file mode 100644
index 0000000000..8fc23d34f1
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_bodyparts_list_button_bar.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="clothing_list_button_bar_panel">
+	<button label="Cambia" name="switch_btn"/>
+	<button label="Acquista &gt;" name="bodyparts_shop_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/it/panel_clothing_list_button_bar.xml
new file mode 100644
index 0000000000..e9d9795b3a
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_clothing_list_button_bar.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="clothing_list_button_bar_panel">
+	<button label="Aggiungi +" name="add_btn"/>
+	<button label="Acquista &gt;" name="clothing_shop_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/it/panel_clothing_list_item.xml
new file mode 100644
index 0000000000..de764d8025
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_clothing_list_item.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="wearable_item">
+	<text name="item_name" value="..."/>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_cof_wearables.xml b/indra/newview/skins/default/xui/it/panel_cof_wearables.xml
new file mode 100644
index 0000000000..d914a5740f
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_cof_wearables.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="cof_wearables">
+	<accordion name="cof_wearables_accordion">
+		<accordion_tab name="tab_attachments" title="Allegati"/>
+		<accordion_tab name="tab_clothing" title="Vestiario"/>
+		<accordion_tab name="tab_body_parts" title="Parti del corpo"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/it/panel_deletable_wearable_list_item.xml
new file mode 100644
index 0000000000..91d90a5660
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_deletable_wearable_list_item.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="deletable_wearable_item">
+	<text name="item_name" value="..."/>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/it/panel_dummy_clothing_list_item.xml
new file mode 100644
index 0000000000..6af84de0c7
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_dummy_clothing_list_item.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="dummy_clothing_item">
+	<text name="item_name" value="..."/>
+</panel>
-- 
cgit v1.2.3


From fe13abe0a65cc04cecf3f41b9f340d7f7717d71f Mon Sep 17 00:00:00 2001
From: Vladimir Pchelko <pchelko@productengine.com>
Date: Mon, 14 Jun 2010 14:06:20 +0300
Subject: EXT-7806 FIXED Tooltips were added (according to bug description)

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/572/

--HG--
branch : product-engine
---
 .../default/xui/en/panel_body_parts_list_item.xml  |  6 ++++--
 .../default/xui/en/panel_clothing_list_item.xml    |  9 +++++---
 .../xui/en/panel_deletable_wearable_list_item.xml  |  3 ++-
 .../xui/en/panel_dummy_clothing_list_item.xml      |  3 ++-
 .../skins/default/xui/en/panel_outfit_edit.xml     |  2 ++
 .../default/xui/en/panel_outfits_inventory.xml     | 24 +++++++++++-----------
 .../skins/default/xui/en/sidepanel_appearance.xml  |  1 +
 7 files changed, 29 insertions(+), 19 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml
index 4e5f594ffe..4f989a6f6f 100644
--- a/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml
@@ -57,7 +57,8 @@
      left="0"
      height="23"
      width="23"
-     tab_stop="false">
+     tab_stop="false"
+     tool_tip="You don't have permission to edit">
         <icon 
          name="btn_lock1"
          layout="topleft"
@@ -88,7 +89,8 @@
           left="0"
           height="23"
           width="23"
-          tab_stop="false" />
+          tab_stop="false"
+          tool_tip="Edit this shape"/>
       </panel>
     <icon
      follows="left|right|top"
diff --git a/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml
index 5d81aebbd5..93d7720c57 100644
--- a/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml
@@ -37,7 +37,8 @@
      left="0"
      height="18"
      width="18"
-     tab_stop="false" />
+     tab_stop="false"
+     tool_tip="Remove from outfit" />
     <icon
      height="16"
      follows="top|left"
@@ -88,7 +89,8 @@
      left="0"
      height="23"
      width="23"
-     tab_stop="false">
+     tab_stop="false"
+     tool_tip="You don't have permission to edit">
         <icon 
          name="btn_lock1"
          layout="topleft"
@@ -119,7 +121,8 @@
          left="0"
          height="23"
          width="23"
-         tab_stop="false" />
+         tab_stop="false"
+         tool_tip="Edit this wearable"/>
       </panel>
     <icon
      follows="left|right|top"
diff --git a/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml
index 45031859f1..75b5fd1532 100644
--- a/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml
@@ -37,7 +37,8 @@
      left="0"
      height="18"
      width="18"
-     tab_stop="false" />
+     tab_stop="false"
+     tool_tip="Remove from outfit"/>
     <icon
      height="16"
      follows="top|left"
diff --git a/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml
index b1f4cbb079..a5dd34bd22 100644
--- a/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml
@@ -67,7 +67,8 @@
        left="0"
        height="23"
        width="23"
-       tab_stop="false" />
+       tab_stop="false"
+       tool_tip="Add more items of this type" />
     </panel>
     <icon
      follows="left|right|top"
diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index decdeca00d..df9dfc6ac3 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -211,6 +211,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap
                      left="2"
                      name="show_add_wearables_btn"
                      top_pad="2"
+                     tool_tip="Open/Close"
                      width="125" />
 
                     <combo_box
@@ -483,6 +484,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap
          layout="topleft"
          name="revert_btn"
          top="0"
+         tool_tip="Revert to last saved version"
          width="147" />
     </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
index de1f2cf31b..37eb5eaa98 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
@@ -83,18 +83,18 @@
       width="241"
         />
 
-        <dnd_button
-         follows="bottom|right"
-         height="25"
-         image_hover_unselected="Toolbar_Right_Over"
-          image_overlay="TrashItem_Off"
-          image_selected="Toolbar_Right_Selected"
-          image_unselected="Toolbar_Right_Off"
-         layout="topleft"
-         left_pad="1"
-         name="trash_btn"
-         tool_tip="Remove selected item"
-         width="31"/>         
+     <dnd_button
+      follows="bottom|right"
+      height="25"
+      image_hover_unselected="Toolbar_Right_Over"
+      image_overlay="TrashItem_Off"
+      image_selected="Toolbar_Right_Selected"
+      image_unselected="Toolbar_Right_Off"
+      layout="topleft"
+      left_pad="1"
+      name="trash_btn"
+      tool_tip="Delete selected outfit"
+      width="31"/>
      <button
        follows="bottom|left"
        height="23"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
index 227c470d14..e189d11d35 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@@ -92,6 +92,7 @@ width="333">
       layout="topleft"
       left="265"
       name="edit_outfit_btn"
+      tool_tip="Edit this outfit"
       top="7"
       width="30" />
       <loading_indicator
-- 
cgit v1.2.3


From e96544ff266849207adfc3823adfc2dcfe42ce72 Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Mon, 14 Jun 2010 15:04:06 +0300
Subject: EXT-7742 FIXED panel outfit edit: added a separate dropdown for the
 list view

- added a separate filter combobox for the list view containing lots of items, all types of wearables, separated clothing and bodyparts items
- comboboxes are linked to the appropriate view, only one is shown
- got rid of excluding links in the folder view
- minor refactoring

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/573/

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_outfit_edit.xml       | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index df9dfc6ac3..ed3b176267 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -51,7 +51,8 @@
     <string name="Filter.All" value="All"/>
     <string name="Filter.Clothes/Body" value="Clothes/Body"/>
     <string name="Filter.Objects" value="Objects"/>
-    <string name="Filter.Custom" value="Custom filter"/>
+    <string name="Filter.Clothing" value="Clothing"/>
+    <string name="Filter.Bodyparts" value="Body parts"/>
 
 
     <button
@@ -219,11 +220,20 @@ It is calculated as border_size + 2*UIResizeBarOverlap
                      height="22"
                      layout="topleft"
                      left_pad="5"
-                     name="filter_wearables_combobox"
+                     name="list_view_filter_combobox"
                      top_delta="0"
                      visible="false"
                      width="152"/>
-
+                    <combo_box
+                     follows="left|right|bottom"
+                     height="22"
+                     layout="topleft"
+                     left_delta="0"
+                     name="folder_view_filter_combobox"
+                     top_delta="0"
+                     visible="false"
+                     width="152"/>
+                    
                     <button
                      follows="bottom|right"
                      height="22"
@@ -301,7 +311,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap
              layout="topleft"
              left="0"
              mouse_opaque="false"
-             name="inventory_items"
+             name="folder_view"
              top_pad="5"
              width="310"
              visible="false"/>
@@ -320,7 +330,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap
              visible="true">
                 <wearable_items_list
                  color="0.107 0.107 0.107 1"
-                 name="filtered_wearables_list"
+                 name="list_view"
                  allow_select="true"
                  layout="topleft"
                  follows="all"
-- 
cgit v1.2.3


From 3894b745c545b7b124b845fd60583c3e21592738 Mon Sep 17 00:00:00 2001
From: "Andrew A. de Laix" <alain@lindenlab.com>
Date: Mon, 14 Jun 2010 16:05:39 -0700
Subject: Fix EXT-7583: changed message to something more reasonable.

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

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index aca3b750c8..cf3097cb06 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1397,8 +1397,7 @@ Unable to encode file: [FILE]
    icon="alertmodal.tga"
    name="CorruptedProtectedDataStore"
    type="alertmodal">
-  We are unable to read your protected data so it is being reset.
-   This may happen when you change network setup.
+   We can't fill in your username and password.  This may happen when you change network setup
 
     <usetemplate
      name="okbutton"
-- 
cgit v1.2.3


From c21c192d0c65e0e9b506e08a918d700a1e400725 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Tue, 15 Jun 2010 13:01:11 +0100
Subject: EXT-7348 Can't open Advanced Menu in Linux Client

Added a new, preferred shortcut for Show Advanced Menu, that isn't eaten by the desktop on Linux.  The old shortcut also works.
---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 2641ce4ee4..3557318705 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -927,7 +927,7 @@
         <menu_item_check
          label="Show Advanced Menu"
          name="Show Advanced Menu"
-         shortcut="control|alt|D">
+         shortcut="control|alt|shift|D">
           <on_check
            function="CheckControl"
            parameter="UseDebugMenus" />
@@ -1477,6 +1477,18 @@
                 <menu_item_call.on_click
                  function="View.DefaultUISize" />
             </menu_item_call>
+            <!-- This second, alternative shortcut for Show Advanced Menu is for backward compatibility.  The main shortcut has been changed so it's Linux-friendly, where the old shortcut is typically eaten by the window manager. -->
+            <menu_item_check
+               label="Show Advanced Menu - legacy shortcut"
+               name="Show Advanced Menu - legacy shortcut"
+               shortcut="control|alt|D">
+              <on_check
+		 function="CheckControl"
+		 parameter="UseDebugMenus" />
+              <on_click
+		 function="ToggleControl"
+		 parameter="UseDebugMenus" />
+            </menu_item_check>
             <menu_item_separator/>
             <menu_item_check
              label="Always Run"
@@ -1652,7 +1664,6 @@
              function="ToggleControl"
              parameter="QAMode" />
         </menu_item_check>
-    
     </menu>
     <menu
      create_jump_keys="true"
@@ -3278,4 +3289,4 @@
             </menu>
         </menu>
     </menu>
-</menu_bar>
\ No newline at end of file
+</menu_bar>
-- 
cgit v1.2.3


From c773e01fbf795d8d40b19f8d9163898712509770 Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Tue, 15 Jun 2010 15:48:52 +0300
Subject: EXT-7789 FIXED Removed "Rename Outfit" option from My Outfits gear
 menu

Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/584/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/menu_outfit_gear.xml | 13 -------------
 1 file changed, 13 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
index 8e7ef7f0b5..16b33eff89 100644
--- a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
@@ -175,19 +175,6 @@
             <!-- copied from menu_inventory_add.xml -->
 
     <menu_item_separator name="sepatator2" />
-    <menu_item_call
-     label="Rename Outfit"
-     layout="topleft"
-     name="rename">
-        <on_click
-         function="Gear.Rename" />
-        <on_enable
-         function="Gear.OnEnable"
-         parameter="rename" />
-        <on_visible
-         function="Gear.OnVisible"
-         parameter="rename" />
-    </menu_item_call>
     <menu_item_call
      label="Delete Outfit"
      layout="topleft"
-- 
cgit v1.2.3


From 0effcd8a9f0a6ab3dd84506e0aa3333d5ebee8c2 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Tue, 15 Jun 2010 14:39:37 +0100
Subject: Backed out changeset fb6c9a1cebfc

---
 .../skins/default/xui/en/floater_snapshot.xml      | 192 +++++++++------------
 1 file changed, 77 insertions(+), 115 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index 7d81c3e551..f3d297c303 100644
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -38,129 +38,91 @@
     left="20"
     top_pad="-30"
     name="new_snapshot_btn"
-    width="23"
-    commit_callback.function="Snapshot.Refresh"/>
+    width="23" />
   <line_editor
     border_style="line"
     border_thickness="1"
-    follows="left|top"
-    height="20"
-    layout="topleft"
+	  follows="left|top"
+	  height="20"
+		layout="topleft"
     left="10"
-    max_length="500"
+		max_length="500"
     name="description"
-    top_pad="15"
-    width="230"
+	  top_pad="15"
+	  width="230"
     label="Description"/>
-  <panel
-   top_pad="20"
-   left="10"
-   height="83"
-   name="panel_snapshot_main"
-   width="130">
-    <button
-     label="Share Snapshot"
-     name="share"
-     top="0"
-     left="0"
-     width="130"
-     commit_callback.function="Snapshot.ShowButtons"
-     commit_callback.parameter="share"/>
-    <button
-     label="Save Snapshot"
-     name="save"
-     top_pad="7"
-     left_delta="0"
-     width="130"
-     commit_callback.function="Snapshot.ShowButtons"
-     commit_callback.parameter="save"/>
-    <button
-     label="Set As Profile Pic"
-     name="set_profile_pic"
-     top_pad="7"
-     left_delta="0"
-     width="130"/>
-  </panel>
-  <panel
-   top_delta="0"
-   left_delta="0"
-   height="83"
-   name="panel_snapshot_share"
-   width="130">
-    <button
-     label="Share to Web"
-     name="share_to_web"
-     top="0"
-     left="0"
-     visible="false"
-     width="130"/>
-    <button
-     label="Email Snapshot"
-     name="share_to_email"
-     top_pad="7"
-     left_delta="0"
-     width="130"/>
-    <button
-     label="Back"
-     name="cancel_share"
-     top_pad="7"
-     left_delta="0"
-     width="130"
-     commit_callback.function="Snapshot.ShowButtons"
-     commit_callback.parameter="main"/>
-  </panel>
-  <panel
-   top_delta="0"
-   left_delta="0"
-   height="83"
-   name="panel_snapshot_save"
-   width="130">
-    <button
-     label="Save to My Inventory"
-     name="save_to_inventory"
-     top="0"
-     left="0"
-     width="130"/>
-    <button
-     label="Save to My Computer"
-     name="save_to_computer"
-     top_pad="7"
-     left_delta="0"
-     width="130"/>
-    <button
-     label="Back"
-     name="cancel_save"
-     top_pad="7"
-     left_delta="0"
-     width="130"
-     commit_callback.function="Snapshot.ShowButtons"
-     commit_callback.parameter="main"/>
-  </panel>
   <button
-   follows="left"
-   height="22"
-   layout="topleft"
-   left="210"
-   name="show_advanced"
-   image_overlay="TabIcon_Close_Off"
-   bottom_delta="0"
-   width="30"
-   commit_callback.function="Snapshot.ShowAdvanced"/>
+   label="Share Snapshot" 
+   name="share" 
+   top_pad="20" 
+   left="10" 
+   width="130"/>
   <button
-   follows="left"
-   height="22"
-   layout="topleft"
-   left="210"
-   name="hide_advanced"
-   image_overlay="TabIcon_Open_Off"
-   top_delta="0"
+   label="Share to Web" 
+   name="share_to_web" 
+   top_delta="0" 
+   left="10" 
    visible="false"
-   width="30"
-   commit_callback.function="Snapshot.HideAdvanced"/>
+   width="130"/>
+  <button
+   label="Save to My Inventory" 
+   name="save_to_inventory" 
+   top_delta="0" 
+   left="10" 
+   width="130"/>
+  <button
+   label="Save Snapshot" 
+   name="save" 
+   top_pad="7" 
+   left="10" 
+   width="130"/>
+  <button
+   label="Email Snapshot" 
+   name="share_to_email" 
+   top_delta="0" 
+   left="10" 
+   width="130"/>
+  <button
+   label="Save to My Computer" 
+   name="save_to_computer" 
+   top_delta="0" 
+   left="10" 
+   width="130"/>
+  <button
+   label="Set As Profile Pic" 
+   name="set_profile_pic" 
+   top_pad="7" 
+   left="10" 
+   width="130"/>
+  <button
+   label="Back" 
+   name="cancel" 
+   top_delta="0" 
+   left="10" 
+   width="130"/>
+  <button
+     follows="left"
+     height="22"
+     layout="topleft"
+     left="210"
+    name="show_advanced"
+    image_overlay="TabIcon_Close_Off"
+    top_delta="1"
+    width="30"/>
+  <button
+     follows="left"
+     height="22"
+     layout="topleft"
+     left="210"
+     visible="false" 
+     name="hide_advanced"
+     image_overlay="TabIcon_Open_Off"
+     top_delta="0"
+     width="30"/>
   <panel 
-   visible="false"
-   left="250"
-   top="17"
-   name="snapshot_advanced"
-   filename="panel_snapshot_advanced.xml"/>
+    visible="false" 
+    left="250" 
+    top="17"    
+    name="snapshot_advanced" 
+    filename="panel_snapshot_advanced.xml"/>
 </floater>
-- 
cgit v1.2.3


From b95bd0dc27465c65f511c071d89b7f3dda5bcab0 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Tue, 15 Jun 2010 14:41:01 +0100
Subject: Backed out changeset 68feae2ef00a

---
 indra/newview/skins/default/xui/en/floater_snapshot.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index f3d297c303..7dcf2aab99 100644
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -62,7 +62,6 @@
    name="share_to_web" 
    top_delta="0" 
    left="10" 
-   visible="false"
    width="130"/>
   <button
    label="Save to My Inventory" 
-- 
cgit v1.2.3


From 4d852aba0e0b4222557ef4798663db11799f5761 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Tue, 15 Jun 2010 14:45:04 +0100
Subject: Backed out changeset 688db499e2d1

---
 indra/newview/skins/default/xui/en/notifications.xml | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index ff8de3514f..e8ba8c683d 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4375,18 +4375,6 @@ Uploading in-world and web site snapshots...
 (Takes about 5 minutes.)
   </notification>
 
-  <notification
-   icon="alertmodal.tga"
-   name="UploadConfirmation"
-   type="alertmodal">
-Uploading costs L$[AMOUNT].
-Do you wish to proceed?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="Upload"/>
-  </notification>
-
   <notification
    icon="notify.tga"
    name="UploadPayment"
-- 
cgit v1.2.3


From 5ad91abfdff9cfbadee555a297b95ace8f4f22b4 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Tue, 15 Jun 2010 14:49:16 +0100
Subject: Backed out changeset b447707f20f5

---
 indra/newview/skins/default/xui/en/notifications.xml | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index c39a91281e..5680b91c05 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5292,13 +5292,6 @@ Failed to find [TYPE] in database.
 Failed to find [TYPE] named [DESC] in database.
   </notification>
 
-  <notification
-   icon="notify.tga"
-   name="ShareToWebFailed"
-   type="notify">
-    Failed to upload image to web.
-  </notification>
-  
   <notification
    icon="notify.tga"
    name="InvalidWearable"
-- 
cgit v1.2.3


From 9fd6bab430a1b79b3c2ff307839e756fa4bb82eb Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Tue, 15 Jun 2010 14:51:03 +0100
Subject: Backed out changeset 1acc14a5e7ac

---
 .../skins/default/xui/en/floater_snapshot.xml      | 482 ++++++++++++++++-----
 1 file changed, 375 insertions(+), 107 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index 89712efbb7..dda14f02ff 100644
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -4,124 +4,392 @@
  can_minimize="false"
  can_close="true"
  follows="left|top"
- height="340"
+ height="516"
  layout="topleft"
  name="Snapshot"
  help_topic="snapshot"
  save_rect="true"
  save_visibility="true"
- can_dock="true"
- title="Snapshot"
- width="250">
-  <floater.string
-   name="unknown">
-    unknown
-  </floater.string>
-  <floater.string
-   name="share_to_web_url" translate="false">
-    http://pdp36.lindenlab.com:12777/
-  </floater.string>
-  <view
-    height="160"
-    width="225"
+ title="SNAPSHOT PREVIEW"
+ width="215">
+    <floater.string
+     name="unknown">
+        unknown
+    </floater.string>
+    <radio_group
+     height="58"
+     label="Snapshot type"
+     layout="topleft"
+     left="10"
+     name="snapshot_type_radio"
+     top="25"
+     width="205">
+        <radio_item
+         bottom="19"
+         height="16"
+         label="Email"
+         layout="topleft"
+         name="postcard" />
+        <radio_item
+         bottom="38"
+         height="16"
+         label="My inventory (L$[AMOUNT])"
+         layout="topleft"
+         name="texture" />
+        <radio_item
+         bottom="57"
+         height="16"
+         label="Save to my computer"
+         layout="topleft"
+         name="local" />
+    </radio_group>
+  <ui_ctrl 
+    height="90"
+    width="125"
     layout="topleft"
     name="thumbnail_placeholder"
-    top_pad="30"
+    top_pad="6"
     follows="left|top"
     left="10"
     />
-  <button
-    follows="left|top"
-    height="22"
-    image_overlay="Refresh_Off"
-    layout="topleft"
-    left="20"
-    top_pad="-30"
-    name="new_snapshot_btn"
-    width="23" />
-  <line_editor
-    border_style="line"
-    border_thickness="1"
-	  follows="left|top"
-	  height="20"
-		layout="topleft"
-    left="15"
-		max_length="500"
-    name="description"
-	  top_pad="20"
-	  width="225"
-    label="Description"/>
-  <button
-   label="Share to Web" 
-   name="share" 
-   top_pad="15" 
-   left="15" 
-   width="130"/>
-  <button
-   label="Share to Web" 
-   name="share_to_web" 
-   top_delta="0" 
-   left="15" 
-   width="130"/>
-  <button
-   label="Save to My Inventory" 
-   name="save_to_inventory" 
-   top_delta="0" 
-   left="15" 
-   width="130"/>
-  <button
-   label="Save Snapshot" 
-   name="save" 
-   top_pad="7" 
-   left="15" 
-   width="130"/>
-  <button
-   label="Email Snapshot" 
-   name="share_to_email" 
-   top_delta="0" 
-   left="15" 
-   width="130"/>
-  <button
-   label="Save to My Computer" 
-   name="save_to_computer" 
-   top_delta="0" 
-   left="15" 
-   width="130"/>
-  <button
-   label="Set As Profile Pic" 
-   name="set_profile_pic" 
-   top_pad="7" 
-   left="15" 
-   width="130"/>
-  <button
-   label="Back" 
-   name="cancel" 
-   top_delta="0" 
-   left="15" 
-   width="130"/>
-  <button
-    follows="right"
-    height="22"
-    layout="topleft"
-    right="-12"
-    name="show_advanced"
-    image_overlay="TabIcon_Close_Off"
-    top_delta="1"
-    width="30"/>
-  <button
-     follows="right"
+    <text
+     type="string"
+     font="SansSerifSmall"
+     length="1"
+     follows="left|top"
+     height="14"
+     layout="topleft"
+     right="-5"
+     left_delta="0"
+     halign="right"
+     name="file_size_label"
+     top_pad="10"
+     width="195">
+        [SIZE] KB
+    </text>
+    <button
+     follows="left|top"
      height="22"
+     image_overlay="Refresh_Off"
+     layout="topleft"
+     left="10"
+     name="new_snapshot_btn"
+     width="23" />
+    <button
+     follows="left|top"
+     height="23"
+     label="Send"
+     layout="topleft"
+     left_pad="5"
+     right="-5"
+     name="send_btn"
+     width="100" />
+    <button
+     follows="left|top"
+     height="23"
+     label="Save (L$[AMOUNT])"
+     layout="topleft"
+     right="-5"
+     name="upload_btn"
+     top_delta="0"
+     width="100" />
+    <flyout_button
+     follows="left|top"
+     height="23"
+     label="Save"
+     layout="topleft"
+     right="-5"
+     name="save_btn"
+     tool_tip="Save image to a file"
+     top_delta="0"
+     width="100">
+        <flyout_button.item
+         label="Save"
+         name="save_item"
+         value="save" />
+        <flyout_button.item
+         label="Save As..."
+         name="saveas_item"
+         value="save as" />
+    </flyout_button>
+        <button
+     follows="left|top"
+     height="23"
+     label="More"
+     layout="topleft"
+     left="10"
+     name="more_btn"
+     tool_tip="Advanced options"
+     width="80" />
+    <button
+     follows="left|top"
+     height="23"
+     label="Less"
+     layout="topleft"
+     left_delta="0"
+     name="less_btn"
+     tool_tip="Advanced options"
+     top_delta="0"
+     width="80" />
+    <button
+     follows="left|top"
+     height="23"
+     label="Cancel"
+     layout="topleft"
+     right="-5"
+     left_pad="5"
+     name="discard_btn"
+     width="100" />
+    <text
+     type="string"
+     length="1"
+     follows="top|left"
+     height="12"
+     layout="topleft"
+     left="10"
+     name="type_label2"
+     top_pad="5"
+     width="127">
+        Size
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="top|left"
+     height="12"
+     layout="topleft"
+     left_pad="5"
+     name="format_label"
+     top_delta="0"
+     width="70">
+        Format
+    </text>
+    <combo_box
+     height="23"
+     label="Resolution"
+     layout="topleft"
+     left="10"
+     name="postcard_size_combo"
+     width="120">
+        <combo_box.item
+         label="Current Window"
+         name="CurrentWindow"
+         value="[i0,i0]" />
+        <combo_box.item
+         label="640x480"
+         name="640x480"
+         value="[i640,i480]" />
+        <combo_box.item
+         label="800x600"
+         name="800x600"
+         value="[i800,i600]" />
+        <combo_box.item
+         label="1024x768"
+         name="1024x768"
+         value="[i1024,i768]" />
+        <combo_box.item
+         label="Custom"
+         name="Custom"
+         value="[i-1,i-1]" />
+    </combo_box>
+    <combo_box
+     height="23"
+     label="Resolution"
      layout="topleft"
-     right="-12"
-     visible="false" 
-     name="hide_advanced"
-     image_overlay="TabIcon_Open_Off"
+     left_delta="0"
+     name="texture_size_combo"
      top_delta="0"
-     width="30"/>
-  <panel 
-    visible="false" 
-    left="250" 
-    top="35" 
-    name="snapshot_advanced" 
-    filename="panel_snapshot_advanced.xml"/>
+     width="127">
+        <combo_box.item
+         label="Current Window"
+         name="CurrentWindow"
+         value="[i0,i0]" />
+        <combo_box.item
+         label="Small (128x128)"
+         name="Small(128x128)"
+         value="[i128,i128]" />
+        <combo_box.item
+         label="Medium (256x256)"
+         name="Medium(256x256)"
+         value="[i256,i256]" />
+        <combo_box.item
+         label="Large (512x512)"
+         name="Large(512x512)"
+         value="[i512,i512]" />
+        <combo_box.item
+         label="Custom"
+         name="Custom"
+         value="[i-1,i-1]" />
+    </combo_box>
+    <combo_box
+     height="23"
+     label="Resolution"
+     layout="topleft"
+     left_delta="0"
+     name="local_size_combo"
+     top_delta="0"
+     width="127">
+        <combo_box.item
+         label="Current Window"
+         name="CurrentWindow"
+         value="[i0,i0]" />
+        <combo_box.item
+         label="320x240"
+         name="320x240"
+         value="[i320,i240]" />
+        <combo_box.item
+         label="640x480"
+         name="640x480"
+         value="[i640,i480]" />
+        <combo_box.item
+         label="800x600"
+         name="800x600"
+         value="[i800,i600]" />
+        <combo_box.item
+         label="1024x768"
+         name="1024x768"
+         value="[i1024,i768]" />
+        <combo_box.item
+         label="1280x1024"
+         name="1280x1024"
+         value="[i1280,i1024]" />
+        <combo_box.item
+         label="1600x1200"
+         name="1600x1200"
+         value="[i1600,i1200]" />
+        <combo_box.item
+         label="Custom"
+         name="Custom"
+         value="[i-1,i-1]" />
+    </combo_box>
+    <combo_box
+     height="23"
+     label="Format"
+     layout="topleft"
+     left_pad="5"
+     name="local_format_combo"
+     width="70">
+        <combo_box.item
+         label="PNG"
+         name="PNG" />
+        <combo_box.item
+         label="JPEG"
+         name="JPEG" />
+        <combo_box.item
+         label="BMP"
+         name="BMP" />
+    </combo_box>
+    <spinner
+     allow_text_entry="false"
+     decimal_digits="0"
+     follows="left|top"
+     height="20"
+     increment="32"
+     label="Width"
+     label_width="40"
+     layout="topleft"
+     left="10"
+     max_val="6016"
+     min_val="32"
+     name="snapshot_width"
+     top_pad="10"
+     width="95" />
+    <spinner
+     allow_text_entry="false"
+     decimal_digits="0"
+     follows="left|top"
+     height="20"
+     increment="32"
+     label="Height"
+     label_width="40"
+     layout="topleft"
+     left_pad="5"
+     max_val="6016"
+     min_val="32"
+     name="snapshot_height"
+     top_delta="0"
+     width="95" />
+    <check_box
+     bottom_delta="20"
+     label="Constrain proportions"
+     layout="topleft"
+     left="10"
+     name="keep_aspect_check" />
+    <slider
+     decimal_digits="0"
+     follows="left|top"
+     height="15"
+     increment="1"
+     initial_value="75"
+     label="Image quality"
+     label_width="100"
+     layout="topleft"
+     left_delta="0"
+     max_val="100"
+     name="image_quality_slider"
+     top_pad="5"
+     width="205" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="13"
+     layout="topleft"
+     left="10"
+     name="layer_type_label"
+     top_pad="5"
+     width="50">
+        Capture:
+    </text>
+    <combo_box
+     height="23"
+     label="Image Layers"
+     layout="topleft"
+     left="30"
+     name="layer_types"
+     width="145">
+        <combo_box.item
+         label="Colors"
+         name="Colors"
+         value="colors" />
+        <combo_box.item
+         label="Depth"
+         name="Depth"
+         value="depth" />
+    </combo_box>
+    <check_box
+     label="Interface"
+     layout="topleft"
+     left="30"
+     top_pad="10"
+     width="180"
+     name="ui_check" />
+    <check_box
+     label="HUDs"
+     layout="topleft"
+     left="30"
+     top_pad="10"
+     width="180"
+     name="hud_check" />
+    <check_box
+     label="Keep open after saving"
+     layout="topleft"
+     left="10"
+     top_pad="8"
+     width="180"
+     name="keep_open_check" />
+    <check_box
+     label="Freeze frame (fullscreen)"
+     layout="topleft"
+     left="10"
+     top_pad="8"
+     width="180"
+     name="freeze_frame_check" />
+    <check_box
+     label="Auto-refresh"
+     layout="topleft"
+     left="10"
+     top_pad="8"
+     width="180"
+     name="auto_snapshot_check" />
 </floater>
-- 
cgit v1.2.3


From 85c14e45107b826cbb005889bd0299687a8c02ec Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Tue, 15 Jun 2010 15:53:04 +0100
Subject: fix minor xml barf.

---
 indra/newview/skins/default/xui/en/notifications.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index f798ee1a2b..20a2a7d954 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5515,7 +5515,6 @@ Failed to find [TYPE] named [DESC] in database.
 
   <notification
    icon="notify.tga"
-   persist="true"
    name="InvalidWearable"
    persist="true"
    type="notify">
-- 
cgit v1.2.3


From 26c97318aae5a15ba1d48123576de91bc132fccb Mon Sep 17 00:00:00 2001
From: Vladimir Pchelko <pchelko@productengine.com>
Date: Tue, 15 Jun 2010 18:36:58 +0300
Subject: EXT-7776 FIXED Button label was renamed.

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/578/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_outfit_edit.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index ed3b176267..efd1798d44 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -490,7 +490,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap
          follows="bottom|left|right"
          height="23"
          left_pad="12"
-         label="Revert"
+         label="Undo Changes"
          layout="topleft"
          name="revert_btn"
          top="0"
-- 
cgit v1.2.3


From 33c3064639d95b75e41a4d83b14620e74802d4f7 Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Tue, 15 Jun 2010 20:23:39 +0300
Subject: EXT-7808 FIXED Renamed the "Wear" context menu item to "Replace" in
 My Outfits and Add Wearable panels.

Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/582/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/menu_wearable_list_item.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
index 430a7b6444..efea2ae3e8 100644
--- a/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
@@ -2,7 +2,7 @@
 <context_menu
  name="Outfit Wearable Context Menu">
     <menu_item_call
-     label="Wear"
+     label="Replace"
      layout="topleft"
      name="wear">
         <on_click
-- 
cgit v1.2.3


From e460985ddf0d427aba268c8746efd4fad2419c8d Mon Sep 17 00:00:00 2001
From: Andrew Polunin <apolunin@productengine.com>
Date: Tue, 15 Jun 2010 21:52:15 +0300
Subject: EXT-7639 FIXED added shop button which reacts according to the ticket
 description

- Added method LLAccordionCtrl::getExpandedTab() which search for the first expanded accordion tab. This method is a bit of hacking, but I discussed it with Vadim Savchuk.
- LLAccordionCtrlTab::isExpanded() is made 'const'. This is necessary to call it from getExpandedTab() which is also 'const'.
- Added all provided Marketplace URLs (taken from EXT-7257) to the settings.xml. So URLs can be configured without recompilation.
- Added method LLCOFWearables::getSelectedItems() which can be used to get ALL selected items (not only one).
- Class LLShopURLDispatcher is implemented in the llpaneloutfitedit.cpp.
- Added callback LLPanelOutfitEdit::onShopButtonClicked() which calls LLShopURLDispatcher to send user to the correct URL.
- Added shop button (shop_btn) widget in panel_outfit_edit.xml. It has invalid icon for now. After review I'm going to reassign the ticket to someone who will provide correct icons.

Reviewed by Vadim Savchuk and Mike Antipov at https://codereview.productengine.com/secondlife/r/569/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_outfit_edit.xml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index efd1798d44..528850a6ec 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -375,7 +375,19 @@ It is calculated as border_size + 2*UIResizeBarOverlap
          layout="topleft"
          left_pad="1"
          name="dummy_right_icon"
-         width="281" />
+         width="246" />
+        <button
+         follows="bottom|right"
+         height="25"
+         image_hover_unselected="Toolbar_Middle_Over"
+         image_overlay="AddItem_Off"
+         image_selected="Toolbar_Middle_Selected"
+         image_unselected="Toolbar_Middle_Off"
+         layout="topleft"
+         left_pad="0"
+         name="shop_btn"
+         top="1"
+         width="31" />
     </panel>
     
     
-- 
cgit v1.2.3


From f74fe0c212822be0985a5d34cf5aa0dbdc59c354 Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Wed, 16 Jun 2010 11:03:28 +0300
Subject: EXT-7763 FIXED Made text editor of script error window as read only.
 reviewed by Vadim Savchuk at
 https://codereview.productengine.com/secondlife/r/594/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/floater_script_debug_panel.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml
index e94af2c8d5..d1db5c17ba 100644
--- a/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml
+++ b/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml
@@ -18,6 +18,7 @@
      max_length="2147483647"
      name="Chat History Editor"
      parse_highlights="true" 
+     read_only="true"
      width="420"
      word_wrap="true" />
 </floater>
-- 
cgit v1.2.3


From 5de0b6ac296632b8cd5b6135739ea04c311f6f2b Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Wed, 16 Jun 2010 11:18:38 +0300
Subject: EXT-7667 FIXED There is much unnecessary empty space from the right
 side in the Group profile information

- Increased width of layout panel and its accordion

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/589/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
index e4eb9afb29..e894fc8fb8 100644
--- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
@@ -95,7 +95,8 @@ background_visible="true"
        name="group_accordions"
        follows="all"
        layout="topleft"
-       auto_resize="true">
+       auto_resize="true"
+       width="313">
    <accordion
      left="0"
      top="0"
@@ -103,7 +104,8 @@ background_visible="true"
      fit_parent="true"
      follows="all"
      layout="topleft"
-     name="groups_accordion">
+     name="groups_accordion"
+     width="313">
          <accordion_tab
             expanded="true"
             layout="topleft"
-- 
cgit v1.2.3


From 46ebc6d37389f6cbc27262ca7d1817a7215d4d9f Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Wed, 16 Jun 2010 11:21:20 +0300
Subject: EXT-7576 FIXED 'Add to Outfit:' panel should shrink the top 'Edit
 Outfit' list to 1/3 the vertical height

- Increased height of 'Add to Outfit' panel and set animate for layout stack. Animate attrubute was set to true to force proper calculation of layout panels size when one of the layout panels can dynamically change its visibility

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/588/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_outfit_edit.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index 528850a6ec..03a0c464d2 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -144,7 +144,7 @@ Required height for dragbar (icon in spec) is 10, so resizebar height should be
 It is calculated as border_size + 2*UIResizeBarOverlap
 -->
     <layout_stack
-     animate="false"
+     animate="true"
      border_size="8"
      clip="false"
      default_tab_group="2"
@@ -284,7 +284,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap
          bg_alpha_color="DkGray2"
          auto_resize="true"
          default_tab_group="3"
-         height="211"
+         height="450"
          min_height="210"
          name="add_wearables_panel"
          width="313"
@@ -307,7 +307,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap
              background_visible="false"
              border="false"
              follows="left|top|right|bottom"
-             height="203"
+             height="442"
              layout="topleft"
              left="0"
              mouse_opaque="false"
@@ -322,7 +322,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap
              layout="topleft"
              follows="left|top|right|bottom"
              border="false"
-             height="210"
+             height="449"
              left="0"
              mouse_opaque="false"
              width="310"
@@ -336,7 +336,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap
                  follows="all"
                  multi_select="true"
                  width="310"
-                 height="210"
+                 height="449"
                  left="0"
                  top="0"/>
             </panel>
-- 
cgit v1.2.3


From 3ad0981d2f80a053a4bc22d659a129b3640852d4 Mon Sep 17 00:00:00 2001
From: Vladimir Pchelko <pchelko@productengine.com>
Date: Wed, 16 Jun 2010 19:43:24 +0300
Subject: EXT-7823 FIXED Accordion widget was improved to show different
 message when no_matched_tabs  in panel or no_visible_tabs in panel.

Added "no_matched" and "no_visible" text for TeleportHistory.
+ Added "no_visible" text for My Outfit list.
+ Fixed filtering in TeleportHistory.

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/591/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_outfits_list.xml     | 3 ++-
 indra/newview/skins/default/xui/en/panel_people.xml           | 1 -
 indra/newview/skins/default/xui/en/panel_teleport_history.xml | 6 ++++--
 indra/newview/skins/default/xui/en/widgets/accordion.xml      | 8 ++++++--
 4 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_outfits_list.xml b/indra/newview/skins/default/xui/en/panel_outfits_list.xml
index 5c9ae51a48..d0c44c4328 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_list.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_list.xml
@@ -14,7 +14,8 @@
      background_visible="true"
      bg_alpha_color="DkGray2"
      bg_opaque_color="DkGray2"
-     empty_accordion_text.value="Didn't find what you're looking for? Try [secondlife:///app/search/all/[SEARCH_TERM] Search]."
+     no_matched_tabs_text.value="Didn't find what you're looking for? Try [secondlife:///app/search/all/[SEARCH_TERM] Search]."
+     no_visible_tabs_text.value="There are no any outfits. Try [secondlife:///app/search/all/ Search]."
      follows="all"
      height="400"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index da28773c74..b79ef1e287 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -173,7 +173,6 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
        		 background_visible="true"
        		 bg_alpha_color="DkGray2"
        		 bg_opaque_color="DkGray2"
-             empty_accordion_text.value=""
              follows="all"
              height="356"
              layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history.xml b/indra/newview/skins/default/xui/en/panel_teleport_history.xml
index 21addb8e6f..daa4356c83 100644
--- a/indra/newview/skins/default/xui/en/panel_teleport_history.xml
+++ b/indra/newview/skins/default/xui/en/panel_teleport_history.xml
@@ -5,14 +5,16 @@
      background_visible="true"
      bg_alpha_color="DkGray">     
     <accordion
+     no_matched_tabs_text.value="Didn't find what you're looking for? Try [secondlife:///app/search/places/[SEARCH_TERM] Search]."
+     no_visible_tabs_text.value="Teleport history is empty. Try [secondlife:///app/search/places/ Search]."
      follows="left|top|right|bottom"
      height="373"
      layout="topleft"
      left="3"
      top="0"
      name="history_accordion"
-   background_visible="true"
-   bg_alpha_color="DkGray2"
+     background_visible="true"
+     bg_alpha_color="DkGray2"
      width="307">
 	    <accordion_tab
          layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/widgets/accordion.xml b/indra/newview/skins/default/xui/en/widgets/accordion.xml
index 05d7447a6f..19f8234389 100644
--- a/indra/newview/skins/default/xui/en/widgets/accordion.xml
+++ b/indra/newview/skins/default/xui/en/widgets/accordion.xml
@@ -3,12 +3,16 @@
  height="100"
  name="accordion"
  width="200">
-    <empty_accordion_text
+    <no_matched_tabs_text
      follows="all"
      height="100"
      h_pad="10"
-     name="no_visible_items_msg"
+     name="no_matched_tabs_msg"
      v_pad="15"
      width="200"
      wrap="true "/>
+    <!-- This widget will not be created in viewer. Only its value will be used for empty accordion without filter. -->
+    <no_visible_tabs_text
+     name="no_visible_tabs_msg"
+     visible="false"/>
 </accordion>
-- 
cgit v1.2.3


From bc91053543278b56d7009ab6bbcdee88a0ee1418 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Wed, 16 Jun 2010 15:26:53 -0400
Subject: EXT-6571 FIX - avoid removing links to missing wearables, which fixes
 a problem with ordering in multi-wearables

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

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
index c1e5ae50e6..a59070496e 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
@@ -48,7 +48,7 @@
            mouse_opaque="true"
            name="cof_tab"
            start_folder="Current Outfit"
-           use_label_suffix="false" 
+           use_label_suffix="true" 
            width="315" />
    </tab_container>
 	 <panel
@@ -130,4 +130,4 @@
       width="152" />
 	 </panel>
        
-</panel>
\ No newline at end of file
+</panel>
-- 
cgit v1.2.3


From ab2588a47cf19447e71a6c3e8924b17ca296e6c0 Mon Sep 17 00:00:00 2001
From: Richard Nelson <none@none>
Date: Wed, 16 Jun 2010 16:53:40 -0700
Subject: fix for media browser layout

---
 indra/newview/skins/default/xui/en/floater_media_browser.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_media_browser.xml b/indra/newview/skins/default/xui/en/floater_media_browser.xml
index 70dac7e41c..c02d607586 100644
--- a/indra/newview/skins/default/xui/en/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/en/floater_media_browser.xml
@@ -182,7 +182,7 @@
 			</button>
         </layout_panel>
         <layout_panel
-         height="20"
+         height="40"
          layout="topleft"
          left_delta="0"
          name="external_controls"
@@ -190,7 +190,7 @@
          user_resize="false"
          width="540">
             <web_browser
-             bottom="-10"
+             bottom="-30"
              follows="left|right|top|bottom"
              layout="topleft"
              left="0"
@@ -206,9 +206,9 @@
              name="open_browser"
              top_pad="5"
              width="185">
-				<button.commit_callback
-				function="MediaBrowser.OpenWebBrowser" />
-			</button>
+              <button.commit_callback
+                function="MediaBrowser.OpenWebBrowser" />
+            </button>
             <check_box
              control_name="UseExternalBrowser"
              follows="bottom|left"
-- 
cgit v1.2.3


From 4aef5f54de70a8d729c93f7eb11995a7d23feed0 Mon Sep 17 00:00:00 2001
From: Richard Nelson <none@none>
Date: Wed, 16 Jun 2010 17:32:51 -0700
Subject: EXT-7734 FIX In-world object properteis often don't show correct
 information reviewed by Leyla

---
 .../skins/default/xui/en/sidepanel_item_info.xml   | 89 +++++++++++-----------
 1 file changed, 43 insertions(+), 46 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
index e2bd6f375e..b3bc618eec 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -159,51 +159,49 @@
 		     name="LabelCreatorName"
 		     top_delta="6"
 		     width="140">
-	        Nicole Linden
-	     </text>
-	     <button
-			 follows="top|right"
-			 height="16"
-     image_selected="Inspector_I"
-     image_unselected="Inspector_I"
-			 layout="topleft"
-			 right="-5"
-			 name="BtnCreator"
-			 top_delta="-6"
-			 width="16" />
-	     <text
-			 type="string"
-			 length="1"
-			 follows="left|top"
-			 height="23"
-			 layout="topleft"
-			   left="5"
-			 name="LabelOwnerTitle"
-			   top_pad="10"
-			 width="78">
-			    Owner:
-	     </text>
-	     <avatar_icon
-			   follows="top|left"
-			   height="20"
-			   default_icon_name="Generic_Person"
-			   layout="topleft"
-			   left_pad="0"
-			   top_delta="-6"
-			   mouse_opaque="true"
-			   width="20" />
-	     <text
-			 type="string"
-			   follows="left|right|top"
-			   font="SansSerifSmall"
-			   height="15"
-			   layout="topleft"
-			   left_pad="5"
-			 name="LabelOwnerName"
-			 top_delta="6"
-			 width="140">
-			    Thrax Linden
-	     </text>
+      </text>
+      <button
+      follows="top|right"
+      height="16"
+    image_selected="Inspector_I"
+    image_unselected="Inspector_I"
+      layout="topleft"
+      right="-5"
+      name="BtnCreator"
+      top_delta="-6"
+      width="16" />
+      <text
+      type="string"
+      length="1"
+      follows="left|top"
+      height="23"
+      layout="topleft"
+        left="5"
+      name="LabelOwnerTitle"
+        top_pad="10"
+      width="78">
+        Owner:
+      </text>
+      <avatar_icon
+        follows="top|left"
+        height="20"
+        default_icon_name="Generic_Person"
+        layout="topleft"
+        left_pad="0"
+        top_delta="-6"
+        mouse_opaque="true"
+        width="20" />
+      <text
+      type="string"
+        follows="left|right|top"
+        font="SansSerifSmall"
+        height="15"
+        layout="topleft"
+        left_pad="5"
+      name="LabelOwnerName"
+      top_delta="6"
+      width="140">
+      </text>
 	     <button
 			 follows="top|right"
 			 height="16"
@@ -236,7 +234,6 @@ top_pad="10"
 			 name="LabelAcquiredDate"
 			 top_delta="0"
 			 width="222">
-			Wed May 24 12:50:46 2006
       </text>
 	 <panel
          border="false"
-- 
cgit v1.2.3


From d4232e4ae1d83b068352dc00cfda90d1692a16f2 Mon Sep 17 00:00:00 2001
From: Lynx Linden <lynx@lindenlab.com>
Date: Thu, 17 Jun 2010 13:08:59 +0100
Subject: EXT-7887 FIXED Release note URL updated.

We now point directly to the wiki for Viewer release notes and we
include three digits in the version number. E.g.,

http://wiki.secondlife.com/wiki/Release_Notes/Second Life Beta Viewer/2.1.0
---
 indra/newview/skins/default/xui/en/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 294267d43b..68eea8dc9a 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -136,7 +136,7 @@
 	<string name="RetrievingData">Retrieving...</string>
 
 	<string name="ReleaseNotes">Release Notes</string>
-	<string name="RELEASE_NOTES_BASE_URL">http://secondlife.com/app/releasenotes/</string>
+	<string name="RELEASE_NOTES_BASE_URL">http://wiki.secondlife.com/wiki/Release_Notes/</string>
 
 	<!-- Indicates something is being loaded. Maybe should be merged with RetrievingData -->
 	<string name="LoadingData">Loading...</string>
-- 
cgit v1.2.3


From cdafe7cef5cb7a9823e34e563cdc2cc498664c53 Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Thu, 17 Jun 2010 17:01:18 +0300
Subject: EXT-7788 FIXED Rename in context menu shows very short text field for
 new name 1 Made line editor width configurable for alert notifications. 2 Set
 line editor width to 300px.

reviwed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/605/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/notifications.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 20a2a7d954..673c095826 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2098,7 +2098,7 @@ Would you be my friend?
    type="alertmodal">
     New outfit name:
     <form name="form">
-      <input name="new_name" type="text">
+      <input name="new_name" type="text" width="300">
         [NAME]
       </input>
       <button
-- 
cgit v1.2.3


From 9f996443604a902e03de87d2d14545b4adffa69c Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Thu, 17 Jun 2010 19:03:57 +0300
Subject: EXT-7722 Fixed "Add to COF" and "Remove from COF" outfit context menu
 items to be enabled when appropriate and work properly.

Work on "Take Off - Remove from Current Outfit" and "Wear - Add to Current Outfit" menu options:
- The menu items of the outfit context menu and the My Outfits gear menu are now disabled
  when inappropriate instead of being hidden.
- The menu items get enabled/disabled depending on whether you can wear (take off) anything from the selected outfit.
  (was: depending on whether you're wearing the outfit)
- Changed the way the options work: they now only operate on clothes and attachments.
  "Add to COF" now only adds those body parts that are missing in COF;
  "Remove from COF" doesn't touch body parts at all.

  Without this change both "Add" and "Remove" options would be available simultaneously, because
  any valid outfit contains body parts. I think that would be confusing.
  And you don't expect you body parts to be replaced when doing "Add to COF'. (that's addition, not replacement)

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/585/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/menu_outfit_tab.xml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/menu_outfit_tab.xml b/indra/newview/skins/default/xui/en/menu_outfit_tab.xml
index e084216a69..9206969b2f 100644
--- a/indra/newview/skins/default/xui/en/menu_outfit_tab.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_tab.xml
@@ -18,6 +18,9 @@
      name="wear_add">
         <on_click
          function="Outfit.WearAdd" />
+        <on_enable
+         function="Outfit.OnEnable"
+         parameter="wear_add" />
         <on_visible
          function="Outfit.OnVisible"
          parameter="wear_add" />
@@ -28,6 +31,9 @@
      name="take_off">
         <on_click
          function="Outfit.TakeOff" />
+        <on_enable
+         function="Outfit.OnEnable"
+         parameter="take_off" />
         <on_visible
          function="Outfit.OnVisible"
          parameter="take_off" />
-- 
cgit v1.2.3


From 383fd7e86fa16a8b4d50211b74d6aacd0aa9f4dd Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Thu, 17 Jun 2010 21:38:46 +0300
Subject: EXT-6468 ADDITIONAL FIX Changed "- Select Mature -" to "- Select
 maturity rating -" in group profile.

Requested by Eli and approved by Benjamin.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_group_general.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml
index e79ae34627..2af1a84400 100644
--- a/indra/newview/skins/default/xui/en/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_general.xml
@@ -243,7 +243,7 @@ Hover your mouse over the options for more help.
          top_pad="4"
          width="190">
 			<combo_item name="select_mature" value="Select">
-			- Select Mature -
+			- Select maturity rating -
 			</combo_item>
             <combo_box.item
              label="Moderate Content"
-- 
cgit v1.2.3


From 89fb6d2ddb70fd179cddc5485ab1d2757aaf9000 Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Thu, 17 Jun 2010 21:44:37 +0300
Subject: EXT-7874 FIXED Change 'Rename' to 'Rename Outfit' in outfit context
 menu on 'My Outfit' tab.

Trivial change, not reviewed.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/menu_outfit_tab.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/menu_outfit_tab.xml b/indra/newview/skins/default/xui/en/menu_outfit_tab.xml
index 9206969b2f..9c3151fe07 100644
--- a/indra/newview/skins/default/xui/en/menu_outfit_tab.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_tab.xml
@@ -50,7 +50,7 @@
     </menu_item_call>
     <menu_item_separator />
     <menu_item_call
-     label="Rename"
+     label="Rename Outfit"
      layout="topleft"
      name="rename">
         <on_click
-- 
cgit v1.2.3


From 4fc8140a1d01742d560ea0d122b889a670e97c2e Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Thu, 17 Jun 2010 16:36:49 -0400
Subject: EXT-7916 FIXED Miscllaneous UI issues with Preview Gesture Floater

See subtasks for complete lists of fixes.  The preview gesture floater had some major issues and regressions.
---
 .../default/xui/en/floater_preview_gesture.xml     | 74 ++++++++--------------
 1 file changed, 27 insertions(+), 47 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
index f766fe5a5d..1cbb5ec6fb 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
@@ -39,28 +39,6 @@
      name="Title">
         Gesture: [NAME]
     </floater.string>
-  <text
-   type="string"
-   length="1"
-   follows="top|left"
-   font="SansSerifSmall"
-   height="10"
-   layout="topleft"
-   left="10"
-   name="name_text"
-   top="20"
-   font.style="BOLD"
-   width="100">
-    Name:
-  </text>
-  <line_editor
-   follows="left|top"
-   height="20"
-   layout="topleft"
-   left_delta="84"
-   name="name"
-   top_delta="-4"
-   width="180" />
     <text
      type="string"
      length="1"
@@ -70,7 +48,7 @@
      layout="topleft"
      left="10"
      name="desc_label"
-     top_pad="10"
+     top_pad="25"
      font.style="BOLD"
      width="100">
         Description:
@@ -79,10 +57,10 @@
      follows="left|top"
      height="20"
      layout="topleft"
-     left_delta="84"
+     left_delta="89"
      name="desc"
      top_delta="-4"
-     width="180" />
+     width="175" />
     <text
      type="string"
      length="1"
@@ -101,11 +79,11 @@
      follows="left|top"
      height="20"
      layout="topleft"
-     left_delta="84"
+     left_delta="89"
      max_length="31"
      name="trigger_editor"
      top_delta="-4"
-     width="180" />
+     width="175" />
     <text
      type="string"
      length="1"
@@ -125,12 +103,12 @@
      follows="left|top"
      height="20"
      layout="topleft"
-     left_delta="84"
+     left_delta="89"
      max_length="31"
      name="replace_editor"
      tool_tip="Replace the trigger word(s) with these words. For example, trigger &apos;hello&apos; replace with &apos;howdy&apos; will turn the chat &apos;I wanted to say hello&apos; into &apos;I wanted to say howdy&apos; as well as playing the gesture"
      top_delta="-4"
-     width="180" />
+     width="175" />
     <text
      type="string"
      length="1"
@@ -149,7 +127,7 @@
      height="20"
      label="None"
      layout="topleft"
-     left_delta="84"
+     left_delta="89"
      name="modifier_combo"
      top_delta="-4"
      width="75" />
@@ -171,7 +149,7 @@
      left="10"
      font.style="BOLD"
      name="library_label"
-     top="135"
+     top_delta="25"
      width="100">
         Library:
     </text>
@@ -181,7 +159,7 @@
      layout="topleft"
      left="10"
      name="library_list"
-     top="150"
+     top_delta="15"
      width="180">
         <scroll_list.rows
          value="Animation" />
@@ -199,7 +177,7 @@
      layout="topleft"
      left_pad="10"
      name="add_btn"
-     top_delta="0"
+     top_delta="-1"
      width="70" />
     <text
      type="string"
@@ -230,7 +208,7 @@
      layout="topleft"
      left_pad="10"
      name="up_btn"
-     top_delta="0"
+     top_delta="-1"
      width="70" />
     <button
      follows="top|left"
@@ -256,23 +234,25 @@
      layout="topleft"
      left="15"
      name="options_text"
-     top="330"
-     width="205" />
+     top="315"
+     width="205">
+	 (options)
+	 </text>
     <combo_box
      follows="top|left"
      height="20"
      layout="topleft"
      left_delta="15"
      name="animation_list"
-     top="345"
-     width="100" />
+     top="330"
+     width="100"/>
     <combo_box
      follows="top|left"
      height="20"
      layout="topleft"
      left_delta="0"
      name="sound_list"
-     top_delta="0"
+     top="330"
      width="100" />
     <line_editor
      follows="top|left"
@@ -281,7 +261,7 @@
      left_delta="0"
      max_length="127"
      name="chat_editor"
-     top_delta="0"
+     top="330"
      width="100" />
     <radio_group
      draw_border="false"
@@ -290,7 +270,7 @@
      layout="topleft"
      left_pad="8"
      name="animation_trigger_type"
-     top_delta="0"
+     top="360"
      width="80">
         <radio_item
          height="16"
@@ -298,7 +278,7 @@
          layout="topleft"
          left="3"
          name="start"
-         top="-51"
+         top_delta="3"
          width="80" />
         <radio_item
          height="16"
@@ -314,14 +294,14 @@
      height="20"
      label="until animations are done"
      layout="topleft"
-     left="16"
+     left="28"
      name="wait_anim_check"
-     top="340"
+     top="330"
      width="100" />
     <check_box
      follows="top|left"
      height="20"
-     label="time in seconds"
+     label="time in seconds:"
      layout="topleft"
      left_delta="0"
      name="wait_time_check"
@@ -331,10 +311,10 @@
      follows="top|left"
      height="20"
      layout="topleft"
-     left_pad="5"
+     left_pad="10"
      max_length="15"
      name="wait_time_editor"
-     top_delta="0"
+     top_delta="1"
      width="50" />
     <text
      type="string"
-- 
cgit v1.2.3


From 408484d0c133627a1a5e3586aa34015d89b23379 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Thu, 17 Jun 2010 17:41:02 -0400
Subject: EXT-7916 FIXED Miscllaneous UI issues with Preview Gesture Floater
 EXT-7920 FIXED Start and stop buttons are not clickable

Start and stop buttons were outside the UI box containing them.
---
 indra/newview/skins/default/xui/en/floater_preview_gesture.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
index 1cbb5ec6fb..6281bc5272 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
@@ -270,7 +270,7 @@
      layout="topleft"
      left_pad="8"
      name="animation_trigger_type"
-     top="360"
+     top="330"
      width="80">
         <radio_item
          height="16"
@@ -278,7 +278,7 @@
          layout="topleft"
          left="3"
          name="start"
-         top_delta="3"
+         top_delta="45"
          width="80" />
         <radio_item
          height="16"
@@ -286,7 +286,7 @@
          layout="topleft"
          left_delta="0"
          name="stop"
-         top_pad="10"
+         top_pad="3"
          width="80" />
     </radio_group>
     <check_box
-- 
cgit v1.2.3


From 68bfb03a9f4f4317e63bce9b9ae0370561157097 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 17 Jun 2010 17:14:59 -0700
Subject: EXT-6296 FIX "Primitive" misspelled as "Primative" in About Land menu

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

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index 54ef6d65a7..b9489895ae 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -825,7 +825,7 @@ Leyla Linden               </text>
              name="Simulator primitive usage:"
              top_pad="4"
              width="364">
-               Primative usage:
+               Primitive usage:
             </text>
             <text
              type="string"
-- 
cgit v1.2.3


From 2c5af9672c8b531762475c752dd1904a4024ff67 Mon Sep 17 00:00:00 2001
From: Andrew Polunin <apolunin@productengine.com>
Date: Fri, 18 Jun 2010 15:58:00 +0300
Subject: EXT-5808 FIXED Added another context menu. Also Navigation Bar and
 Mini-Location bar are mutually exclusive now

- Implemented context menu for Mini-Location bar (menu_topinfobar.xml)
- Implemented function show_topinfobar_context_menu() (in llviewermenu.h) which displays context menu for Mini-Location bar.
- Functions toggle_show_navigation_panel() and toggle_show_mini_location_panel() modified so that Navigation Bar and Mini-Location bar are mutually exclusive (when the former is visible the latter is hidden and vice versa).
- Implemented method LLPanelTopInfoBar::onContextMenuItemClicked which handles \"landmark\" and \"copy\" Mini-Location bar context menu actions.

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/607/

--HG--
branch : product-engine
---
 .../skins/default/xui/en/menu_topinfobar.xml       | 51 ++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/menu_topinfobar.xml

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/menu_topinfobar.xml b/indra/newview/skins/default/xui/en/menu_topinfobar.xml
new file mode 100644
index 0000000000..cbe249ed4d
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_topinfobar.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu
+ height="201"
+ layout="topleft"
+ left="100"
+ mouse_opaque="false"
+ name="menu_topinfobar"
+ top="624"
+ visible="false"
+ width="128">
+    <menu_item_check
+         label="Show Coordinates"
+         name="Show Coordinates">
+           <on_click
+             function="ToggleControl"
+             parameter="NavBarShowCoordinates" />
+             <on_check
+             function="CheckControl"
+             parameter="NavBarShowCoordinates" />
+    </menu_item_check>
+    <menu_item_check
+      label="Show Parcel Properties"
+      name="Show Parcel Properties">
+      <on_click
+        function="ToggleControl"
+        parameter="NavBarShowParcelProperties" />
+      <on_check
+        function="CheckControl"
+        parameter="NavBarShowParcelProperties" />
+    </menu_item_check>
+    <menu_item_separator
+     name="Separator" />
+    <!-- Label of 'Landmark' item is changing in runtime, 
+    see  AddLandmarkNavBarMenu/EditLandmarkNavBarMenu in strings.xml -->
+    <menu_item_call
+     label="Landmark"
+     name="Landmark">
+        <on_click
+         function="TopInfoBar.Action"
+         parameter="landmark" />
+    </menu_item_call>
+    <menu_item_separator
+     name="Separator" />
+    <menu_item_call
+     label="Copy"
+     name="Copy">
+        <on_click
+         function="TopInfoBar.Action"
+         parameter="copy" />
+    </menu_item_call>
+</menu>
-- 
cgit v1.2.3


From 89825da530f0f5bb4ed2f5260c213174a34f28d8 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Fri, 18 Jun 2010 17:28:32 +0300
Subject: EXT-7777 WIP Implemented loading indicator for "Save" and "Save As"
 actions in "My Outfits" & "Edit Outfit" Panels. EXT-7929 FIXED Updated
 functionality of attaching object: loading indicator gets hidden when
 attaching is completed.

- Fixed crash when accessing singleton on application exit.

- Updated functionality of attaching object: loading indicator was not hidden.
 * Reason: link to attachment was created without next appearance updating.
 * Fix: passed "true" into LLAppearanceMgr::addCOFItemLink to call LLAppearanceMgr::updateAppearanceFromCOF when attachments is completed. (Like for clothing).

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/611/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_outfit_edit.xml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index 03a0c464d2..1ed73e6c15 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -106,7 +106,7 @@
             <panel
              bevel_style="none"
              follows="top|right"
-             height="38"
+             height="37"
              layout="topleft"
              left_pad="5"
              name="outfit_name_and_status"
@@ -122,18 +122,26 @@
                  top="2"
                  value="Now editing..."
                  use_ellipses="true"
-                 width="270" /> 
+                 width="245" /> 
                 <text
                  follows="bottom|left|right"
                  font="SansSerifLargeBold"
-                 height="26"
+                 height="18"
                  layout="topleft"
                  name="curr_outfit_name"
                  text_color="LtGray"
                  top_pad="2"
                  value="[Current Outfit]"
                  use_ellipses="true"
-                 width="270" /> 
+                 width="245" /> 
+                <loading_indicator
+                 follows="right|top"
+                 height="24"
+                 layout="topleft"
+                 right="-2"
+                 name="edit_outfit_loading_indicator"
+                 top="6"
+                 width="24" />
             </panel>
     </panel>
 
-- 
cgit v1.2.3


From 129da72326e0a314717652650ef6f4378d7794a0 Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Fri, 18 Jun 2010 17:52:54 +0300
Subject: EXT-6710 FIXED Corrected 'ItemsShared' notification message and
 provided logging of 'item shared' message instead of spawning IM session and
 add message to it. Details: 1 Corrected 'ItemsShared' notification message. 2
 Avoided spawning session on item shared event. 3 Provided logging of item
 shared message. 4 Provided logging of 'IMSystemMessageTip' notification
 without opened related IM session.

reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/612/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/notifications.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 673c095826..88732fee7d 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6209,7 +6209,7 @@ With the following Residents:
    icon="notifytip.tga"
    name="ItemsShared"
    type="notifytip">
-Items are successfully shared.
+Items successfully shared.
   </notification>
   <notification
    icon="notifytip.tga"
-- 
cgit v1.2.3


From f42062aaacf7819333a141cdaf9c9aa6fdee1bf3 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Fri, 18 Jun 2010 16:15:49 +0100
Subject: EXT-7933 FIXED Slim down the Voice Morph preview floater

---
 .../default/xui/en/floater_voice_controls.xml      |  6 +--
 .../skins/default/xui/en/floater_voice_effect.xml  | 60 +++++++++++++---------
 .../skins/default/xui/en/panel_voice_effect.xml    |  6 +--
 3 files changed, 43 insertions(+), 29 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
index 0569b4d515..bf5bd87ad6 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -47,8 +47,8 @@
          width="263">
         <layout_panel
          follows="top|left|right"
-          user_resize="false" 
-         auto_resize="false" 
+         user_resize="false"
+         auto_resize="false"
          layout="topleft"
          height="20"
          name="my_panel">
@@ -123,7 +123,7 @@
           layout="topleft"
           left="2"
           top_pad="0"
-          height="132" 
+          height="132"
           name="callers_panel"
           user_resize="false" 
           width="280">
diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
index edc25348e4..44ab15a3f2 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
- legacy_header_height="18"
+ legacy_header_height="27"
  can_resize="true"
- height="420"
+ height="500"
  name="voice_effects"
  help_topic="voice_effects"
- title="PREVIEW VOICE MORPHING"
+ title="VOICE MORPHING"
  background_visible="true"
  follows="all"
  label="Places"
  layout="topleft"
- min_height="350"
- min_width="330"
- width="455">
+ min_height="360"
+ min_width="200"
+ width="300">
   <string name="no_voice_effect">
     (No Voice Morph)
   </string>
@@ -25,31 +25,43 @@
   <string name="new_voice_effect">
     (New!)
   </string>
-  <text
-   height="68"
+ <text
+   height="16"
    word_wrap="true"
    use_ellipses="true"
    type="string"
    follows="left|top|right"
    layout="topleft"
+   font="SansSerifBold"
+   color="White"
    left="10"
    name="status_text"
    right="-10"
-   top="25">
-To preview any of the Voice Morphing effects, click the Record button to record a short snippet of voice, then click any Voice Morph in the list to hear how it will sound.
-
-To reconnect to Nearby Voice simply close this window.
+   top="27">To Preview
+   </text>
+  <text
+   height="23"
+   word_wrap="true"
+   use_ellipses="true"
+   type="string"
+   follows="left|top|right"
+   layout="topleft"
+   left="10"
+   name="status_text"
+   right="-5"
+   top_pad="0">
+Record a sample, then click on a voice to hear how it will sound.
   </text>
   <button
    follows="left|top"
    height="23"
-   label="Record Sample"
+   label="Record"
    layout="topleft"
    left="10"
    name="record_btn"
    tool_tip="Record a sample of your voice."
    top_pad="5"
-   width="150">
+   width="100">
     <button.commit_callback
      function="VoiceEffect.Record" />
   </button>
@@ -61,22 +73,22 @@ To reconnect to Nearby Voice simply close this window.
    left_delta="0"
    name="record_stop_btn"
    top_delta="0"
-   width="150">
+   width="100">
     <button.commit_callback
      function="VoiceEffect.Stop" />
   </button>
   <text
-   height="18"
+   height="23"
    halign="right"
    use_ellipses="true"
    type="string"
    follows="left|top|right"
    layout="topleft"
    left_pad="10"
+   top_delta="10"
    name="voice_morphing_link"
-   right="-10"
-   top_delta="5">
-    [[URL] Get Voice Morphing]
+   right="-10">
+    [[URL] Subscribe Now]
   </text>
   <scroll_list
    bottom="-10"
@@ -88,14 +100,16 @@ To reconnect to Nearby Voice simply close this window.
    name="voice_effect_list"
    right="-10"
    tool_tip="Record a sample of your voice, then click an effect to preview."
-   top="128">
+   top="95">
     <scroll_list.columns
-     label="Voice Morph"
-     name="name" relative_width="0.41"/>
+     label="Voice Name"
+     name="name"
+     relative_width="0.60" />
     <scroll_list.columns
      dynamic_width="true"
      label="Expires"
      name="expires"
-	 relative_width="0.59" />
+     relative_width="0.30" />
   </scroll_list>
+
 </floater>
diff --git a/indra/newview/skins/default/xui/en/panel_voice_effect.xml b/indra/newview/skins/default/xui/en/panel_voice_effect.xml
index c575ca468c..93e79b7328 100644
--- a/indra/newview/skins/default/xui/en/panel_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/panel_voice_effect.xml
@@ -6,7 +6,7 @@
  name="panel_voice_effect"
  width="200">
   <string name="no_voice_effect">
-    No Voice Morph
+    Voice Morphing Off
   </string>
   <string name="preview_voice_effects">
     Preview Voice Morphing  ▶
@@ -19,11 +19,11 @@
    follows="left|top|right"
    height="23"
    name="voice_effect"
-   tool_tip="Select a Voice Morphing effect to change your voice."
+   tool_tip="Select a Voice Morph to change your voice"
    top_pad="0"
    width="200">
     <combo_box.item
-     label="No Voice Morph"
+     label="Voice Morphing Off"
      name="no_voice_effect"
 	 top_pad="0"
      value="0" />
-- 
cgit v1.2.3


From c7f0cabc0eb530efdbbc0bf74bf33979be23e6fa Mon Sep 17 00:00:00 2001
From: Vladimir Pchelko <pchelko@productengine.com>
Date: Fri, 18 Jun 2010 20:30:52 +0300
Subject: EXT-7821 FIXED Editor type was changed to the type as in "Name:"
 editor in "My Inventory"->"Object Profile".

Fix details:

Using line_editor instead of text_editor.
Enabled ascii filter for entering, because (for example) Russian charters corrupts outfit items and makes Edit Outfit very buggy.

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/608/

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_edit_wearable.xml     | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
index 950c4a5fdb..3106ed34ff 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
@@ -225,15 +225,17 @@ left="0"
 			 tool_tip="Female"
 			 top="7"
 			 width="16" />
-		 <text_editor
-			 follows="all"
-			 height="23"
-			 left="10"
-			 layout="topleft"
-			 max_length="300"
-			 name="description"
-			 top_pad="3"
-			 width="290" />
+            <line_editor
+             follows="all"
+             height="23"
+             layout="topleft"
+             left="10"
+             max_length="300"
+             name="description"
+             prevalidate_callback="ascii"
+             text_color="black"
+             top_pad="3"
+             width="290" />
 	 </panel>
 	 <panel
 		 follows="all"
-- 
cgit v1.2.3


From d8ec78e325ee3add1a5968ea0a3051de16958404 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Fri, 18 Jun 2010 10:51:45 -0700
Subject: EXT-7152 	 TOS breaks Critical Message in 2.0.0 and 2.0.1
 removed cancel button

---
 indra/newview/skins/default/xui/en/floater_critical.xml | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_critical.xml b/indra/newview/skins/default/xui/en/floater_critical.xml
index 7b5451553f..05c958e051 100644
--- a/indra/newview/skins/default/xui/en/floater_critical.xml
+++ b/indra/newview/skins/default/xui/en/floater_critical.xml
@@ -6,6 +6,7 @@
  height="500"
  layout="topleft"
  name="modal container"
+ open_centered="true"
  width="600">
     <button
      height="20"
@@ -16,15 +17,6 @@
      name="Continue"
      top="465"
      width="100" />
-    <button
-     height="20"
-     label="Cancel"
-     label_selected="Cancel"
-     layout="topleft"
-     left_delta="-468"
-     name="Cancel"
-     top_delta="0"
-     width="100" />
     <text
      type="string"
      length="1"
@@ -32,9 +24,9 @@
      font="SansSerif"
      height="20"
      layout="topleft"
-     left_delta="4"
+     left="20"
      name="tos_heading"
-     top_delta="-450"
+     top="20"
      width="552">
         Please read the following message carefully.
     </text>
-- 
cgit v1.2.3


From bde508f37b55fc462db81815db4d93aed15647cd Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Fri, 18 Jun 2010 15:20:50 -0700
Subject: MD-47488 WIP German translation for set 12

---
 .../skins/default/xui/de/floater_camera.xml        |  27 ++----
 .../skins/default/xui/de/floater_incoming_call.xml |   8 +-
 .../skins/default/xui/de/floater_snapshot.xml      |  23 +++--
 .../default/xui/de/floater_voice_controls.xml      |   8 +-
 .../skins/default/xui/de/inspect_object.xml        |   8 +-
 .../skins/default/xui/de/menu_hide_navbar.xml      |   1 +
 .../skins/default/xui/de/menu_inventory.xml        |   1 +
 .../skins/default/xui/de/menu_save_outfit.xml      |   2 +-
 indra/newview/skins/default/xui/de/menu_viewer.xml |  19 ++--
 .../newview/skins/default/xui/de/notifications.xml | 104 ++++++++++++++++++---
 .../skins/default/xui/de/panel_edit_shape.xml      |  18 ++--
 .../skins/default/xui/de/panel_edit_wearable.xml   |   7 +-
 .../skins/default/xui/de/panel_outfit_edit.xml     |  23 ++---
 .../default/xui/de/panel_outfits_inventory.xml     |   3 +-
 .../newview/skins/default/xui/de/panel_places.xml  |   4 +-
 .../default/xui/de/panel_preferences_advanced.xml  |   1 +
 .../skins/default/xui/de/panel_status_bar.xml      |   6 +-
 .../skins/default/xui/de/sidepanel_inventory.xml   |   9 +-
 indra/newview/skins/default/xui/de/strings.xml     |  64 +++++++++++--
 19 files changed, 234 insertions(+), 102 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/de/floater_camera.xml b/indra/newview/skins/default/xui/de/floater_camera.xml
index 87371b05e3..418e717bf6 100644
--- a/indra/newview/skins/default/xui/de/floater_camera.xml
+++ b/indra/newview/skins/default/xui/de/floater_camera.xml
@@ -9,35 +9,28 @@
 	<floater.string name="move_tooltip">
 		Kamera nach oben, unten, links und rechts bewegen
 	</floater.string>
-	<floater.string name="orbit_mode_title">
-		Kreisen
+	<floater.string name="camera_modes_title">
+		Kameramodi
 	</floater.string>
 	<floater.string name="pan_mode_title">
-		Schwenken
+		Kreisen - Zoomen - Schwenken
 	</floater.string>
-	<floater.string name="avatar_view_mode_title">
-		Voreinstellungen
+	<floater.string name="presets_mode_title">
+		Ansichten
 	</floater.string>
 	<floater.string name="free_mode_title">
 		Objekt ansehen
 	</floater.string>
 	<panel name="controls">
-		<joystick_track name="cam_track_stick" tool_tip="Kamera nach oben, unten, links und rechts bewegen"/>
 		<panel name="zoom" tool_tip="Kamera auf Fokus zoomen">
+			<joystick_rotate name="cam_rotate_stick" tool_tip="Kamera um Fokus kreisen"/>
 			<slider_bar name="zoom_slider" tool_tip="Kamera auf Fokus zoomen"/>
-		</panel>
-		<joystick_rotate name="cam_rotate_stick" tool_tip="Kamera um Fokus kreisen"/>
-		<panel name="camera_presets">
-			<button name="rear_view" tool_tip="Hinteransicht"/>
-			<button name="group_view" tool_tip="Gruppen-Ansicht"/>
-			<button name="front_view" tool_tip="Vorderansicht"/>
-			<button name="mouselook_view" tool_tip="Mouselook"/>
+			<joystick_track name="cam_track_stick" tool_tip="Kamera nach oben, unten, links und rechts bewegen"/>
 		</panel>
 	</panel>
 	<panel name="buttons">
-		<button label="" name="orbit_btn" tool_tip="Kamera kreisen"/>
-		<button label="" name="pan_btn" tool_tip="Kamera schwenken"/>
-		<button label="" name="avatarview_btn" tool_tip="Voreinstellungen"/>
-		<button label="" name="freecamera_btn" tool_tip="Objekt ansehen"/>
+		<button label="" name="presets_btn" tool_tip="Ansichten"/>
+		<button label="" name="pan_btn" tool_tip="Kreisen - Zoomen - Schwenken"/>
+		<button label="" name="avatarview_btn" tool_tip="Kameramodi"/>
 	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_incoming_call.xml b/indra/newview/skins/default/xui/de/floater_incoming_call.xml
index 740085599f..0312f7dfe9 100644
--- a/indra/newview/skins/default/xui/de/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/de/floater_incoming_call.xml
@@ -16,7 +16,13 @@
 		ist einem Voice-Konferenz-Chat beigetreten.
 	</floater.string>
 	<floater.string name="VoiceInviteGroup">
-		ist einem Voice-Chat mit der Gruppe [GROUP] beigetreten.
+		ist dem &apos;[GROUP]&apos; Voice-Kanal beigetreten.
+	</floater.string>
+	<floater.string name="VoiceInviteQuestionGroup">
+		Möchten Sie [CURRENT_CHAT] verlassen und dem Gespräch mit &apos;[GROUP]&apos; beitreten?
+	</floater.string>
+	<floater.string name="VoiceInviteQuestionDefault">
+		Möchten Sie [CURRENT_CHAT] verlassen und diesem Voice-Chat beitreten?
 	</floater.string>
 	<text name="question">
 		Möchten Sie [CURRENT_CHAT] verlassen und diesem Voice-Chat beitreten?
diff --git a/indra/newview/skins/default/xui/de/floater_snapshot.xml b/indra/newview/skins/default/xui/de/floater_snapshot.xml
index 4c417710bd..a656ffb894 100644
--- a/indra/newview/skins/default/xui/de/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/de/floater_snapshot.xml
@@ -5,12 +5,19 @@
 	</floater.string>
 	<button label="Foto aktualisieren" name="new_snapshot_btn"/>
 	<line_editor label="Beschreibung" name="description"/>
-	<button label="Foto freigeben" name="share"/>
-	<button label="Ins Internet stellen" name="share_to_web"/>
-	<button label="Objekt in meinem Inventar speichern" name="save_to_inventory"/>
-	<button label="Foto speichern" name="save"/>
-	<button label="Foto per E-Mail senden" name="share_to_email"/>
-	<button label="Auf meinem Computer speichern" name="save_to_computer"/>
-	<button label="Als Profilbild festlegen" name="set_profile_pic"/>
-	<button label="Zurück" name="cancel"/>
+	<panel name="panel_snapshot_main">
+		<button label="Foto freigeben" name="share"/>
+		<button label="Foto speichern" name="save"/>
+		<button label="Als Profilbild festlegen" name="set_profile_pic"/>
+	</panel>
+	<panel name="panel_snapshot_share">
+		<button label="Ins Internet stellen" name="share_to_web"/>
+		<button label="Foto per E-Mail senden" name="share_to_email"/>
+		<button label="Zurück" name="cancel_share"/>
+	</panel>
+	<panel name="panel_snapshot_save">
+		<button label="Objekt in meinem Inventar speichern" name="save_to_inventory"/>
+		<button label="Auf meinem Computer speichern" name="save_to_computer"/>
+		<button label="Zurück" name="cancel_save"/>
+	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_voice_controls.xml b/indra/newview/skins/default/xui/de/floater_voice_controls.xml
index aa582838a4..07b7689cd0 100644
--- a/indra/newview/skins/default/xui/de/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/de/floater_voice_controls.xml
@@ -19,8 +19,10 @@
 		<layout_panel name="my_panel">
 			<text name="user_text" value="Mein Avatar:"/>
 		</layout_panel>
-		<layout_panel name="leave_call_btn_panel">
-			<button label="Anruf beenden" name="leave_call_btn"/>
-		</layout_panel>
+		<layout_stack name="voice_effect_and_leave_call_stack">
+			<layout_panel name="leave_call_btn_panel">
+				<button label="Anruf beenden" name="leave_call_btn"/>
+			</layout_panel>
+		</layout_stack>
 	</layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/inspect_object.xml b/indra/newview/skins/default/xui/de/inspect_object.xml
index ede14a37d7..72b8235828 100644
--- a/indra/newview/skins/default/xui/de/inspect_object.xml
+++ b/indra/newview/skins/default/xui/de/inspect_object.xml
@@ -8,7 +8,7 @@
 		Von [CREATOR]
 	</string>
 	<string name="CreatorAndOwner">
-		von [CREATOR]
+		Von [CREATOR]
 Besitzer [OWNER]
 	</string>
 	<string name="Price">
@@ -23,16 +23,16 @@ Besitzer [OWNER]
 	<string name="Sit">
 		Sitzen
 	</string>
-	<text name="object_name" value="Wirklich langen Objektnamen als Test eingeben"/>
+	<text name="object_name" value="Test für ein Objektname der sehr lange ist und über zwei Zeilen geht."/>
 	<text name="object_creator">
 		von secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about
 Besitzer secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about
 	</text>
 	<text name="price_text">
-		300.000 L$
+		30.000 L$
 	</text>
 	<text name="object_description">
-		Dies ist eine wirklich lange Beschreibung für ein Objekt, mindestens 80 Zeichen lang oder jetzt schon 120 Zeichen. Niemand weiß es genau.
+		Dies ist eine wirklich lange Beschreibung für ein Objekt, mindestens 80 Zeichen lang oder jetzt schon mindestens 120 Zeichen lang und länger als der englische Originaltext. Niemand weiß es genau.
 	</text>
 	<text name="object_media_url">
 		http://www.superdupertest.com
diff --git a/indra/newview/skins/default/xui/de/menu_hide_navbar.xml b/indra/newview/skins/default/xui/de/menu_hide_navbar.xml
index 32a6823b35..9acf96dc6d 100644
--- a/indra/newview/skins/default/xui/de/menu_hide_navbar.xml
+++ b/indra/newview/skins/default/xui/de/menu_hide_navbar.xml
@@ -2,4 +2,5 @@
 <menu name="hide_navbar_menu">
 	<menu_item_check label="Navigationsleiste anzeigen" name="ShowNavbarNavigationPanel"/>
 	<menu_item_check label="Favoritenleiste anzeigen" name="ShowNavbarFavoritesPanel"/>
+	<menu_item_check label="Mini-Standortleiste anzeigen" name="ShowMiniLocationPanel"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/de/menu_inventory.xml b/indra/newview/skins/default/xui/de/menu_inventory.xml
index 306ef19de3..f6139a0ea0 100644
--- a/indra/newview/skins/default/xui/de/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/de/menu_inventory.xml
@@ -80,6 +80,7 @@
 	<menu label="An HUD hängen" name="Attach To HUD"/>
 	<menu_item_call label="Bearbeiten" name="Wearable Edit"/>
 	<menu_item_call label="Anziehen" name="Wearable Wear"/>
+	<menu_item_call label="Hinzufügen" name="Wearable Add"/>
 	<menu_item_call label="Ausziehen" name="Take Off"/>
 	<menu_item_call label="--keine Optionen--" name="--no options--"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/de/menu_save_outfit.xml b/indra/newview/skins/default/xui/de/menu_save_outfit.xml
index 70bca077ab..986c78b318 100644
--- a/indra/newview/skins/default/xui/de/menu_save_outfit.xml
+++ b/indra/newview/skins/default/xui/de/menu_save_outfit.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="save_outfit_menu">
 	<menu_item_call label="Speichern" name="save_outfit"/>
-	<menu_item_call label="Als neue Datei speichern" name="save_as_new_outfit"/>
+	<menu_item_call label="Speichern unter" name="save_as_new_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml
index c416ebd7c1..38ef1b0421 100644
--- a/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -7,10 +7,10 @@
 		</menu_item_call>
 		<menu_item_call label="L$ kaufen" name="Buy and Sell L$"/>
 		<menu_item_call label="Mein Profil" name="Profile"/>
-		<menu_item_call label="Mein Aussehen" name="Appearance"/>
 		<menu_item_check label="Mein Inventar" name="Inventory"/>
 		<menu_item_check label="Mein Inventar" name="ShowSidetrayInventory"/>
 		<menu_item_check label="Meine Gesten" name="Gestures"/>
+		<menu_item_check label="Meine Stimme" name="ShowVoice"/>
 		<menu label="Mein Status" name="Status">
 			<menu_item_call label="Abwesend" name="Set Away"/>
 			<menu_item_call label="Beschäftigt" name="Set Busy"/>
@@ -70,6 +70,12 @@
 		<menu_item_call label="Verknüpfung" name="Link"/>
 		<menu_item_call label="Verknüpfung auflösen" name="Unlink"/>
 		<menu_item_check label="Verknüpfte Teile bearbeiten" name="Edit Linked Parts"/>
+		<menu label="Verknüpfte Teile auswählen" name="Select Linked Parts">
+			<menu_item_call label="Nächstes Teil auswählen" name="Select Next Part"/>
+			<menu_item_call label="Vorheriges Teil auswählen" name="Select Previous Part"/>
+			<menu_item_call label="Nächsten Teil mit einsschließen" name="Include Next Part"/>
+			<menu_item_call label="Vorherige Teile mit einschließen" name="Include Previous Part"/>
+		</menu>
 		<menu_item_call label="Fokus auf Auswahl" name="Focus on Selection"/>
 		<menu_item_call label="Auf Auswahl zoomen" name="Zoom to Selection"/>
 		<menu label="Objekt" name="Object">
@@ -100,11 +106,11 @@
 			<menu_item_call label="Auswahl für Raster verwenden" name="Use Selection for Grid"/>
 			<menu_item_call label="Rasteroptionen" name="Grid Options"/>
 		</menu>
-		<menu label="Verknüpfte Teile auswählen" name="Select Linked Parts">
-			<menu_item_call label="Nächstes Teil auswählen" name="Select Next Part"/>
-			<menu_item_call label="Vorheriges Teil auswählen" name="Select Previous Part"/>
-			<menu_item_call label="Nächsten Teil mit einsschließen" name="Include Next Part"/>
-			<menu_item_call label="Vorherige Teile mit einschließen" name="Include Previous Part"/>
+		<menu label="Hochladen" name="Upload">
+			<menu_item_call label="Bild ([COST] L$)..." name="Upload Image"/>
+			<menu_item_call label="Sound ([COST] L$)..." name="Upload Sound"/>
+			<menu_item_call label="Animation ([COST] L$)..." name="Upload Animation"/>
+			<menu_item_call label="Mehrfach-Upload ([COST] L$ pro Datei)..." name="Bulk Upload"/>
 		</menu>
 	</menu>
 	<menu label="Hilfe" name="Help">
@@ -189,7 +195,6 @@
 			<menu_item_call label="Hineinzoomen" name="Zoom In"/>
 			<menu_item_call label="Zoom-Standard" name="Zoom Default"/>
 			<menu_item_call label="Wegzoomen" name="Zoom Out"/>
-			<menu_item_call label="Vollbild" name="Toggle Fullscreen"/>
 		</menu>
 		<menu_item_call label="Debug-Einstellungen anzeigen" name="Debug Settings"/>
 		<menu_item_check label="Menü „Entwickler“ anzeigen" name="Debug Mode"/>
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index aa1ee71c3f..408ece9690 100644
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -479,7 +479,9 @@ Sie können die Grafikqualität unter Einstellungen &gt; Grafik wieder erhöhen.
 		Die Region [REGION] erlaubt kein Terraforming.
 	</notification>
 	<notification name="CannotCopyWarning">
-		Sie sind nicht berechtigt, dieses Objekt zu kopieren und verlieren es aus Ihrem Inventar, wenn Sie es weggeben. Möchten Sie dieses Objekt anbieten?
+		Sie sind nicht berechtigt, die folgenden Objekte zu kopieren:
+[ITEMS]
+Wenn Sie diese weitergeben, werden sie aus Ihrem Inventar entfernt. Möchten Sie diese Objekte wirklich weggeben?
 		<usetemplate name="okcancelbuttons" notext="Nein" yestext="Ja"/>
 	</notification>
 	<notification name="CannotGiveItem">
@@ -947,6 +949,26 @@ Sie sind nicht berechtigt, Land für die aktive Gruppe zu kaufen.
 			<button name="Cancel" text="Abbrechen"/>
 		</form>
 	</notification>
+	<notification label="Kleidungstyp speichern" name="SaveWearableAs">
+		Objekt in meinem Inventar speichern als:
+		<form name="form">
+			<input name="message">
+				[DESC] (neu)
+			</input>
+			<button name="Offer" text="OK"/>
+			<button name="Cancel" text="Abbrechen"/>
+		</form>
+	</notification>
+	<notification label="Outfit neu benennen" name="RenameOutfit">
+		Neuer Outfit-Name:
+		<form name="form">
+			<input name="new_name">
+				[NAME]
+			</input>
+			<button name="Offer" text="OK"/>
+			<button name="Cancel" text="Abbrechen"/>
+		</form>
+	</notification>
 	<notification name="RemoveFromFriends">
 		Möchten Sie [FIRST_NAME] [LAST_NAME] aus Ihrer Freundesliste entfernen?
 		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
@@ -1522,9 +1544,9 @@ Möchten Sie unsere Knowledgebase besuchen, um mehr Informationen über Alterein
 		Aufgrund Ihrer Alterseinstufung dürfen Sie diese Region nicht betreten.
 	</notification>
 	<notification name="RegionEntryAccessBlocked_Change">
-		Sie dürfen diese Region aufgrund der Einstellung Ihrer Alterseinstufung nicht betreten.
+		Sie dürfen diese Region aufgrund der Einstellung Ihrer Inhaltseinstufung nicht betreten.
 
-Klicken Sie auf „Einstellung ändern“, um Ihre Einstellung für Altereinstufung sofort zu ändern und Zugang zu erhalten. Sie können ab sofort [REGIONMATURITY]-Inhalt suchen und auf diesen zugreifen. Falls Sie diese Einstellung später rückgängig machen möchten, gehen Sie zu Bearbeiten &gt; Einstellungen &gt; Allgemein.
+Bitte ändern Sie Ihre Einstellungen bezüglich der Inhaltseinstufung, um die gewünschte Region zu betreten. Danach können Sie nach [REGIONMATURITY]-Inhalt suchen und auf diesen zugreifen. Um die Veränderungen rückgängig zu machen, gehen Sie zu Ich &gt; Einstellungen &gt; Allgemein.
 		<form name="form">
 			<button name="OK" text="Einstellung ändern"/>
 			<button name="Cancel" text="Schließen"/>
@@ -2290,15 +2312,6 @@ Versuchen Sie es in einigen Minuten erneut.
 	</notification>
 	<notification name="ObjectGiveItem">
 		Ein Objekt namens [OBJECTFROMNAME] von [NAME_SLURL] hat Ihnen folgendes übergeben [OBJECTTYPE]:
-[ITEM_SLURL]
-		<form name="form">
-			<button name="Keep" text="Behalten"/>
-			<button name="Discard" text="Verwerfen"/>
-			<button name="Mute" text="Ignorieren"/>
-		</form>
-	</notification>
-	<notification name="ObjectGiveItemUnknownUser">
-		Ein Objekt namens [OBJECTFROMNAME] von (einem unbekannten Einwohner) hat Ihnen folgendes übergeben [OBJECTTYPE]:
 [ITEM_SLURL]
 		<form name="form">
 			<button name="Keep" text="Behalten"/>
@@ -2551,6 +2564,21 @@ Klicken Sie auf  &apos;Akzeptieren &apos;, um dem Chat beizutreten, oder auf  &a
 	<notification name="VoiceLoginRetry">
 		Wir erstellen einen Voice-Kanal für Sie. Bitte warten Sie einen Moment.
 	</notification>
+	<notification name="VoiceEffectsExpired">
+		Ein oder mehrere Ihrer Voice-Morph-Abos ist/sind abgelaufen.
+[[URL] Hier klicken], um Ihr Abo zu erneuern.
+	</notification>
+	<notification name="VoiceEffectsExpiredInUse">
+		Das aktive Voice-Morph-Abo ist abgelaufen. Ihre normalen Voice-Einstellungen werden angewendet.
+[[URL] Hier klicken], um Ihr Abo zu erneuern.
+	</notification>
+	<notification name="VoiceEffectsWillExpire">
+		Ein oder mehrere Ihrer Voice-Morph-Abos werden in weniger als [INTERVAL] Tagen ablaufen.
+[[URL] Hier klicken], um Ihr Abo zu erneuern.
+	</notification>
+	<notification name="VoiceEffectsNew">
+		Neue Voice-Morph-Effekte sind erhältlich!
+	</notification>
 	<notification name="Cannot enter parcel: not a group member">
 		Nur Mitglieder einer bestimmten Gruppe dürfen diesen Bereich betreten.
 	</notification>
@@ -2617,10 +2645,58 @@ Diese werden für ein paar Sekunden sicherheitshalber gesperrt.
 Die Schaltfläche wird angezeigt, wenn genügend Platz vorhanden ist.
 	</notification>
 	<notification name="ShareNotification">
-		Artikel aus Inventar auf eine Person im Fenster „Einwohner auswählen“ ziehen.
+		Wählen Sie Einwohner aus, für die Sie das Objekt freigeben möchten.
+	</notification>
+	<notification name="ShareItemsConfirmation">
+		Möchten Sie diese Objekte wirklich für andere freigeben:
+
+[ITEMS]
+
+Für folgende Einwohner:
+
+[RESIDENTS]
+		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
+	</notification>
+	<notification name="ItemsShared">
+		Objekte wurden erfolgreich freigegeben.
 	</notification>
 	<notification name="AvatarRezNotification">
-		Avatar &apos;[NAME]&apos; wurde in [TIME] Sekunden gerezzt.
+		(Seit [EXISTENCE] Sekunden inworld )
+Avatar &apos;[NAME]&apos; wurde in [TIME] Sekunden gerezzt.
+	</notification>
+	<notification name="AvatarRezSelfBakedDoneNotification">
+		(Seit [EXISTENCE] Sekunden inworld )
+Ihr Outfit wurde in [TIME] Sekunden gebacken.
+	</notification>
+	<notification name="AvatarRezSelfBakedUpdateNotification">
+		(Seit [EXISTENCE] Sekunden inworld )
+Nach [TIME] Sekunden wurde eine Aktualisierung Ihres Aussehens gesendet.
+[STATUS]
+	</notification>
+	<notification name="NoConnect">
+		Es gibt Probleme mit der Verbindung mit [PROTOCOL] [HOSTID].
+Bitte überprüfen Sie Ihre Netzwerk- und Firewalleinstellungen.
+		<form name="form">
+			<button name="OK" text="OK"/>
+		</form>
+	</notification>
+	<notification name="NoVoiceConnect">
+		Verbindung mit Voice-Server ist leider nicht möglich:
+
+[HOSTID]
+
+Voice-Kommunikation ist leider nicht verfügbar.
+Bitte überprüfen Sie Ihr Netzwerk- und Firewall-Setup.
+		<form name="form">
+			<button name="OK" text="OK"/>
+		</form>
+	</notification>
+	<notification name="AvatarRezSelfBakeNotification">
+		(Seit [EXISTENCE] Sekunden inworld )
+Die [RESOLUTION]-gebakene Textur für &apos;[BODYREGION]&apos; wurde in [TIME] Sekunden hochgeladen.
+	</notification>
+	<notification name="ConfirmMuteAll">
+		<usetemplate ignoretext="Confirm before I mute all participants in a group call" name="okcancelignore" notext="Abbrechen" yestext="OK"/>
 	</notification>
 	<global name="UnsupportedCPU">
 		- Ihre CPU-Geschwindigkeit entspricht nicht den Mindestanforderungen.
diff --git a/indra/newview/skins/default/xui/de/panel_edit_shape.xml b/indra/newview/skins/default/xui/de/panel_edit_shape.xml
index 393a586903..d04dba7a3b 100644
--- a/indra/newview/skins/default/xui/de/panel_edit_shape.xml
+++ b/indra/newview/skins/default/xui/de/panel_edit_shape.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_shape_panel">
-	<panel name="avatar_sex_panel">
-		<text name="gender_text">
-			Geschlecht:
-		</text>
-		<radio_group name="sex_radio">
-			<radio_item label="weiblich" name="radio"/>
-			<radio_item label="Männlich" name="radio2"/>
-		</radio_group>
-	</panel>
+	<string name="meters">
+		Meter
+	</string>
+	<string name="feet">
+		Fuß
+	</string>
+	<string name="height">
+		Höhe:
+	</string>
 	<panel label="Hemd" name="accordion_panel">
 		<accordion name="wearable_accordion">
 			<accordion_tab name="shape_body_tab" title="Körper"/>
diff --git a/indra/newview/skins/default/xui/de/panel_edit_wearable.xml b/indra/newview/skins/default/xui/de/panel_edit_wearable.xml
index 17a632b46e..7294a0b34f 100644
--- a/indra/newview/skins/default/xui/de/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/de/panel_edit_wearable.xml
@@ -72,7 +72,7 @@
 	<string name="jacket_desc_text">
 		Jacke:
 	</string>
-	<string name="skirt_skirt_desc_text">
+	<string name="skirt_desc_text">
 		Rock:
 	</string>
 	<string name="gloves_desc_text">
@@ -94,11 +94,6 @@
 	<panel label="Hemd" name="wearable_type_panel">
 		<text name="description_text" value="Form:"/>
 	</panel>
-	<panel label="gear_buttom_panel" name="gear_buttom_panel">
-		<button name="friends_viewsort_btn" tool_tip="Optionen"/>
-		<button name="add_btn" tool_tip="TODO"/>
-		<button name="del_btn" tool_tip="TODO"/>
-	</panel>
 	<panel name="button_panel">
 		<button label="Speichern unter" name="save_as_button"/>
 		<button label="Zurücksetzen" name="revert_button"/>
diff --git a/indra/newview/skins/default/xui/de/panel_outfit_edit.xml b/indra/newview/skins/default/xui/de/panel_outfit_edit.xml
index 5ff088d41c..91ba94b3d6 100644
--- a/indra/newview/skins/default/xui/de/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/de/panel_outfit_edit.xml
@@ -11,7 +11,7 @@
 	<string name="Filter.All" value="Alle"/>
 	<string name="Filter.Clothes/Body" value="Kleider/Körper"/>
 	<string name="Filter.Objects" value="Objekte"/>
-	<button label="Bearbeiten" name="edit_wearable_btn"/>
+	<string name="Filter.Custom" value="Benutzerspezifischer Filter"/>
 	<text name="title" value="Outfit bearbeiten"/>
 	<panel label="bottom_panel" name="header_panel">
 		<panel label="bottom_panel" name="outfit_name_and_status">
@@ -21,25 +21,16 @@
 	</panel>
 	<layout_stack name="im_panels">
 		<layout_panel label="IM Steuerkonsole" name="outfit_wearables_panel">
-			<scroll_list name="look_items_list">
-				<scroll_list.columns label="Look-Artikel" name="look_item"/>
-				<scroll_list.columns label="Outfit-Artikel sortieren" name="look_item_sort"/>
-			</scroll_list>
-			<panel label="bottom_panel" name="edit_panel"/>
-		</layout_panel>
-		<layout_panel name="add_wearables_panel">
-			<filter_editor label="Filter" name="look_item_filter"/>
 			<layout_stack name="filter_panels">
-				<layout_panel label="IM Steuerkonsole" name="filter_button_panel">
-					<text name="add_to_outfit_label" value="Zum Outfit hinzufügen:"/>
-					<button label="O" name="filter_button"/>
+				<layout_panel name="add_button_and_combobox">
+					<button label="Mehr hinzufügen" name="show_add_wearables_btn"/>
+				</layout_panel>
+				<layout_panel name="filter_panel">
+					<filter_editor label="Tragbare Inventarobjekte filtern" name="look_item_filter"/>
 				</layout_panel>
 			</layout_stack>
-			<panel label="add_wearables_button_bar" name="add_wearables_button_bar">
-				<button label="O" name="folder_view_btn"/>
-				<button label="L" name="list_view_btn"/>
-			</panel>
 		</layout_panel>
+		<layout_panel name="add_wearables_panel"/>
 	</layout_stack>
 	<panel name="save_revert_button_bar">
 		<button label="Speichern" name="save_btn"/>
diff --git a/indra/newview/skins/default/xui/de/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/de/panel_outfits_inventory.xml
index f695d67d1b..8b04cecd68 100644
--- a/indra/newview/skins/default/xui/de/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/de/panel_outfits_inventory.xml
@@ -7,8 +7,7 @@
 	<panel name="bottom_panel">
 		<button name="options_gear_btn" tool_tip="Zusätzliche Optionen anzeigen"/>
 		<dnd_button name="trash_btn" tool_tip="Auswahl löschen"/>
-		<button label="Outfit speichern" name="make_outfit_btn" tool_tip="Aussehen als Outfit speichern"/>
+		<button label="Speichern unter" name="save_btn"/>
 		<button label="Anziehen" name="wear_btn" tool_tip="Ausgewähltes Outfit tragen"/>
-		<button label="Outfit bearbeiten" name="edit_current_outfit_btn"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_places.xml b/indra/newview/skins/default/xui/de/panel_places.xml
index 37ccdbeb7d..bd5c1c8ffe 100644
--- a/indra/newview/skins/default/xui/de/panel_places.xml
+++ b/indra/newview/skins/default/xui/de/panel_places.xml
@@ -5,12 +5,12 @@
 	<filter_editor label="Meine Orte filtern" name="Filter"/>
 	<panel name="button_panel">
 		<button label="Teleportieren" name="teleport_btn" tool_tip="Zu ausgewähltem Standort teleportieren"/>
-		<button label="Karte" name="map_btn" width="60"/>
+		<button label="Karte" name="map_btn" tool_tip="Den entsprechenden Standort auf der Karte anzeigen" width="60"/>
 		<button label="Bearbeiten" name="edit_btn" tool_tip="Landmarken-Info bearbeiten"/>
 		<button label="▼" name="overflow_btn" tool_tip="Zusätzliche Optionen anzeigen"/>
 		<button label="Speichern" name="save_btn" width="66"/>
 		<button label="Abbrechen" name="cancel_btn" width="66"/>
 		<button label="Schließen" name="close_btn"/>
-		<button label="Profil" name="profile_btn"/>
+		<button label="Profil" name="profile_btn" tool_tip="Ortsprofil anzeigen"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml
index f9d5c93dc0..52e616a402 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml
@@ -13,6 +13,7 @@
 	</text>
 	<check_box label="Bauen/Bearbeiten" name="edit_camera_movement" tool_tip="Automatische Kamerapositionierung bei Wechsel in und aus dem Bearbeitungsmodus verwenden"/>
 	<check_box label="Aussehen" name="appearance_camera_movement" tool_tip="Automatische Kamerapositionierung im Bearbeitenmodus verwenden"/>
+	<check_box initial_value="true" label="Sidebar" name="appearance_sidebar_positioning" tool_tip="Use automatic camera positioning for sidebar"/>
 	<check_box label="Mich im Mouselook anzeigen" name="first_person_avatar_visible"/>
 	<check_box label="Mit Pfeiltasten bewegen" name="arrow_keys_move_avatar_check"/>
 	<check_box label="2-mal-drücken-halten, um zu rennen" name="tap_tap_hold_to_run"/>
diff --git a/indra/newview/skins/default/xui/de/panel_status_bar.xml b/indra/newview/skins/default/xui/de/panel_status_bar.xml
index 3dc6997320..005290c1ff 100644
--- a/indra/newview/skins/default/xui/de/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/de/panel_status_bar.xml
@@ -21,8 +21,10 @@
 	<panel.string name="buycurrencylabel">
 		[AMT] L$
 	</panel.string>
-	<button label="" label_selected="" name="buycurrency" tool_tip="Mein Kontostand"/>
-	<button label="L$ kaufen" name="buyL" tool_tip="Hier klicken, um mehr L$ zu kaufen"/>
+	<panel name="balance_bg">
+		<text name="balance" tool_tip="Mein Kontostand" value="20 L$"/>
+		<button label="L$ kaufen" name="buyL" tool_tip="Hier klicken, um mehr L$ zu kaufen"/>
+	</panel>
 	<text name="TimeText" tool_tip="Aktuelle Zeit (Pazifik)">
 		24:00 H PST
 	</text>
diff --git a/indra/newview/skins/default/xui/de/sidepanel_inventory.xml b/indra/newview/skins/default/xui/de/sidepanel_inventory.xml
index 26bde94ffd..96dd181854 100644
--- a/indra/newview/skins/default/xui/de/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/de/sidepanel_inventory.xml
@@ -2,11 +2,12 @@
 <panel label="Sonstiges" name="objects panel">
 	<panel label="" name="sidepanel__inventory_panel">
 		<panel name="button_panel">
-			<button label="Profil" name="info_btn"/>
-			<button label="Teilen" name="share_btn"/>
-			<button label="Anziehen" name="wear_btn"/>
+			<button label="Profil" name="info_btn" tool_tip="Objektprofil anzeigen"/>
+			<button label="Teilen" name="share_btn" tool_tip="Inventarobjekt teilen"/>
+			<button label="Shop" name="shop_btn" tool_tip="Marktplatz-Webseite öffnen"/>
+			<button label="Anziehen" name="wear_btn" tool_tip="Ausgewähltes Outfit tragen"/>
 			<button label="Wiedergeben" name="play_btn"/>
-			<button label="Teleportieren" name="teleport_btn"/>
+			<button label="Teleportieren" name="teleport_btn" tool_tip="Zu ausgewähltem Standort teleportieren"/>
 		</panel>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index 03c858c880..bc4f20df26 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -100,6 +100,12 @@
 	<string name="LoginDownloadingClothing">
 		Kleidung wird geladen...
 	</string>
+	<string name="CertExpired">
+		Das vom Grid ausgegebene Zertifikate ist abgelaufen.  Bitte überprüfen Sie Ihre Systemuhr oder kontaktieren Sie Ihren Grid-Administrator.
+	</string>
+	<string name="CertInvalidSignature">
+		Die Zertifikatsunterschrift des Gridservers konnte nicht bestätigt werden.  Bitte kontaktieren Sie Ihren Grid-Administrator.
+	</string>
 	<string name="LoginFailedNoNetwork">
 		Netzwerk Fehler: Eine Verbindung konnte nicht hergestellt werden. Bitte überprüfen Sie Ihre Netzwerkverbindung.
 	</string>
@@ -735,6 +741,12 @@
 	<string name="land_type_unknown">
 		(unbekannt)
 	</string>
+	<string name="Estate / Full Region">
+		Grundstück / Vollständige Region
+	</string>
+	<string name="Mainland / Full Region">
+		Mainland / Vollständige Region
+	</string>
 	<string name="all_files">
 		Alle Dateien
 	</string>
@@ -843,6 +855,9 @@
 	<string name="NewWearable">
 		Neue/r/s [WEARABLE_ITEM]
 	</string>
+	<string name="CreateNewWearable">
+		[WEARABLE_TYPE] erstellen
+	</string>
 	<string name="next">
 		Weiter
 	</string>
@@ -3390,12 +3405,6 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="answered_call">
 		Ihr Anruf wurde entgegengenommen
 	</string>
-	<string name="started_call">
-		haben/hat einen Anruf initiiert
-	</string>
-	<string name="joined_call">
-		ist dem Gespräch beigetreten
-	</string>
 	<string name="ringing-im">
 		Verbindung wird hergestellt...
 	</string>
@@ -3486,6 +3495,9 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="session_initialization_timed_out_error">
 		Die Initialisierung der Sitzung ist fehlgeschlagen
 	</string>
+	<string name="voice_morphing_url">
+		http://secondlife.com/landing/voicemorphing
+	</string>
 	<string name="paid_you_ldollars">
 		[NAME] hat Ihnen [AMOUNT] L$ bezahlt.
 	</string>
@@ -3605,6 +3617,18 @@ Missbrauchsbericht
 	<string name="Contents">
 		Inhalt
 	</string>
+	<string name="Female - Excuse me">
+		Weiblich - Räuspern
+	</string>
+	<string name="Female - Get lost">
+		Weiblich - Get lost
+	</string>
+	<string name="Female - Blow kiss">
+		Weiblich - Kusshand
+	</string>
+	<string name="Female - Boo">
+		Weiblich  - Buh
+	</string>
 	<string name="AvatarBirthDateFormat">
 		[mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt]
 	</string>
@@ -3614,4 +3638,32 @@ Missbrauchsbericht
 	<string name="texture_load_dimensions_error">
 		Bilder, die größer sind als [WIDTH]*[HEIGHT] können nicht geladen werden
 	</string>
+	<string name="words_separator" value=","/>
+	<string name="server_is_down">
+		Trotz all unserer Bemühungen ist ein unerwarteter Fehler aufgetreten.
+
+	Bitte überprüfen Sie status.secondlifegrid.net, um festzustellen, ob ein Problem besteht.  
+        Falls Sie weiterhin Problem haben, überprüfen Sie bitte Ihre Netzwerk- und Firewalleinstellungen.
+	</string>
+	<string name="dateTimeWeekdaysNames">
+		Sonntag:Montag:Dienstag:Mittwoch:Donnerstag:Freitag:Samstag
+	</string>
+	<string name="dateTimeWeekdaysShortNames">
+		So:Mo:Di:Mi:Do:Fr:Sa
+	</string>
+	<string name="dateTimeMonthNames">
+		Januar:Februar:März:April:Mai:Juni:Juli:August:September:Oktober:November:Dezember
+	</string>
+	<string name="dateTimeMonthShortNames">
+		Jan:Feb:Mär:Apr:Mai:Jun:Jul:Aug:Sep:Okt:Nov:Dez
+	</string>
+	<string name="dateTimeDayFormat">
+		[MDAY]
+	</string>
+	<string name="dateTimeAM">
+		Uhr
+	</string>
+	<string name="dateTimePM">
+		Uhr
+	</string>
 </strings>
-- 
cgit v1.2.3


From 8ab38d0a05215c3c25bf796ef3296e86fd188c81 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Fri, 18 Jun 2010 15:21:09 -0700
Subject: MD-47488 WIP German translation for set 12, new files

---
 .../skins/default/xui/de/floater_voice_effect.xml  | 29 ++++++++++++++++++++++
 .../skins/default/xui/de/menu_cof_attachment.xml   |  4 +++
 .../skins/default/xui/de/menu_cof_body_part.xml    |  5 ++++
 .../skins/default/xui/de/menu_cof_clothing.xml     |  7 ++++++
 .../newview/skins/default/xui/de/menu_cof_gear.xml |  5 ++++
 .../skins/default/xui/de/menu_outfit_gear.xml      | 26 +++++++++++++++++++
 .../skins/default/xui/de/menu_outfit_tab.xml       |  9 +++++++
 .../default/xui/de/menu_wearable_list_item.xml     | 13 ++++++++++
 .../skins/default/xui/de/panel_voice_effect.xml    | 15 +++++++++++
 9 files changed, 113 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/de/floater_voice_effect.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_cof_attachment.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_cof_body_part.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_cof_clothing.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_cof_gear.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_outfit_gear.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_outfit_tab.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_wearable_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/de/panel_voice_effect.xml

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/de/floater_voice_effect.xml b/indra/newview/skins/default/xui/de/floater_voice_effect.xml
new file mode 100644
index 0000000000..8de0133ead
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_voice_effect.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater label="Orte" name="voice_effects" title="VOICE-MORPHING AUSPROBIEREN">
+	<string name="no_voice_effect">
+		(Kein Voice-Morphing)
+	</string>
+	<string name="active_voice_effect">
+		(Aktiv)
+	</string>
+	<string name="unsubscribed_voice_effect">
+		(nicht abonniert)
+	</string>
+	<string name="new_voice_effect">
+		(Neu!)
+	</string>
+	<text name="status_text">
+		Um die Voice-Morph-Effekte auszuprobieren, einfach auf die Schaltfläche „Aufnahme“ klicken und kurz ins Mikrofon sprechen. Klicken Sie dann auf einen beliebigen Effekt in der Liste, um zu hören, wie der Effekt Ihre Stimme verändert.
+
+Schließen Sie dieses Fenster, um wieder mit dem Voice-Chat in der Nähe verbunden zu werden.
+	</text>
+	<button label="Aufnahme" name="record_btn" tool_tip="Nehmen Sie Ihre Stimme auf."/>
+	<button label="Stopp" name="record_stop_btn"/>
+	<text name="voice_morphing_link">
+		[[URL]Voice-Morphing abonnieren]
+	</text>
+	<scroll_list name="voice_effect_list" tool_tip="Nehmen Sie Ihre Stimme auf und klicken Sie dann auf einen Effekt, um diesen auszuprobieren.">
+		<scroll_list.columns label="Voice-Morphing" name="name"/>
+		<scroll_list.columns label="Gültig bis" name="expires"/>
+	</scroll_list>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/menu_cof_attachment.xml b/indra/newview/skins/default/xui/de/menu_cof_attachment.xml
new file mode 100644
index 0000000000..05d3dfca9d
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_cof_attachment.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="COF Attachment">
+	<menu_item_call label="Abnehmen" name="detach"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_cof_body_part.xml b/indra/newview/skins/default/xui/de/menu_cof_body_part.xml
new file mode 100644
index 0000000000..07960a525c
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_cof_body_part.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="COF Body">
+	<menu_item_call label="Ersetzen" name="replace"/>
+	<menu_item_call label="Bearbeiten" name="edit"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_cof_clothing.xml b/indra/newview/skins/default/xui/de/menu_cof_clothing.xml
new file mode 100644
index 0000000000..5cf31791ba
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_cof_clothing.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="COF Clothing">
+	<menu_item_call label="Ausziehen" name="take_off"/>
+	<menu_item_call label="Eine Kategorie nach oben" name="move_up"/>
+	<menu_item_call label="Eine Kategorie nach unten" name="move_down"/>
+	<menu_item_call label="Bearbeiten" name="edit"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_cof_gear.xml b/indra/newview/skins/default/xui/de/menu_cof_gear.xml
new file mode 100644
index 0000000000..54b218d22f
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_cof_gear.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="Gear COF">
+	<menu label="Neue Kleider" name="COF.Gear.New_Clothes"/>
+	<menu label="Neue Körperteile" name="COF.Geear.New_Body_Parts"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/de/menu_outfit_gear.xml b/indra/newview/skins/default/xui/de/menu_outfit_gear.xml
new file mode 100644
index 0000000000..411dfc42c0
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_outfit_gear.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="Gear Outfit">
+	<menu_item_call label="Anziehen - Aktuelles Outfit ersetzen" name="wear"/>
+	<menu_item_call label="Ausziehen - Aus aktuellem Outfit entfernen" name="take_off"/>
+	<menu label="Neue Kleider" name="New Clothes">
+		<menu_item_call label="Neues Hemd" name="New Shirt"/>
+		<menu_item_call label="Neue Hose" name="New Pants"/>
+		<menu_item_call label="Neue Schuhe" name="New Shoes"/>
+		<menu_item_call label="Neue Socken" name="New Socks"/>
+		<menu_item_call label="Neue Jacke" name="New Jacket"/>
+		<menu_item_call label="Neuer Rock" name="New Skirt"/>
+		<menu_item_call label="Neue Handschuhe" name="New Gloves"/>
+		<menu_item_call label="Neues Unterhemd" name="New Undershirt"/>
+		<menu_item_call label="Neue Unterhose" name="New Underpants"/>
+		<menu_item_call label="Neues Alpha" name="New Alpha"/>
+		<menu_item_call label="Neue Tätowierung" name="New Tattoo"/>
+	</menu>
+	<menu label="Neue Körperteile" name="New Body Parts">
+		<menu_item_call label="Neue Form" name="New Shape"/>
+		<menu_item_call label="Neue Haut" name="New Skin"/>
+		<menu_item_call label="Neues Haar" name="New Hair"/>
+		<menu_item_call label="Neue Augen" name="New Eyes"/>
+	</menu>
+	<menu_item_call label="Outfit neu benennen" name="rename"/>
+	<menu_item_call label="Outfit löschen" name="delete_outfit"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/de/menu_outfit_tab.xml b/indra/newview/skins/default/xui/de/menu_outfit_tab.xml
new file mode 100644
index 0000000000..605dee9b33
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_outfit_tab.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Outfit">
+	<menu_item_call label="Anziehen - Aktuelles Outfit ersetzen" name="wear_replace"/>
+	<menu_item_call label="Anziehen - Aktuelles Outfit hinzufügen" name="wear_add"/>
+	<menu_item_call label="Ausziehen - Aus aktuellem Outfit entfernen" name="take_off"/>
+	<menu_item_call label="Outfit bearbeiten" name="edit"/>
+	<menu_item_call label="Umbenennen" name="rename"/>
+	<menu_item_call label="Outfit löschen" name="delete"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/de/menu_wearable_list_item.xml
new file mode 100644
index 0000000000..a4bf75a497
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_wearable_list_item.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Outfit Wearable Context Menu">
+	<menu_item_call label="Anziehen" name="wear"/>
+	<menu_item_call label="Hinzufügen" name="wear_add"/>
+	<menu_item_call label="Ausziehen / Abnehmen" name="take_off_or_detach"/>
+	<menu_item_call label="Abnehmen" name="detach"/>
+	<context_menu label="Anhängen an ▶" name="wearable_attach_to"/>
+	<context_menu label="An HUD hängen ▶" name="wearable_attach_to_hud"/>
+	<menu_item_call label="Ausziehen" name="take_off"/>
+	<menu_item_call label="Bearbeiten" name="edit"/>
+	<menu_item_call label="Objektprofil" name="object_profile"/>
+	<menu_item_call label="Original anzeigen" name="show_original"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/de/panel_voice_effect.xml b/indra/newview/skins/default/xui/de/panel_voice_effect.xml
new file mode 100644
index 0000000000..363ee013e3
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_voice_effect.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_voice_effect">
+	<string name="no_voice_effect">
+		Kein Voice-Morphing
+	</string>
+	<string name="preview_voice_effects">
+		Voice-Morphing ausprobieren ▶
+	</string>
+	<string name="get_voice_effects">
+		Voice-Morphing abonnieren ▶
+	</string>
+	<combo_box name="voice_effect" tool_tip="Wählen Sie einen Voice-Morph-Effekt aus, um Ihre Stimme zu verändern.">
+		<combo_box.item label="Kein Voice-Morphing" name="no_voice_effect"/>
+	</combo_box>
+</panel>
-- 
cgit v1.2.3


From 77a71e45eebd9fc027c6e77c5d2a6504c51c1b04 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Fri, 18 Jun 2010 15:27:09 -0700
Subject: ND-47486 WIP Italian translation for set12

---
 .../skins/default/xui/it/floater_camera.xml        | 27 +++---
 .../skins/default/xui/it/floater_incoming_call.xml |  8 +-
 .../skins/default/xui/it/floater_snapshot.xml      | 23 +++--
 .../default/xui/it/floater_voice_controls.xml      |  8 +-
 .../skins/default/xui/it/inspect_object.xml        |  9 +-
 .../skins/default/xui/it/menu_hide_navbar.xml      |  1 +
 .../skins/default/xui/it/menu_inventory.xml        |  1 +
 .../skins/default/xui/it/menu_save_outfit.xml      |  2 +-
 indra/newview/skins/default/xui/it/menu_viewer.xml | 17 ++--
 .../newview/skins/default/xui/it/notifications.xml | 98 +++++++++++++++++++---
 .../skins/default/xui/it/panel_edit_shape.xml      | 13 ++-
 .../skins/default/xui/it/panel_edit_wearable.xml   |  9 +-
 .../skins/default/xui/it/panel_outfit_edit.xml     | 18 ++--
 .../default/xui/it/panel_outfits_inventory.xml     |  3 +-
 .../newview/skins/default/xui/it/panel_places.xml  |  4 +-
 .../default/xui/it/panel_preferences_advanced.xml  |  2 +-
 .../skins/default/xui/it/panel_status_bar.xml      |  6 +-
 .../skins/default/xui/it/sidepanel_inventory.xml   | 10 +--
 indra/newview/skins/default/xui/it/strings.xml     | 48 ++++++++++-
 19 files changed, 223 insertions(+), 84 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/it/floater_camera.xml b/indra/newview/skins/default/xui/it/floater_camera.xml
index febbfd2739..f524bf9874 100644
--- a/indra/newview/skins/default/xui/it/floater_camera.xml
+++ b/indra/newview/skins/default/xui/it/floater_camera.xml
@@ -9,35 +9,28 @@
 	<floater.string name="move_tooltip">
 		Muovi la telecamera su e giù e a sinistra e destra
 	</floater.string>
-	<floater.string name="orbit_mode_title">
-		Ruota visuale
+	<floater.string name="camera_modes_title">
+		Modalità della fotocamera
 	</floater.string>
 	<floater.string name="pan_mode_title">
-		Panoramica
+		Ruota visuale - Ingrandisci - Panoramica
 	</floater.string>
-	<floater.string name="avatar_view_mode_title">
-		Valori predefiniti
+	<floater.string name="presets_mode_title">
+		Visuali predefinite
 	</floater.string>
 	<floater.string name="free_mode_title">
 		Vedi oggetto
 	</floater.string>
 	<panel name="controls">
-		<joystick_track name="cam_track_stick" tool_tip="Sposta la visuale in su e in giù, a sinistra e a destra"/>
 		<panel name="zoom" tool_tip="Avvicina la telecamera nell&apos;inquadratura">
+			<joystick_rotate name="cam_rotate_stick" tool_tip="Ruota la visuale intorno al punto focale"/>
 			<slider_bar name="zoom_slider" tool_tip="Zoom verso il centro focale"/>
-		</panel>
-		<joystick_rotate name="cam_rotate_stick" tool_tip="Ruota la visuale intorno al punto focale"/>
-		<panel name="camera_presets">
-			<button name="rear_view" tool_tip="Visuale posteriore"/>
-			<button name="group_view" tool_tip="Visuale di gruppo"/>
-			<button name="front_view" tool_tip="Visuale frontale"/>
-			<button name="mouselook_view" tool_tip="Visuale soggettiva"/>
+			<joystick_track name="cam_track_stick" tool_tip="Sposta la visuale in su e in giù, a sinistra e a destra"/>
 		</panel>
 	</panel>
 	<panel name="buttons">
-		<button label="" name="orbit_btn" tool_tip="Ruota la visuale"/>
-		<button label="" name="pan_btn" tool_tip="Visuale panoramica"/>
-		<button label="" name="avatarview_btn" tool_tip="Valori predefiniti"/>
-		<button label="" name="freecamera_btn" tool_tip="Vedi oggetto"/>
+		<button label="" name="presets_btn" tool_tip="Visuali predefinite"/>
+		<button label="" name="pan_btn" tool_tip="Ruota visuale - Ingrandisci - Panoramica"/>
+		<button label="" name="avatarview_btn" tool_tip="Modalità della fotocamera"/>
 	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_incoming_call.xml b/indra/newview/skins/default/xui/it/floater_incoming_call.xml
index 81a6ea7a60..4d9c1b98dd 100644
--- a/indra/newview/skins/default/xui/it/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/it/floater_incoming_call.xml
@@ -16,7 +16,13 @@
 		ha aderito ad una chiamata in chat vocale in conferenza.
 	</floater.string>
 	<floater.string name="VoiceInviteGroup">
-		ha accettato una chiamata in Chat vocale con il gruppo [GROUP].
+		ha appena aderito al canale voce &apos;[GROUP]&apos;.
+	</floater.string>
+	<floater.string name="VoiceInviteQuestionGroup">
+		Vuoi abbandonare [CURRENT_CHAT] e aderire alla chiamata con &apos;[GROUP]&apos;?
+	</floater.string>
+	<floater.string name="VoiceInviteQuestionDefault">
+		Vuoi abbandonare [CURRENT_CHAT] e aderire a questa voice chat?
 	</floater.string>
 	<text name="question">
 		Vuoi abbandonare [CURRENT_CHAT] e aderire a questa voice chat?
diff --git a/indra/newview/skins/default/xui/it/floater_snapshot.xml b/indra/newview/skins/default/xui/it/floater_snapshot.xml
index 2f5c86985c..d2ba980f62 100644
--- a/indra/newview/skins/default/xui/it/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/it/floater_snapshot.xml
@@ -5,12 +5,19 @@
 	</floater.string>
 	<button label="Aggiorna la fotografia" name="new_snapshot_btn"/>
 	<line_editor label="Descrizione" name="description"/>
-	<button label="Condividi foto" name="share"/>
-	<button label="Condividi su Web" name="share_to_web"/>
-	<button label="Salva nell&apos;inventario" name="save_to_inventory"/>
-	<button label="Salva foto" name="save"/>
-	<button label="Invia foto via e-mail" name="share_to_email"/>
-	<button label="Salva sul mio computer" name="save_to_computer"/>
-	<button label="Imposta come foto del profilo" name="set_profile_pic"/>
-	<button label="Indietro" name="cancel"/>
+	<panel name="panel_snapshot_main">
+		<button label="Condividi foto" name="share"/>
+		<button label="Salva foto" name="save"/>
+		<button label="Imposta come foto del profilo" name="set_profile_pic"/>
+	</panel>
+	<panel name="panel_snapshot_share">
+		<button label="Condividi su Web" name="share_to_web"/>
+		<button label="Invia foto via e-mail" name="share_to_email"/>
+		<button label="Indietro" name="cancel_share"/>
+	</panel>
+	<panel name="panel_snapshot_save">
+		<button label="Salva nell&apos;inventario" name="save_to_inventory"/>
+		<button label="Salva sul mio computer" name="save_to_computer"/>
+		<button label="Indietro" name="cancel_save"/>
+	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_voice_controls.xml b/indra/newview/skins/default/xui/it/floater_voice_controls.xml
index 07368da0dd..d2fd462062 100644
--- a/indra/newview/skins/default/xui/it/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/it/floater_voice_controls.xml
@@ -19,8 +19,10 @@
 		<layout_panel name="my_panel">
 			<text name="user_text" value="Il mio avatar:"/>
 		</layout_panel>
-		<layout_panel name="leave_call_btn_panel">
-			<button label="Abbandona chiamata" name="leave_call_btn"/>
-		</layout_panel>
+		<layout_stack name="voice_effect_and_leave_call_stack">
+			<layout_panel name="leave_call_btn_panel">
+				<button label="Abbandona chiamata" name="leave_call_btn"/>
+			</layout_panel>
+		</layout_stack>
 	</layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/inspect_object.xml b/indra/newview/skins/default/xui/it/inspect_object.xml
index fd58c18e0b..d8ab10cfda 100644
--- a/indra/newview/skins/default/xui/it/inspect_object.xml
+++ b/indra/newview/skins/default/xui/it/inspect_object.xml
@@ -9,7 +9,7 @@
 	</string>
 	<string name="CreatorAndOwner">
 		Di [CREATOR]
-proprietario [OWNER]
+Proprietario [OWNER]
 	</string>
 	<string name="Price">
 		L$ [AMOUNT]
@@ -23,6 +23,13 @@ proprietario [OWNER]
 	<string name="Sit">
 		Siediti
 	</string>
+	<text name="object_name" value="Nome oggetto di prova che si trova su due righe ed è molto lungo"/>
+	<text name="price_text">
+		L$ 30.000
+	</text>
+	<text name="object_description">
+		Questa è una descrizione di un oggetto che è molto lunga ed è di almeno 80 caratteri, ma potrebbe essere di 120 caratteri a questo punto. Chi lo sa veramente?
+	</text>
 	<button label="Acquista" name="buy_btn"/>
 	<button label="Paga" name="pay_btn"/>
 	<button label="Prendi copia" name="take_free_copy_btn"/>
diff --git a/indra/newview/skins/default/xui/it/menu_hide_navbar.xml b/indra/newview/skins/default/xui/it/menu_hide_navbar.xml
index ee50a18ba5..2c2c6c4bc5 100644
--- a/indra/newview/skins/default/xui/it/menu_hide_navbar.xml
+++ b/indra/newview/skins/default/xui/it/menu_hide_navbar.xml
@@ -2,4 +2,5 @@
 <menu name="hide_navbar_menu">
 	<menu_item_check label="Mostra la barra di navigazione" name="ShowNavbarNavigationPanel"/>
 	<menu_item_check label="Mostra la barra dei Preferiti" name="ShowNavbarFavoritesPanel"/>
+	<menu_item_check label="Mostra mini barra del luogo" name="ShowMiniLocationPanel"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/it/menu_inventory.xml b/indra/newview/skins/default/xui/it/menu_inventory.xml
index b127f8b816..fb8361ad05 100644
--- a/indra/newview/skins/default/xui/it/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/it/menu_inventory.xml
@@ -81,6 +81,7 @@
 	<menu label="Attacca all&apos;HUD" name="Attach To HUD"/>
 	<menu_item_call label="Modifica" name="Wearable Edit"/>
 	<menu_item_call label="Indossa" name="Wearable Wear"/>
+	<menu_item_call label="Aggiungi" name="Wearable Add"/>
 	<menu_item_call label="Togli" name="Take Off"/>
 	<menu_item_call label="--nessuna opzione--" name="--no options--"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/it/menu_save_outfit.xml b/indra/newview/skins/default/xui/it/menu_save_outfit.xml
index ac7b40ca48..4882a8ac64 100644
--- a/indra/newview/skins/default/xui/it/menu_save_outfit.xml
+++ b/indra/newview/skins/default/xui/it/menu_save_outfit.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="save_outfit_menu">
 	<menu_item_call label="Salva" name="save_outfit"/>
-	<menu_item_call label="Salva come nuovo" name="save_as_new_outfit"/>
+	<menu_item_call label="Salva con nome" name="save_as_new_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_viewer.xml b/indra/newview/skins/default/xui/it/menu_viewer.xml
index 999f89a80d..693f4f158e 100644
--- a/indra/newview/skins/default/xui/it/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/it/menu_viewer.xml
@@ -11,6 +11,7 @@
 		<menu_item_check label="Il mio inventario" name="Inventory"/>
 		<menu_item_check label="Il mio inventario" name="ShowSidetrayInventory"/>
 		<menu_item_check label="Le mie gesture" name="Gestures"/>
+		<menu_item_check label="La mia voce" name="ShowVoice"/>
 		<menu label="Il mio stato" name="Status">
 			<menu_item_call label="Assente" name="Set Away"/>
 			<menu_item_call label="Non disponibile" name="Set Busy"/>
@@ -70,6 +71,12 @@
 		<menu_item_call label="Collegamento" name="Link"/>
 		<menu_item_call label="Scollega" name="Unlink"/>
 		<menu_item_check label="Modifica le parti collegate" name="Edit Linked Parts"/>
+		<menu label="Seleziona parti collegate" name="Select Linked Parts">
+			<menu_item_call label="Seleziona parte successiva" name="Select Next Part"/>
+			<menu_item_call label="Seleziona parte precedente" name="Select Previous Part"/>
+			<menu_item_call label="Includi parte successiva" name="Include Next Part"/>
+			<menu_item_call label="Includi parte precedente" name="Include Previous Part"/>
+		</menu>
 		<menu_item_call label="Ingrandisci selezione" name="Focus on Selection"/>
 		<menu_item_call label="Zoom sulla selezione" name="Zoom to Selection"/>
 		<menu label="Oggetto" name="Object">
@@ -100,11 +107,11 @@
 			<menu_item_call label="Usa la selezione per la griglia" name="Use Selection for Grid"/>
 			<menu_item_call label="Opzioni della griglia" name="Grid Options"/>
 		</menu>
-		<menu label="Seleziona parti collegate" name="Select Linked Parts">
-			<menu_item_call label="Seleziona parte successiva" name="Select Next Part"/>
-			<menu_item_call label="Seleziona parte precedente" name="Select Previous Part"/>
-			<menu_item_call label="Includi parte successiva" name="Include Next Part"/>
-			<menu_item_call label="Includi parte precedente" name="Include Previous Part"/>
+		<menu label="Carica sul server" name="Upload">
+			<menu_item_call label="Immagine ([COST] L$)..." name="Upload Image"/>
+			<menu_item_call label="Suono ([COST] L$)..." name="Upload Sound"/>
+			<menu_item_call label="Animazione ([COST] L$)..." name="Upload Animation"/>
+			<menu_item_call label="In blocco ([COST] L$ per file)..." name="Bulk Upload"/>
 		</menu>
 	</menu>
 	<menu label="Aiuto" name="Help">
diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml
index 058353da38..9f1472fc6f 100644
--- a/indra/newview/skins/default/xui/it/notifications.xml
+++ b/indra/newview/skins/default/xui/it/notifications.xml
@@ -472,8 +472,9 @@ La qualità grafica può essere aumentata in Preferenze &gt; Grafica.
 		La regione [REGION] non consente di terraformare.
 	</notification>
 	<notification name="CannotCopyWarning">
-		Non hai il permesso di copiare questo elemento e lo perderai dal tuo inventario se lo regali.
-Confermi veramente di offrire questo elemento?
+		Non hai l&apos;autorizzazione a copiare i seguenti oggetti:
+[ITEMS]
+e se li dai via, verranno eliminati dal tuo inventario. Sicuro di volere offrire questi oggetti?
 		<usetemplate name="okcancelbuttons" notext="No" yestext="Si"/>
 	</notification>
 	<notification name="CannotGiveItem">
@@ -942,6 +943,26 @@ Offri l&apos;amicizia a [NAME]?
 			<button name="Cancel" text="Annulla"/>
 		</form>
 	</notification>
+	<notification label="Salva capo da indossare" name="SaveWearableAs">
+		Salva oggetto nel mio inventario come:
+		<form name="form">
+			<input name="message">
+				[DESC] (nuovo)
+			</input>
+			<button name="Offer" text="OK"/>
+			<button name="Cancel" text="Annulla"/>
+		</form>
+	</notification>
+	<notification label="Cambia nome del vestiario" name="RenameOutfit">
+		Nuovo nome per il vestiario:
+		<form name="form">
+			<input name="new_name">
+				[NAME]
+			</input>
+			<button name="Offer" text="OK"/>
+			<button name="Cancel" text="Annulla"/>
+		</form>
+	</notification>
 	<notification name="RemoveFromFriends">
 		Vuoi rimuovere remove [FIRST_NAME] [LAST_NAME] dalla lista dei tuoi amici?
 		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
@@ -1560,9 +1581,9 @@ Vuoi andare alla Knowledge Base per ulteriori informazioni sulle categorie di ac
 		Non sei ammesso in questa regione a causa della tua categoria d&apos;accesso.
 	</notification>
 	<notification name="RegionEntryAccessBlocked_Change">
-		Non ti è consentito entrare in quella regione a causa della tua categoria di accesso impostata nelle preferenze.
+		Non ti è consentito entrare in quella regione a causa della categoria di accesso impostata nelle preferenze.
 
-Clicca su Cambia preferenze per modificare la categoria di accesso e potere entrare subito. Ciò ti consentirà di effettuare ricerche di contenuti di categoria [REGIONMATURITY]. Potrai modificare queste impostazioni in un secondo momento da Io &gt; Preferenze &gt; Generali.
+Per entrare nella regione, dovrai modificare la tua categoria di accesso. Ciò ti consentirà inoltre di effettuare ricerche di contenuti di categoria [REGIONMATURITY]. Per annullare le modifiche in un secondo momento, vai a Io &gt; Preferenze &gt; Generali.
 		<form name="form">
 			<button name="OK" text="Cambia preferenza"/>
 			<button default="true" name="Cancel" text="Chiudi"/>
@@ -2577,6 +2598,21 @@ Clicca su Accetta per unirti alla chat oppure su Declina per declinare l&apos;in
 	<notification name="VoiceLoginRetry">
 		Stiamo creando una canale voice per te. Questo può richiedere fino a un minuto.
 	</notification>
+	<notification name="VoiceEffectsExpired">
+		Almeno una delle manipolazioni vocali alle quali sei iscritto è scaduta.
+[[URL] Fai clic qui] per rinnovare l&apos;abbonamento.
+	</notification>
+	<notification name="VoiceEffectsExpiredInUse">
+		Poiché la manipolazione vocale attiva è scaduta, sono state applicate le tue impostazioni normali.
+[[URL] Fai clic qui] per rinnovare l&apos;abbonamento.
+	</notification>
+	<notification name="VoiceEffectsWillExpire">
+		Almeno una delle tue manipolazioni vocali scadrà tra meno di [INTERVAL] giorni.
+[[URL] Fai clic qui] per rinnovare l&apos;abbonamento.
+	</notification>
+	<notification name="VoiceEffectsNew">
+		Sono disponibili nuove manipolazioni vocali.
+	</notification>
 	<notification name="Cannot enter parcel: not a group member">
 		Soltanto i membri di un determinato gruppo possono visitare questa zona.
 	</notification>
@@ -2643,18 +2679,36 @@ Per sicurezza, verranno bloccati per alcuni secondi.
 Il pulsante verrà visualizzato quando lo spazio sarà sufficiente.
 	</notification>
 	<notification name="ShareNotification">
-		Trascina articoli dell&apos;inventario su una persona nel selettore residenti
+		Scegli i residenti con i quali condividere.
+	</notification>
+	<notification name="ShareItemsConfirmation">
+		Sei sicuro di volere condividere gli oggetti
+
+[ITEMS]
+
+Con i seguenti residenti?
+
+[RESIDENTS]
+		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="Ok"/>
+	</notification>
+	<notification name="ItemsShared">
+		Gli oggetti sono stati condivisi.
 	</notification>
 	<notification name="DeedToGroupFail">
 		Cessione al gruppo non riuscita.
 	</notification>
 	<notification name="AvatarRezNotification">
-		( presente da [EXISTENCE] secondi )
-Nuvola avatar &apos;[NAME]&apos; risolta in [TIME] secondi.
+		( in esistenza da [EXISTENCE] secondi )
+Nuvola avatar &apos;[NAME]&apos; dileguata dopo [TIME] secondi.
 	</notification>
-	<notification name="AvatarRezSelfNotification">
-		( presente da [EXISTENCE] secondi )
-Baking dei vestiti eseguito in [TIME] secondi.
+	<notification name="AvatarRezSelfBakedDoneNotification">
+		( in esistenza da [EXISTENCE] secondi )
+Baking dei vestiti terminato dopo [TIME] secondi.
+	</notification>
+	<notification name="AvatarRezSelfBakedUpdateNotification">
+		( in esistenza da [EXISTENCE] secondi )
+Hai inviato un aggiornamento al tuo aspetto dopo [TIME] secondi.
+[STATUS]
 	</notification>
 	<notification name="AvatarRezCloudNotification">
 		( presente da [EXISTENCE] secondi )
@@ -2676,9 +2730,31 @@ Avatar &apos;[NAME]&apos; è entrato nella modalità aspetto.
 		( presente da [EXISTENCE] secondi )
 Avatar &apos;[NAME]&apos; ha lasciato la modalità aspetto.
 	</notification>
+	<notification name="NoConnect">
+		Ci sono problemi di connessione tramite [PROTOCOL] [HOSTID].
+Ti consigliamo di controllare le tue impostazioni di rete e della firewall.
+		<form name="form">
+			<button name="OK" text="OK"/>
+		</form>
+	</notification>
+	<notification name="NoVoiceConnect">
+		A causa di problemi di connessione al server vocale
+
+[HOSTID]
+
+le comunicazioni tramite voce non saranno disponibili.
+Ti consigliamo di controllare le tue impostazioni di rete e della firewall.
+		<form name="form">
+			<button name="OK" text="OK"/>
+		</form>
+	</notification>
 	<notification name="AvatarRezLeftNotification">
 		( presente da [EXISTENCE] secondi )
 Avatar &apos;[NAME]&apos; è partito completamente caricato.
+	</notification>
+	<notification name="AvatarRezSelfBakeNotification">
+		( in esistenza da [EXISTENCE] secondi )
+Hai caricato una texture [RESOLUTION] completata per &apos;[BODYREGION]&apos; dopo [TIME] secondi.
 	</notification>
 	<notification name="ConfirmLeaveCall">
 		Sei sicuro di volere uscire dalla chiamata?
@@ -2690,7 +2766,7 @@ In questo modo verrà disattivato l&apos;audio anche di tutti i residenti che si
 uniscono alla chiamata in un secondo momento, anche dopo che tu ti fossi scollegato.
 
 Disattiva audio di tutti?
-		<usetemplate ignoretext="Conferma prima di disattivare l&apos;audio di tutti i partecipanti alla chiamata di gruppo" name="okcancelignore" notext="Ok" yestext="Annulla"/>
+		<usetemplate ignoretext="Conferma prima di disattivare l&apos;audio di tutti i partecipanti alla chiamata di gruppo" name="okcancelignore" notext="Annulla" yestext="Ok"/>
 	</notification>
 	<global name="UnsupportedCPU">
 		- La velocità della tua CPU non soddisfa i requisiti minimi.
diff --git a/indra/newview/skins/default/xui/it/panel_edit_shape.xml b/indra/newview/skins/default/xui/it/panel_edit_shape.xml
index ab77548f26..fd6a7af69c 100644
--- a/indra/newview/skins/default/xui/it/panel_edit_shape.xml
+++ b/indra/newview/skins/default/xui/it/panel_edit_shape.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_shape_panel">
-	<text name="avatar_height">
-		Statura: [HEIGHT] metri
-	</text>
+	<string name="meters">
+		Metri
+	</string>
+	<string name="feet">
+		Piedi
+	</string>
+	<string name="height">
+		Statura:
+	</string>
+	<text name="avatar_height"/>
 	<panel label="Camicia" name="accordion_panel">
 		<accordion name="wearable_accordion">
 			<accordion_tab name="shape_body_tab" title="Corpo"/>
diff --git a/indra/newview/skins/default/xui/it/panel_edit_wearable.xml b/indra/newview/skins/default/xui/it/panel_edit_wearable.xml
index 3d8aa858db..5eaae828d8 100644
--- a/indra/newview/skins/default/xui/it/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/it/panel_edit_wearable.xml
@@ -72,8 +72,8 @@
 	<string name="jacket_desc_text">
 		Giacca:
 	</string>
-	<string name="skirt_skirt_desc_text">
-		Giacca:
+	<string name="skirt_desc_text">
+		Gonna:
 	</string>
 	<string name="gloves_desc_text">
 		Guanti:
@@ -100,11 +100,6 @@
 		<icon name="male_icon" tool_tip="Maschio"/>
 		<icon name="female_icon" tool_tip="Femmina"/>
 	</panel>
-	<panel label="gear_buttom_panel" name="gear_buttom_panel">
-		<button name="friends_viewsort_btn" tool_tip="Opzioni"/>
-		<button name="add_btn" tool_tip="TODO"/>
-		<button name="del_btn" tool_tip="TODO"/>
-	</panel>
 	<panel name="button_panel">
 		<button label="Salva con nome" name="save_as_button"/>
 		<button label="Ripristina" name="revert_button"/>
diff --git a/indra/newview/skins/default/xui/it/panel_outfit_edit.xml b/indra/newview/skins/default/xui/it/panel_outfit_edit.xml
index bd2202b60e..57168096d5 100644
--- a/indra/newview/skins/default/xui/it/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/it/panel_outfit_edit.xml
@@ -13,7 +13,7 @@
 	<string name="Filter.All" value="Tutto"/>
 	<string name="Filter.Clothes/Body" value="Abiti/corpo"/>
 	<string name="Filter.Objects" value="Oggetti"/>
-	<button label="modifica" name="edit_wearable_btn"/>
+	<string name="Filter.Custom" value="Filtro personalizzato"/>
 	<text name="title" value="Modifica vestiario"/>
 	<panel label="bottom_panel" name="header_panel">
 		<panel label="bottom_panel" name="outfit_name_and_status">
@@ -23,20 +23,16 @@
 	</panel>
 	<layout_stack name="im_panels">
 		<layout_panel label="Pannello di controllo IM" name="outfit_wearables_panel">
-			<panel label="bottom_panel" name="edit_panel"/>
-		</layout_panel>
-		<layout_panel name="add_wearables_panel">
-			<text name="add_to_outfit_label" value="Aggiungi al vestiario:"/>
 			<layout_stack name="filter_panels">
-				<layout_panel label="Pannello di controllo IM" name="filter_panel">
-					<filter_editor label="Filtro" name="look_item_filter"/>
+				<layout_panel name="add_button_and_combobox">
+					<button label="Aggiungi altri..." name="show_add_wearables_btn"/>
+				</layout_panel>
+				<layout_panel name="filter_panel">
+					<filter_editor label="Filtra capi da indossare dell&apos;inventario" name="look_item_filter"/>
 				</layout_panel>
 			</layout_stack>
-			<panel label="add_wearables_button_bar" name="add_wearables_button_bar">
-				<button label="C" name="folder_view_btn"/>
-				<button label="E" name="list_view_btn"/>
-			</panel>
 		</layout_panel>
+		<layout_panel name="add_wearables_panel"/>
 	</layout_stack>
 	<panel name="save_revert_button_bar">
 		<button label="Salva" name="save_btn"/>
diff --git a/indra/newview/skins/default/xui/it/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/it/panel_outfits_inventory.xml
index 932788eaa3..8f8f7a25f4 100644
--- a/indra/newview/skins/default/xui/it/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/it/panel_outfits_inventory.xml
@@ -7,8 +7,7 @@
 	<panel name="bottom_panel">
 		<button name="options_gear_btn" tool_tip="Mostra opzioni addizionali"/>
 		<dnd_button name="trash_btn" tool_tip="Rimuovi l&apos;articolo selezionato"/>
-		<button label="Salva vestiario" name="make_outfit_btn" tool_tip="Salva questo aspetto fisico come un vestito"/>
+		<button label="Salva con nome" name="save_btn"/>
 		<button label="Indossa" name="wear_btn" tool_tip="Indossa il vestiario selezionato"/>
-		<button label="Modifica vestiario" name="edit_current_outfit_btn"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_places.xml b/indra/newview/skins/default/xui/it/panel_places.xml
index 3b242b1805..9a052068f7 100644
--- a/indra/newview/skins/default/xui/it/panel_places.xml
+++ b/indra/newview/skins/default/xui/it/panel_places.xml
@@ -5,12 +5,12 @@
 	<filter_editor label="Filtra i miei luoghi" name="Filter"/>
 	<panel name="button_panel">
 		<button label="Teleport" name="teleport_btn" tool_tip="Teleport alla zona selezionata"/>
-		<button label="Mappa" name="map_btn"/>
+		<button label="Mappa" name="map_btn" tool_tip="Mostra la zona corrispondente nella mappa del Mondo"/>
 		<button label="Modifica" name="edit_btn" tool_tip="Modifica le informazioni del punto di riferimento"/>
 		<button label="▼" name="overflow_btn" tool_tip="Mostra opzioni addizionali"/>
 		<button label="Salva" name="save_btn"/>
 		<button label="Annulla" name="cancel_btn"/>
 		<button label="Chiudi" name="close_btn"/>
-		<button label="Profilo" name="profile_btn"/>
+		<button label="Profilo" name="profile_btn" tool_tip="Mostra il profilo del luogo"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml
index 7c3f32ad7b..842daaa331 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml
@@ -13,7 +13,7 @@
 	</text>
 	<check_box label="Costruire/Modificare" name="edit_camera_movement" tool_tip="Utilizza il posizionamento automatico della fotocamera entrando o uscendo dalla modalità modifica"/>
 	<check_box label="Aspetto fisico" name="appearance_camera_movement" tool_tip="Utilizza il posizionamento automatico della camera in modalità modifica"/>
-	<check_box initial_value="1" label="Barra laterale" name="appearance_sidebar_positioning" tool_tip="Utilizza il posizionamento automatico della fotocamera per la barra laterale"/>
+	<check_box initial_value="vero" label="Barra laterale" name="appearance_sidebar_positioning" tool_tip="Utilizza il posizionamento automatico della fotocamera per la barra laterale"/>
 	<check_box label="Visualizzami in modalità soggettiva" name="first_person_avatar_visible"/>
 	<check_box label="Le frecce di direzione mi fanno sempre spostare" name="arrow_keys_move_avatar_check"/>
 	<check_box label="Doppio click e tieni premuto per correre" name="tap_tap_hold_to_run"/>
diff --git a/indra/newview/skins/default/xui/it/panel_status_bar.xml b/indra/newview/skins/default/xui/it/panel_status_bar.xml
index 4c860ff479..6b1a8aa71b 100644
--- a/indra/newview/skins/default/xui/it/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/it/panel_status_bar.xml
@@ -21,8 +21,10 @@
 	<panel.string name="buycurrencylabel">
 		L$ [AMT]
 	</panel.string>
-	<button label="" label_selected="" name="buycurrency" tool_tip="Il mio saldo"/>
-	<button label="Acquista L$" name="buyL" tool_tip="Clicca per comprare più L$"/>
+	<panel name="balance_bg">
+		<text name="balance" tool_tip="Il mio saldo" value="L$ 20"/>
+		<button label="ACQUISTA L$" name="buyL" tool_tip="Clicca per acquistare più L$"/>
+	</panel>
 	<text name="TimeText" tool_tip="Orario attuale (Pacifico)">
 		24:00, ora del Pacifico
 	</text>
diff --git a/indra/newview/skins/default/xui/it/sidepanel_inventory.xml b/indra/newview/skins/default/xui/it/sidepanel_inventory.xml
index 0d862a0ff7..3944f8e306 100644
--- a/indra/newview/skins/default/xui/it/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/it/sidepanel_inventory.xml
@@ -2,12 +2,12 @@
 <panel label="Cose" name="objects panel">
 	<panel label="" name="sidepanel__inventory_panel">
 		<panel name="button_panel">
-			<button label="Profilo" name="info_btn"/>
-			<button label="Condividi" name="share_btn"/>
-			<button label="Acquisti" name="shop_btn"/>
-			<button label="Indossa" name="wear_btn"/>
+			<button label="Profilo" name="info_btn" tool_tip="Mostra profilo dell&apos;oggetto"/>
+			<button label="Condividi" name="share_btn" tool_tip="Condividi un oggetto dell&apos;inventario"/>
+			<button label="Acquisti" name="shop_btn" tool_tip="Apri pagina web di Marketplace"/>
+			<button label="Indossa" name="wear_btn" tool_tip="Indossa il vestiario selezionato"/>
 			<button label="Riproduci" name="play_btn"/>
-			<button label="Teleport" name="teleport_btn"/>
+			<button label="Teleport" name="teleport_btn" tool_tip="Teleport alla zona selezionata"/>
 		</panel>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml
index 67cd4c35b2..d601c27d28 100644
--- a/indra/newview/skins/default/xui/it/strings.xml
+++ b/indra/newview/skins/default/xui/it/strings.xml
@@ -738,6 +738,12 @@
 	<string name="land_type_unknown">
 		(sconosciuto)
 	</string>
+	<string name="Estate / Full Region">
+		Proprietà immobiliare / Regione completa
+	</string>
+	<string name="Mainland / Full Region">
+		Continente / Regione completa
+	</string>
 	<string name="all_files">
 		Tutti i file
 	</string>
@@ -882,6 +888,9 @@
 	<string name="NewWearable">
 		Nuovo [WEARABLE_ITEM]
 	</string>
+	<string name="CreateNewWearable">
+		Crea [WEARABLE_TYPE]
+	</string>
 	<string name="next">
 		Avanti
 	</string>
@@ -3454,6 +3463,9 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
 	<string name="session_initialization_timed_out_error">
 		Sessione di inizializzazione scaduta
 	</string>
+	<string name="voice_morphing_url">
+		http://secondlife.com/landing/voicemorphing
+	</string>
 	<string name="paid_you_ldollars">
 		[NAME] ti ha inviato un pagamento di L$[AMOUNT].
 	</string>
@@ -3624,16 +3636,16 @@ Segnala abuso
 	<string name="Male - Wow">
 		Maschio - Accipicchia
 	</string>
-	<string name="FeMale - Excuse me">
+	<string name="Female - Excuse me">
 		Femmina - Chiedere scusa
 	</string>
-	<string name="FeMale - Get lost">
+	<string name="Female - Get lost">
 		Femmina - Levati dai piedi!
 	</string>
-	<string name="FeMale - Blow kiss">
+	<string name="Female - Blow kiss">
 		Femmina - Butta un bacio
 	</string>
-	<string name="FeMale - Boo">
+	<string name="Female - Boo">
 		Femmina - Bu
 	</string>
 	<string name="Female - Bored">
@@ -3666,4 +3678,32 @@ Segnala abuso
 	<string name="texture_load_dimensions_error">
 		Impossibile caricare immagini di dimensioni superiori a [WIDTH]*[HEIGHT]
 	</string>
+	<string name="words_separator" value=","/>
+	<string name="server_is_down">
+		Nonostante i nostri tentativi, si è verificato un errore imprevisto.
+
+	Consulta la pagina status.secondlifegrid.net per determinare se si sia verificato un problema noto con il servizio.  
+        Se il problema continua, ti consigliamo di controllare le tue impostazioni di rete e della firewall.
+	</string>
+	<string name="dateTimeWeekdaysNames">
+		lunedì:martedì:mercoledì:giovedì:venerdì:sabato:domenica
+	</string>
+	<string name="dateTimeWeekdaysShortNames">
+		lun:mar:mer:gio:ven:sab:dom
+	</string>
+	<string name="dateTimeMonthNames">
+		gennaio:febbraio:marzo:aprile:maggio:giugno:luglio:agosto:settembre:ottobre:novembre:dicembre
+	</string>
+	<string name="dateTimeMonthShortNames">
+		gen:feb:mar:apr:mag:giu:lug:ago:sett:ott:nov:dic
+	</string>
+	<string name="dateTimeDayFormat">
+		[MDAY]
+	</string>
+	<string name="dateTimeAM">
+		antemeridiane
+	</string>
+	<string name="dateTimePM">
+		pomeridiane
+	</string>
 </strings>
-- 
cgit v1.2.3


From e9e92145620545b935c5e0ff081b4c87c59b72c9 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Fri, 18 Jun 2010 15:27:22 -0700
Subject: ND-47486 WIP Italian translation for set12, new files

---
 .../skins/default/xui/it/floater_voice_effect.xml  | 29 ++++++++++++++++++++++
 .../skins/default/xui/it/menu_cof_attachment.xml   |  4 +++
 .../skins/default/xui/it/menu_cof_body_part.xml    |  5 ++++
 .../skins/default/xui/it/menu_cof_clothing.xml     |  7 ++++++
 .../newview/skins/default/xui/it/menu_cof_gear.xml |  5 ++++
 .../skins/default/xui/it/menu_outfit_gear.xml      | 26 +++++++++++++++++++
 .../skins/default/xui/it/menu_outfit_tab.xml       |  9 +++++++
 .../default/xui/it/menu_wearable_list_item.xml     | 13 ++++++++++
 .../skins/default/xui/it/panel_voice_effect.xml    | 15 +++++++++++
 9 files changed, 113 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/it/floater_voice_effect.xml
 create mode 100644 indra/newview/skins/default/xui/it/menu_cof_attachment.xml
 create mode 100644 indra/newview/skins/default/xui/it/menu_cof_body_part.xml
 create mode 100644 indra/newview/skins/default/xui/it/menu_cof_clothing.xml
 create mode 100644 indra/newview/skins/default/xui/it/menu_cof_gear.xml
 create mode 100644 indra/newview/skins/default/xui/it/menu_outfit_gear.xml
 create mode 100644 indra/newview/skins/default/xui/it/menu_outfit_tab.xml
 create mode 100644 indra/newview/skins/default/xui/it/menu_wearable_list_item.xml
 create mode 100644 indra/newview/skins/default/xui/it/panel_voice_effect.xml

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/it/floater_voice_effect.xml b/indra/newview/skins/default/xui/it/floater_voice_effect.xml
new file mode 100644
index 0000000000..202be752c9
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_voice_effect.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater label="Luoghi" name="voice_effects" title="ANTEPRIMA MANIPOLAZIONE VOCE">
+	<string name="no_voice_effect">
+		(Nessuna manipolazione voce)
+	</string>
+	<string name="active_voice_effect">
+		(Attivato)
+	</string>
+	<string name="unsubscribed_voice_effect">
+		(Iscrizione annullata)
+	</string>
+	<string name="new_voice_effect">
+		(Nuovo!)
+	</string>
+	<text name="status_text">
+		Per ascoltare un&apos;anteprima degli effetti di manipolazione della voce, clicca sul pulsante Registra per registrare un campione di voce, quindi fai clic su uno degli effetti per ascoltare il risultato.
+
+Per ricollegarti alla voce nei dintorni, chiudi la finestra.
+	</text>
+	<button label="Registra campione" name="record_btn" tool_tip="Registra un campione della tua voce."/>
+	<button label="Ferma" name="record_stop_btn"/>
+	<text name="voice_morphing_link">
+		[[URL] Ottieni manipolazione voce]
+	</text>
+	<scroll_list name="voice_effect_list" tool_tip="Registra un campione della tua voce, quindi fai clic su uno degli effetti per un&apos;anteprima del risultato.">
+		<scroll_list.columns label="Manipolazione voce" name="name"/>
+		<scroll_list.columns label="Scade il" name="expires"/>
+	</scroll_list>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/menu_cof_attachment.xml b/indra/newview/skins/default/xui/it/menu_cof_attachment.xml
new file mode 100644
index 0000000000..699490c8f1
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_cof_attachment.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="COF Attachment">
+	<menu_item_call label="Stacca" name="detach"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_cof_body_part.xml b/indra/newview/skins/default/xui/it/menu_cof_body_part.xml
new file mode 100644
index 0000000000..1e3658ef45
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_cof_body_part.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="COF Body">
+	<menu_item_call label="Sostituisci" name="replace"/>
+	<menu_item_call label="Modifica" name="edit"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_cof_clothing.xml b/indra/newview/skins/default/xui/it/menu_cof_clothing.xml
new file mode 100644
index 0000000000..5b4f8c0642
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_cof_clothing.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="COF Clothing">
+	<menu_item_call label="Togli" name="take_off"/>
+	<menu_item_call label="Un livello in alto" name="move_up"/>
+	<menu_item_call label="Un livello in basso" name="move_down"/>
+	<menu_item_call label="Modifica" name="edit"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_cof_gear.xml b/indra/newview/skins/default/xui/it/menu_cof_gear.xml
new file mode 100644
index 0000000000..10524ba92d
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_cof_gear.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="Gear COF">
+	<menu label="Nuovi abiti" name="COF.Gear.New_Clothes"/>
+	<menu label="Nuove parti del corpo" name="COF.Geear.New_Body_Parts"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/it/menu_outfit_gear.xml b/indra/newview/skins/default/xui/it/menu_outfit_gear.xml
new file mode 100644
index 0000000000..cf39779b67
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_outfit_gear.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="Gear Outfit">
+	<menu_item_call label="Indossa - Sostituisci vestiario attuale" name="wear"/>
+	<menu_item_call label="Togli - Rimuovi dal vestiario attuale" name="take_off"/>
+	<menu label="Nuovi abiti" name="New Clothes">
+		<menu_item_call label="Nuova camicia" name="New Shirt"/>
+		<menu_item_call label="Nuovi pantaloni" name="New Pants"/>
+		<menu_item_call label="Nuove scarpe" name="New Shoes"/>
+		<menu_item_call label="Nuove calze" name="New Socks"/>
+		<menu_item_call label="Nuova giacca" name="New Jacket"/>
+		<menu_item_call label="Nuova gonna" name="New Skirt"/>
+		<menu_item_call label="Nuovi guanti" name="New Gloves"/>
+		<menu_item_call label="Nuova maglietta intima" name="New Undershirt"/>
+		<menu_item_call label="Nuovi slip" name="New Underpants"/>
+		<menu_item_call label="Nuovo Alpha (trasparenza)" name="New Alpha"/>
+		<menu_item_call label="Nuovo tatuaggio" name="New Tattoo"/>
+	</menu>
+	<menu label="Nuove parti del corpo" name="New Body Parts">
+		<menu_item_call label="Nuova figura corporea" name="New Shape"/>
+		<menu_item_call label="Nuova pelle" name="New Skin"/>
+		<menu_item_call label="Nuovi capelli" name="New Hair"/>
+		<menu_item_call label="Nuovi occhi" name="New Eyes"/>
+	</menu>
+	<menu_item_call label="Cambia nome del vestiario" name="rename"/>
+	<menu_item_call label="Elimina vestito" name="delete_outfit"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/it/menu_outfit_tab.xml b/indra/newview/skins/default/xui/it/menu_outfit_tab.xml
new file mode 100644
index 0000000000..4e0caf832c
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_outfit_tab.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Outfit">
+	<menu_item_call label="Indossa - Sostituisci vestiario attuale" name="wear_replace"/>
+	<menu_item_call label="Indossa - Aggiungi al vestiario attuale" name="wear_add"/>
+	<menu_item_call label="Togli - Rimuovi dal vestiario attuale" name="take_off"/>
+	<menu_item_call label="Modifica vestiario" name="edit"/>
+	<menu_item_call label="Modifica nome" name="rename"/>
+	<menu_item_call label="Elimina vestito" name="delete"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/it/menu_wearable_list_item.xml
new file mode 100644
index 0000000000..79ef188993
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_wearable_list_item.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Outfit Wearable Context Menu">
+	<menu_item_call label="Indossa" name="wear"/>
+	<menu_item_call label="Aggiungi" name="wear_add"/>
+	<menu_item_call label="Togli / Stacca" name="take_off_or_detach"/>
+	<menu_item_call label="Stacca" name="detach"/>
+	<context_menu label="Attacca a  ▶" name="wearable_attach_to"/>
+	<context_menu label="Attacca a HUD  ▶" name="wearable_attach_to_hud"/>
+	<menu_item_call label="Togli" name="take_off"/>
+	<menu_item_call label="Modifica" name="edit"/>
+	<menu_item_call label="Profilo dell&apos;oggetto" name="object_profile"/>
+	<menu_item_call label="Mostra originale" name="show_original"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/it/panel_voice_effect.xml b/indra/newview/skins/default/xui/it/panel_voice_effect.xml
new file mode 100644
index 0000000000..78ce1ff24a
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_voice_effect.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_voice_effect">
+	<string name="no_voice_effect">
+		Nessuna manipolazione voce
+	</string>
+	<string name="preview_voice_effects">
+		Anteprima manipolazione voce  ▶
+	</string>
+	<string name="get_voice_effects">
+		Ottieni manipolazione voce  ▶
+	</string>
+	<combo_box name="voice_effect" tool_tip="Scegli un effetto di manipolazione per modificare il suono della tua voce.">
+		<combo_box.item label="Nessuna manipolazione voce" name="no_voice_effect"/>
+	</combo_box>
+</panel>
-- 
cgit v1.2.3


From ff2c3873817c6ab701483dbdda656af5e038f0a6 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Sat, 19 Jun 2010 03:07:02 +0100
Subject: EXT-7945 FIXED Duplicate XUI ID in floater_voice_effect.xml

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

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
index 44ab15a3f2..9bf9cc6c77 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
@@ -35,7 +35,7 @@
    font="SansSerifBold"
    color="White"
    left="10"
-   name="status_text"
+   name="preview_text"
    right="-10"
    top="27">To Preview
    </text>
-- 
cgit v1.2.3