From 7a54ce3cf686d872425c3230b305156b83a36b26 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 22 Jun 2010 13:42:55 -0700
Subject: EXT-7729 WIP  LLWARNS: Tons of "Making dummy class..." warnings on
 startup reviewed by Leyla

---
 .../newview/skins/default/xui/en/alert_button.xml  |   2 +-
 .../newview/skins/default/xui/en/floater_event.xml |   2 -
 .../newview/skins/default/xui/en/floater_tools.xml | 107 +++++++++++++--------
 .../skins/default/xui/en/panel_classified_info.xml |   1 -
 .../skins/default/xui/en/panel_edit_classified.xml |   1 -
 .../skins/default/xui/en/panel_navigation_bar.xml  |   4 -
 .../skins/default/xui/en/panel_nearby_media.xml    |   3 -
 .../default/xui/en/panel_preferences_privacy.xml   |   7 +-
 .../skins/default/xui/en/panel_topinfo_bar.xml     |   1 -
 .../skins/default/xui/en/sidepanel_item_info.xml   |   2 -
 .../skins/default/xui/en/sidepanel_task_info.xml   |   1 -
 indra/newview/skins/default/xui/en/strings.xml     |   3 +-
 .../default/xui/en/widgets/search_combo_box.xml    |   7 +-
 13 files changed, 75 insertions(+), 66 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/alert_button.xml b/indra/newview/skins/default/xui/en/alert_button.xml
index 632564d793..a60e9afab1 100644
--- a/indra/newview/skins/default/xui/en/alert_button.xml
+++ b/indra/newview/skins/default/xui/en/alert_button.xml
@@ -5,7 +5,7 @@
   label_shadow="true"
   auto_resize="false"
   image_overlay_alignment="center"
-  use_ellipses="flse"
+  use_ellipses="false"
   pad_right="10"
   pad_left="10"
   is_toggle="false"
diff --git a/indra/newview/skins/default/xui/en/floater_event.xml b/indra/newview/skins/default/xui/en/floater_event.xml
index d9c9d63c72..887cedc33f 100644
--- a/indra/newview/skins/default/xui/en/floater_event.xml
+++ b/indra/newview/skins/default/xui/en/floater_event.xml
@@ -266,7 +266,6 @@
            layout="topleft"
            left="6"
        name="create_event_btn"
-           picture_style="true"
            tool_tip="Create Event"
            width="18" />
       <button
@@ -280,7 +279,6 @@
            left="6"
            top_pad="-7" 
           name="god_delete_event_btn"
-           picture_style="true"
            tool_tip="Delete Event"
            width="18" />
       <button
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index efc1a66d95..2ff832b27a 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -335,7 +335,6 @@
     </combo_box>
     <button
      left_pad="0"
-     image_disabled="ForwardArrow_Disabled"
      image_selected="ForwardArrow_Press"
      image_unselected="ForwardArrow_Off"
      layout="topleft"
@@ -1012,7 +1011,7 @@
             follows="left|top"
             allow_text_entry="false"
             height="23"
-            intial_value="2"
+            initial_value="2"
             max_chars="20"
             mouse_opaque="true"
             name="sale type"
@@ -2176,8 +2175,6 @@ even though the user gets a free copy.
              width="60" />
             <color_swatch
              can_apply_immediately="true"
-	     bevel_style="none"
-	     border_style="line"
              color="0.5 0.5 0.5 1"
 	     border.border_thickness="0"
              follows="left|top"
@@ -2212,43 +2209,71 @@ even though the user gets a free copy.
              name="Light Intensity"
              top_pad="3"
              width="128" />
-          <spinner bottom_delta="0" decimal_digits="3" follows="left|top" height="16"
- increment="0.1" initial_val="0.5" label="FOV" label_width="55"
- left="144" max_val="3" min_val="0" mouse_opaque="true"
- name="Light FOV" width="120" />
-          <spinner
-             follows="left|top"
-             height="19"
-             initial_value="5"
-             label="Radius"
-             label_width="70"
-             layout="topleft"
-             left="10"
-             max_val="20"
-             name="Light Radius"
-             top_pad="3"
-             width="128" />
-          <spinner bottom_delta="0" decimal_digits="3" follows="left|top" height="16"
-        increment="0.5" initial_val="0.5" label="Focus" label_width="55"
-        left="144" max_val="20" min_val="-20" mouse_opaque="true"
-        name="Light Focus" width="120" />
-            <spinner
-             follows="left|top"
-             height="19"
-             increment="0.25"
-             initial_value="1"
-             label="Falloff"
-             label_width="70"
-             layout="topleft"
-             left="10"
-             max_val="2"
-             name="Light Falloff"
-             top_pad="3"
-             width="128" />
-          <spinner bottom_delta="0" decimal_digits="3" follows="left|top" height="16"
-           increment="0.05" initial_val="1" label="Ambiance" label_width="55"
-           left="144" max_val="1" min_val="0" mouse_opaque="true"
-           name="Light Ambiance" width="120" />
+          <spinner bottom_delta="0"
+                   decimal_digits="3"
+                   follows="left|top"
+                   height="16"
+                   increment="0.1"
+                   initial_value="0.5"
+                   label="FOV"
+                   label_width="55"
+                   left="144"
+                   max_val="3"
+                   min_val="0"
+                   mouse_opaque="true"
+                   name="Light FOV"
+                   width="120" />
+          <spinner follows="left|top"
+                   height="19"
+                   initial_value="5"
+                   label="Radius"
+                   label_width="70"
+                   layout="topleft"
+                   left="10"
+                   max_val="20"
+                   name="Light Radius"
+                   top_pad="3"
+                   width="128" />
+          <spinner bottom_delta="0"
+                   decimal_digits="3"
+                   follows="left|top"
+                   height="16"
+                   increment="0.5"
+                   initial_value="0.5"
+                   label="Focus"
+                   label_width="55"
+                   left="144"
+                   max_val="20"
+                   min_val="-20"
+                   mouse_opaque="true"
+                   name="Light Focus"
+                   width="120" />
+          <spinner follows="left|top"
+                   height="19"
+                   increment="0.25"
+                   initial_value="1"
+                   label="Falloff"
+                   label_width="70"
+                   layout="topleft"
+                   left="10"
+                   max_val="2"
+                   name="Light Falloff"
+                   top_pad="3"
+                   width="128" />
+          <spinner bottom_delta="0"
+                   decimal_digits="3"
+                   follows="left|top"
+                   height="16"
+                   increment="0.05"
+                   initial_value="1"
+                   label="Ambiance"
+                   label_width="55"
+                   left="144"
+                   max_val="1"
+                   min_val="0"
+                   mouse_opaque="true"
+                   name="Light Ambiance"
+                   width="120" />
         </panel>
          <panel
          border="false"
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 976f6d6cd0..b7fd9773f2 100644
--- a/indra/newview/skins/default/xui/en/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml
@@ -46,7 +46,6 @@
      image_unselected="BackButton_Off"
      layout="topleft"
      name="back_btn"
-     picture_style="true"
      left="10"
      tab_stop="false"
      top="2"
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 6744a7b9c2..3f41973b72 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_classified.xml
@@ -30,7 +30,6 @@
      image_unselected="BackButton_Off"
      layout="topleft"
      name="back_btn"
-     picture_style="true"
      left="10"
      tab_stop="false"
      top="2"
diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
index 96c76576c0..00b1fdd843 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -113,10 +113,6 @@
 	<!--      top_delta="0" -->
 	<!--      width="168" /> -->
         <search_combo_box
-	     bevel_style="none"
-	     border_style="line"
-	     border.border_thickness="0"
-	     commit_on_focus_lost="false"
 	     follows="right|top"
 	     halign="right"
 	     height="23"
diff --git a/indra/newview/skins/default/xui/en/panel_nearby_media.xml b/indra/newview/skins/default/xui/en/panel_nearby_media.xml
index f5a78fc929..d8675b3512 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_media.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
-	can_resize="true"
-	can_close="false"
  bg_opaque_image="Volume_Background" 
  bg_alpha_image="Volume_Background" 
   background_opaque="true"
@@ -58,7 +56,6 @@
 		top_delta="0"
 		left_pad="4"
 		height="22"
-		min_width="28"
 		width="28">
 	  <button.commit_callback
 		  function="MediaListCtrl.GoMediaPrefs" />
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
index fca9b4bca1..4ebd4c76f8 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
@@ -162,8 +162,9 @@
      name="block_list"
      top_pad="20"
      width="145">
-        <button.commit_callback
-         function="SideTray.ShowPanel"
-		 parameter="panel_block_list_sidetray" />
+        <!--<button.commit_callback
+         function="SideTray.ShowPanel"-->
+      <button.commit_callback
+         function="Pref.BlockList"/>
     </button>
     </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml b/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml
index d3fb77f135..d8f4297e0c 100644
--- a/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml
@@ -10,7 +10,6 @@
  name="topinfo_bar"
  width="1024">
   <button
-    border="true"
     follows="left|top"
     height="16"
     hover_glow_amount="0.15"
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 b3bc618eec..eaa4c03d04 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
-	 auto_tile="true"
 	 height="570"
 	 layout="topleft"
 	 name="item properties"
 	 help_topic="item_properties"
-	 save_rect="true"
 	 title="Object Profile"
 	 width="333">
 	<panel.string
diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
index faa1ae4e8b..30346319df 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -219,7 +219,6 @@
 			 left_pad="0"
 			 top_delta="0"
 			 name="button set group"
-			 picture_style="true"
 			 tab_stop="false"
 			 tool_tip="Choose a group to share this object's permissions"
 			 width="10" />
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 68eea8dc9a..e30c081ba1 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -1812,7 +1812,8 @@ Clears (deletes) the media and all params from the given face.
 	<string name="skirt">Skirt</string>
 	<string name="alpha">Alpha</string>
 	<string name="tattoo">Tattoo</string>
-	<string name="invalid">invalid</string>
+  <string name="invalid">invalid</string>
+  <string name="none">none</string>
   
   <!-- Not Worn Wearable Types -->
 	<string name="shirt_not_worn">Shirt not worn</string>
diff --git a/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml b/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml
index 5d429d5b5b..ce84cfedc0 100644
--- a/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml
+++ b/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <search_combo_box
  allow_text_entry="true"
- list_position="BELOW"
+ list_position="below"
  show_text_as_tentative="false"
  dropdown_button_visible="false"
  max_chars="256"
  name="parent"
- allow_new_values="true"
- background_image="TextField_Search_Off"
- background_image_disabled="TextField_Search_Disabled"
- background_image_focused="TextField_Search_Active">
+ allow_new_values="true">
  <combo_editor
   name="child1"
   select_on_focus="true"
-- 
cgit v1.2.3


From 6e961cd9f244bc979f653c8ee468617c280d0e9e Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 22 Jun 2010 18:26:29 -0700
Subject: EXT-7729 WIP  LLWARNS: Tons of "Making dummy class..." warnings on
 startup improved filename output for XUI parser errors

---
 indra/newview/skins/default/xui/en/menu_edit.xml            |  1 +
 indra/newview/skins/default/xui/en/panel_main_inventory.xml |  2 --
 indra/newview/skins/default/xui/en/panel_people.xml         | 10 ----------
 indra/newview/skins/default/xui/en/panel_picks.xml          |  2 --
 indra/newview/skins/default/xui/en/panel_toast.xml          |  2 --
 indra/newview/skins/default/xui/en/sidepanel_task_info.xml  |  2 --
 6 files changed, 1 insertion(+), 18 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_edit.xml b/indra/newview/skins/default/xui/en/menu_edit.xml
index 68f3cb532c..fab76c497c 100644
--- a/indra/newview/skins/default/xui/en/menu_edit.xml
+++ b/indra/newview/skins/default/xui/en/menu_edit.xml
@@ -52,6 +52,7 @@
   <menu_item_call
    label="Delete"
    name="Delete"
+   allow_key_repeat="true" 
    shortcut="Del">
     <menu_item_call.on_click
      function="Edit.Delete" />
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 2a53b3e2fa..16529f4064 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -104,8 +104,6 @@
   </tab_container>
   <layout_stack
    animate="false"
-   background_visible="true"
-   bevel_style="none"
    border_size="0"
    follows="left|right|bottom"
    height="25"
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index b79ef1e287..7cd0d5b5f0 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -95,8 +95,6 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
          width="313">
             <avatar_list
              allow_select="true"
-       		 bg_alpha_color="DkGray2"
-             bg_opaque_color="DkGray2"
              follows="all"
              height="356"
              ignore_online_status="true"
@@ -300,16 +298,11 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
     -->
             <group_list
              allow_select="true" 
-             background_visible="true"
-             bg_alpha_color="DkGray2"
-             bg_opaque_color="DkGray2"
              follows="all"
              height="356"
              layout="topleft"
              left="3"
              name="group_list"
-             no_filtered_groups_msg="[secondlife:///app/search/groups Try finding the group in search?]"
-             no_groups_msg="[secondlife:///app/search/groups Try searching for some groups to join.]"
              top="0"
              width="307" />
             <panel
@@ -386,9 +379,6 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
          width="313">
             <avatar_list
              allow_select="true"
-       		 background_visible="true"
-       		 bg_alpha_color="DkGray2"
-             bg_opaque_color="DkGray2"
              follows="all"
              height="356"
              layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml
index 0093a08e15..a815cdf7f0 100644
--- a/indra/newview/skins/default/xui/en/panel_picks.xml
+++ b/indra/newview/skins/default/xui/en/panel_picks.xml
@@ -38,7 +38,6 @@ bg_opaque_color="DkGray2"
   single_expansion="true"
   width="313">
     <accordion_tab
-     can_resize="false"
      layout="topleft"
      height="235"
      min_height="150"
@@ -56,7 +55,6 @@ bg_opaque_color="DkGray2"
          width="313" />
     </accordion_tab>
     <accordion_tab
-     can_resize="false"
      layout="topleft"
      height="235"
      name="tab_classifieds"
diff --git a/indra/newview/skins/default/xui/en/panel_toast.xml b/indra/newview/skins/default/xui/en/panel_toast.xml
index 92b4c17247..42f64c3a76 100644
--- a/indra/newview/skins/default/xui/en/panel_toast.xml
+++ b/indra/newview/skins/default/xui/en/panel_toast.xml
@@ -31,8 +31,6 @@
  can_close="false"
  can_dock="false"
  border_visible = "false"
- border_drop_shadow_visible = "false"
- drop_shadow_visible = "false"
  border = "false"
 >
  <panel
diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
index 30346319df..ef7ec74b5a 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
-	 auto_tile="true"
 	 height="570"
 	 layout="topleft"
 	 name="object properties"
 	 help_topic="object_properties"
-	 save_rect="true"
 	 title="Object Profile"
 	 width="333">
 	 <panel.string
-- 
cgit v1.2.3


From 0a50de9b67973f88f608b3d4013a8453c73b8c77 Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Thu, 24 Jun 2010 13:12:40 +0300
Subject: EXT-8007 FIXED updated heights and pads (wearables panel on panel
 outfit edit)

Reviwed by Neal Orman at https://codereview.productengine.com/secondlife/r/645/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_outfit_edit.xml | 8 ++++----
 1 file changed, 4 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 4abd7dceac..fde48d6ba3 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -318,13 +318,13 @@ It is calculated as border_size + 2*UIResizeBarOverlap
              background_visible="false"
              border="false"
              follows="left|top|right|bottom"
-             height="442"
+             height="449"
              layout="topleft"
              left="0"
              mouse_opaque="false"
              name="folder_view"
-             top_pad="5"
-             width="310"
+             top_pad="0"
+             width="313"
              visible="false"/>
             <panel
              name="filtered_wearables_panel"
@@ -346,7 +346,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap
                  layout="topleft"
                  follows="all"
                  multi_select="true"
-                 width="310"
+                 width="313"
                  height="449"
                  left="0"
                  top="0"/>
-- 
cgit v1.2.3


From c99bfaf6ed7bf280a3355c10630a66f5c5affbc1 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Thu, 24 Jun 2010 13:16:35 +0300
Subject: EXT-7961 FIXED Added possibility to show label on the back button in
 Edit Wearables panel.

Implemented behavior:
 * Normally Back button appears narrow without label
 * When wearable is changed - "Save" label is set and button gets wide. Left Border of Title is moved to the right.
   Note: "Save" label is shown without truncation in all languages, Title can be truncated with dots.
 * When changes are saved/reverted - label is removed, button shrinks, Title left border is moved to the its default place.
 * Added consistent tooltip for title (the same as a title).
 * Added tooltip for button: "Save changes if necessary and return back"

Details:
 * added getter for button's font
 * implemented derived from LLButton class for Back button to enable setting necessary label's padding in xml

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

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_edit_wearable.xml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 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 fc1caca9e9..484617df34 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
@@ -131,19 +131,25 @@
      name="tattoo_desc_text">
         Tattoo:
     </string>
-    <button
+    <!-- Default width of the button should be to show it without label.
+     Button will be extedned in code to show whole label when wearable is being changed.
+    -->
+    <labeled_back_button
      follows="top|left"
      height="24"
      image_hover_unselected="BackButton_Over"
      image_pressed="BackButton_Press"
      image_unselected="BackButton_Off"
      layout="topleft"
+     label="Save"
      left="11"
      name="back_btn"
+     pad_left="24"
+     tool_tip="Return to Edit Outfit"
      top="3"
      width="30" />
     <text
-     follows="top|left"
+     follows="top|left|right"
      font="SansSerifHugeBold"
      height="22"
      layout="topleft"
@@ -152,7 +158,8 @@
      text_color="white"
      top="3"
      value="Editing Shape"
-     width="270" />
+     use_ellipses="true"
+     width="274" />
     <panel
      background_opaque="true"
      background_visible="true"
-- 
cgit v1.2.3


From a0cb8a35dc1419ed18ae031dfb201c68a6b14f4b Mon Sep 17 00:00:00 2001
From: Vladimir Pchelko <pchelko@productengine.com>
Date: Thu, 24 Jun 2010 14:33:56 +0300
Subject: EXT-7962 FIXED Background color was Changed to back for layout panel
 "add_button_and_combobox".

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

--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 fde48d6ba3..10dea659af 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -190,7 +190,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap
                 <layout_panel
                  auto_resize="true" 
                  background_visible="true"
-                 bg_alpha_color="DkGray2"
+                 bg_alpha_color="Black"
                  layout="topleft"
                  height="154"
                  name="add_button_and_combobox"
-- 
cgit v1.2.3


From 259b033d6aca0333566f5dd5f6e03d9b954d1955 Mon Sep 17 00:00:00 2001
From: Yuri Chebotarev <ychebotarev@productengine.com>
Date: Thu, 24 Jun 2010 14:59:49 +0300
Subject:  EXT-7905 FIX xml fix

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

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

(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 e894fc8fb8..2fbe4510e1 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
@@ -96,6 +96,7 @@ background_visible="true"
        follows="all"
        layout="topleft"
        auto_resize="true"
+       height="513"
        width="313">
    <accordion
      left="0"
@@ -105,6 +106,7 @@ background_visible="true"
      follows="all"
      layout="topleft"
      name="groups_accordion"
+     height="513"
      width="313">
          <accordion_tab
             expanded="true"
@@ -182,6 +184,7 @@ background_visible="true"
          top_pad="0"
    name="button_row"
    follows="bottom|left"
+   height="23"
    width="313">
    <button
     follows="bottom|left"
-- 
cgit v1.2.3


From 9196490315e072f6f8b4cd97c58bc0b52700faf1 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Thu, 24 Jun 2010 11:01:22 -0400
Subject: EXT-5339 FIXED Inventory - "Object Profile" should be "Item Profile"

---
 indra/newview/skins/default/xui/en/sidepanel_item_info.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/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
index b3bc618eec..185e7ebafc 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -6,7 +6,7 @@
 	 name="item properties"
 	 help_topic="item_properties"
 	 save_rect="true"
-	 title="Object Profile"
+	 title="Item Profile"
 	 width="333">
 	<panel.string
 		 name="unknown">
@@ -60,7 +60,7 @@
      text_color="LtGray"
      top="2"
      use_ellipses="true"
-     value="Object Profile"
+     value="Item Profile"
      width="275" />
     	    <text
      follows="top|left"
-- 
cgit v1.2.3


From f261af07b6b4e9381d9b7d652897d0965c6a426e Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Thu, 24 Jun 2010 18:43:13 +0300
Subject: EXT-8046 FIXED changed background image of Shop btn (panel outfit
 edit)

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

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_outfit_edit.xml     | 24 +++++++++++-----------
 1 file changed, 12 insertions(+), 12 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 10dea659af..362fdd606a 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -382,20 +382,20 @@ It is calculated as border_size + 2*UIResizeBarOverlap
         <icon
          follows="bottom|left|right"
          height="25"
-         image_name="Toolbar_Right_Off"
+         image_name="Toolbar_Middle_Off"
          layout="topleft"
          left_pad="1"
          name="dummy_right_icon"
-         width="246" />
+         width="250" />
         <button
          follows="bottom|right"
          height="25"
-         image_hover_unselected="Toolbar_Middle_Over"
+         image_hover_unselected="Toolbar_Right_Over"
          image_overlay="Shop"
-         image_selected="Toolbar_Middle_Selected"
-         image_unselected="Toolbar_Middle_Off"
+         image_selected="Toolbar_Right_Selected"
+         image_unselected="Toolbar_Right_Off"
          layout="topleft"
-         left_pad="0"
+         left_pad="1"
          name="shop_btn_1"
          top="1"
          width="31" />
@@ -468,21 +468,21 @@ It is calculated as border_size + 2*UIResizeBarOverlap
         <icon
          follows="bottom|left|right"
          height="25"
-         image_name="Toolbar_Right_Off"
+         image_name="Toolbar_Middle_Off"
          layout="topleft"
          left_pad="1"
          name="dummy_right_icon"
-         width="153" >
+         width="154" >
         </icon>
         <button
          follows="bottom|right"
          height="25"
-         image_hover_unselected="Toolbar_Middle_Over"
+         image_hover_unselected="Toolbar_Right_Over"
          image_overlay="Shop"
-         image_selected="Toolbar_Middle_Selected"
-         image_unselected="Toolbar_Middle_Off"
+         image_selected="Toolbar_Right_Selected"
+         image_unselected="Toolbar_Right_Off"
          layout="topleft"
-         left_pad="0"
+         left_pad="1"
          name="shop_btn_2"
          top="1"
          width="31" />
-- 
cgit v1.2.3


From 47bf30757ec98cedba9e54528c0ed15a620807fb Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Thu, 24 Jun 2010 11:12:49 -0700
Subject: ND-47148 DE translation for set 11, set 12, and new files

---
 .../newview/skins/default/xui/de/floater_about.xml |   4 +-
 .../skins/default/xui/de/floater_about_land.xml    |   3 +
 .../default/xui/de/floater_avatar_textures.xml     |  78 ++++++------
 indra/newview/skins/default/xui/de/floater_map.xml |   2 +-
 .../skins/default/xui/de/floater_moveview.xml      |  36 +++++-
 .../default/xui/de/floater_preview_notecard.xml    |   4 +-
 .../newview/skins/default/xui/de/floater_tools.xml |   4 +-
 .../skins/default/xui/de/menu_attachment_self.xml  |   2 +-
 .../skins/default/xui/de/menu_avatar_self.xml      |   4 +-
 .../skins/default/xui/de/menu_bottomtray.xml       |   5 +
 .../default/xui/de/menu_inspect_self_gear.xml      |   2 +-
 .../skins/default/xui/de/menu_inventory.xml        |   1 +
 .../skins/default/xui/de/menu_participant_list.xml |   4 +-
 indra/newview/skins/default/xui/de/menu_viewer.xml |   2 +
 .../newview/skins/default/xui/de/notifications.xml |  88 ++++++++++++-
 .../skins/default/xui/de/panel_bottomtray.xml      |  25 ++--
 .../skins/default/xui/de/panel_edit_shape.xml      |   1 +
 .../skins/default/xui/de/panel_edit_tattoo.xml     |   1 +
 .../skins/default/xui/de/panel_edit_wearable.xml   |   6 +
 .../default/xui/de/panel_group_land_money.xml      |   3 +
 .../skins/default/xui/de/panel_group_notices.xml   |   1 +
 indra/newview/skins/default/xui/de/panel_login.xml |  12 +-
 .../skins/default/xui/de/panel_main_inventory.xml  |  66 ++--------
 .../skins/default/xui/de/panel_outfit_edit.xml     |   2 +
 .../newview/skins/default/xui/de/panel_people.xml  |  10 +-
 .../default/xui/de/panel_preferences_advanced.xml  |   2 +-
 .../default/xui/de/panel_preferences_chat.xml      |   2 +-
 .../default/xui/de/panel_preferences_graphics1.xml |  22 +---
 .../skins/default/xui/de/sidepanel_appearance.xml  |  11 +-
 .../skins/default/xui/de/sidepanel_inventory.xml   |   2 +-
 indra/newview/skins/default/xui/de/strings.xml     | 140 ++++++++++++++++++++-
 31 files changed, 391 insertions(+), 154 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/de/floater_about.xml b/indra/newview/skins/default/xui/de/floater_about.xml
index 89f9f87043..b18894d478 100644
--- a/indra/newview/skins/default/xui/de/floater_about.xml
+++ b/indra/newview/skins/default/xui/de/floater_about.xml
@@ -28,8 +28,8 @@ Grafikkarten: [GRAPHICS_CARD]
 libcurl-Version: [LIBCURL_VERSION]
 J2C-Decoderversion: [J2C_VERSION]
 Audio-Treiberversion: [AUDIO_DRIVER_VERSION]
-Qt Webkit Version: [QT_WEBKIT_VERSION]
-Vivox-Version: [VIVOX_VERSION]
+Qt Webkit-Version: [QT_WEBKIT_VERSION]
+Voice-Serverversion: [VOICE_VERSION]
 	</floater.string>
 	<floater.string name="none">
 		(keiner)
diff --git a/indra/newview/skins/default/xui/de/floater_about_land.xml b/indra/newview/skins/default/xui/de/floater_about_land.xml
index 3026ff64b2..5f00fc4f77 100644
--- a/indra/newview/skins/default/xui/de/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/de/floater_about_land.xml
@@ -62,6 +62,9 @@
 			<panel.string name="no_selection_text">
 				Keine Parzelle ausgewählt.
 			</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:">
 				Name:
 			</text>
diff --git a/indra/newview/skins/default/xui/de/floater_avatar_textures.xml b/indra/newview/skins/default/xui/de/floater_avatar_textures.xml
index 92c0c4a27a..8235eacde0 100644
--- a/indra/newview/skins/default/xui/de/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/de/floater_avatar_textures.xml
@@ -3,46 +3,48 @@
 	<floater.string name="InvalidAvatar">
 		UNGÜLTIGER AVATAR
 	</floater.string>
-	<text name="label" width="120">
-		Gebackene Texturen
-	</text>
-	<text name="composite_label" width="170">
-		Zusammengesetzte Texturen
-	</text>
-	<button label="Läd IDs in Konsole ab" label_selected="Abladen" name="Dump"/>
 	<scroll_container name="profile_scroll">
 		<panel name="scroll_content_panel">
-			<texture_picker label="Haare" name="hair-baked"/>
-			<texture_picker label="Haare" name="hair_grain"/>
-			<texture_picker label="Alpha: Haare" name="hair_alpha"/>
-			<texture_picker label="Kopf" name="head-baked"/>
-			<texture_picker label="Make-Up" name="head_bodypaint"/>
-			<texture_picker label="Kopf: Alpha" name="head_alpha"/>
-			<texture_picker label="Kopftattoo" name="head_tattoo"/>
-			<texture_picker label="Augen" name="eyes-baked"/>
-			<texture_picker label="Auge" name="eyes_iris"/>
-			<texture_picker label="Alpha: Augen" name="eyes_alpha"/>
-			<texture_picker label="Oberkörper" name="upper-baked"/>
-			<texture_picker label="Oberkörper: Körperfarbe" name="upper_bodypaint" width=
-			"140"/>
-			<texture_picker label="Unterhemd" name="upper_undershirt"/>
-			<texture_picker label="Handschuhe" name="upper_gloves"/>
-			<texture_picker label="Hemd" name="upper_shirt"/>
-			<texture_picker label="Oberjacke" name="upper_jacket"/>
-			<texture_picker label="Alpha: Oben" name="upper_alpha"/>
-			<texture_picker label="Obere Tattoos" name="upper_tattoo"/>
-			<texture_picker label="Unterkörper" name="lower-baked"/>
-			<texture_picker label="Unterkörper: Körperfarbe" name="lower_bodypaint" width=
-			"140"/>
-			<texture_picker label="Unterhose" name="lower_underpants"/>
-			<texture_picker label="Socken" name="lower_socks"/>
-			<texture_picker label="Schuhe" name="lower_shoes"/>
-			<texture_picker label="Hose" name="lower_pants"/>
-			<texture_picker label="Jacke" name="lower_jacket"/>
-			<texture_picker label="Alpha: Unten" name="lower_alpha"/>
-			<texture_picker label="Untere Tattoos" name="lower_tattoo"/>
-			<texture_picker label="Rock" name="skirt-baked"/>
-			<texture_picker label="Rock" name="skirt"/>
+			<text name="label">
+				Gebackene
+Texturen
+			</text>
+			<text name="composite_label">
+				Zusammengesetzte
+Texturen
+			</text>
+			<button label="IDs an Konsole ausgeben" label_selected="Abladen" name="Dump"/>
+			<panel name="scroll_content_panel">
+				<texture_picker label="Haare" name="hair-baked"/>
+				<texture_picker label="Haare" name="hair_grain"/>
+				<texture_picker label="Alpha: Haare" name="hair_alpha"/>
+				<texture_picker label="Kopf" name="head-baked"/>
+				<texture_picker label="Make-Up" name="head_bodypaint"/>
+				<texture_picker label="Kopf: Alpha" name="head_alpha"/>
+				<texture_picker label="Kopftätowierung" name="head_tattoo"/>
+				<texture_picker label="Augen" name="eyes-baked"/>
+				<texture_picker label="Auge" name="eyes_iris"/>
+				<texture_picker label="Alpha: Augen" name="eyes_alpha"/>
+				<texture_picker label="Oberkörper" name="upper-baked"/>
+				<texture_picker label="Oberkörperfarbe" name="upper_bodypaint"/>
+				<texture_picker label="Unterhemd" name="upper_undershirt"/>
+				<texture_picker label="Handschuhe" name="upper_gloves"/>
+				<texture_picker label="Hemd" name="upper_shirt"/>
+				<texture_picker label="Oberjacke" name="upper_jacket"/>
+				<texture_picker label="Alpha: Oben" name="upper_alpha"/>
+				<texture_picker label="Obere Tätowierung" name="upper_tattoo"/>
+				<texture_picker label="Unterkörper" name="lower-baked"/>
+				<texture_picker label="Unterkörperfarbe" name="lower_bodypaint"/>
+				<texture_picker label="Unterhose" name="lower_underpants"/>
+				<texture_picker label="Socken" name="lower_socks"/>
+				<texture_picker label="Schuhe" name="lower_shoes"/>
+				<texture_picker label="Hose" name="lower_pants"/>
+				<texture_picker label="Jacke" name="lower_jacket"/>
+				<texture_picker label="Alpha: Unten" name="lower_alpha"/>
+				<texture_picker label="Untere Tätowierung" name="lower_tattoo"/>
+				<texture_picker label="Rock" name="skirt-baked"/>
+				<texture_picker label="Rock" name="skirt"/>
+			</panel>
 		</panel>
 	</scroll_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_map.xml b/indra/newview/skins/default/xui/de/floater_map.xml
index a9a3149177..130d3062d7 100644
--- a/indra/newview/skins/default/xui/de/floater_map.xml
+++ b/indra/newview/skins/default/xui/de/floater_map.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Map" title="Minikarte">
+<floater name="Map" title="">
 	<floater.string name="mini_map_north">
 		N
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/de/floater_moveview.xml b/indra/newview/skins/default/xui/de/floater_moveview.xml
index b978322cef..4333392582 100644
--- a/indra/newview/skins/default/xui/de/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/de/floater_moveview.xml
@@ -6,18 +6,48 @@
 	<string name="walk_back_tooltip">
 		Rückwärts gehen (Nach-Unten-Pfeil oder S drücken)
 	</string>
+	<string name="walk_left_tooltip">
+		Nach links gehen (Umschalt + Links-Pfeil oder A drücken)
+	</string>
+	<string name="walk_right_tooltip">
+		Nach rechts gehen (Umschalt + Rechts-Pfeil oder D drücken)
+	</string>
 	<string name="run_forward_tooltip">
 		Vorwärts rennen (Nach-oben-Pfeil oder W drücken)
 	</string>
 	<string name="run_back_tooltip">
 		Rückwärts rennen (Nach-Unten-Pfeil oder S drücken)
 	</string>
+	<string name="run_left_tooltip">
+		Nach links drehen (Umschalt + Links-Pfeil oder A drücken)
+	</string>
+	<string name="run_right_tooltip">
+		Nach rechts rennen (Umschalt + Rechts-Pfeil oder D drücken)
+	</string>
 	<string name="fly_forward_tooltip">
 		Vorwärts fliegen (Nach-oben-Pfeil oder W drücken)
 	</string>
 	<string name="fly_back_tooltip">
 		Rückwärts fliegen (Nach-Unten-Pfeil oder S drücken)
 	</string>
+	<string name="fly_left_tooltip">
+		Nach links fliegen (Umschalt + Links-Pfeil oder A drücken)
+	</string>
+	<string name="fly_right_tooltip">
+		Nach rechts fliegen (Umschalt + Rechts-Pfeil oder D drücken)
+	</string>
+	<string name="fly_up_tooltip">
+		Nach oben fliegen, „E&quot; drücken
+	</string>
+	<string name="fly_down_tooltip">
+		Nach unten fliegen, „C&quot; drücken
+	</string>
+	<string name="jump_tooltip">
+		Hüpfen (E drücken)
+	</string>
+	<string name="crouch_tooltip">
+		Ducken (C drücken)
+	</string>
 	<string name="walk_title">
 		Gehen
 	</string>
@@ -28,10 +58,12 @@
 		Fliegen
 	</string>
 	<panel name="panel_actions">
-		<button label="" label_selected="" name="turn left btn" tool_tip="Nach links (Links-Pfeil oder A drücken)"/>
-		<button label="" label_selected="" name="turn right btn" tool_tip="Nach rechts (Rechts-Pfeil oder D drücken)"/>
 		<button label="" label_selected="" name="move up btn" tool_tip="Nach oben fliegen, „E&quot; drücken"/>
+		<button label="" label_selected="" name="turn left btn" tool_tip="Nach links (Links-Pfeil oder A drücken)"/>
+		<joystick_slide name="move left btn" tool_tip="Nach links gehen (Umschalt + Links-Pfeil oder A drücken)"/>
 		<button label="" label_selected="" name="move down btn" tool_tip="Nach unten fliegen, „C&quot; drücken"/>
+		<button label="" label_selected="" name="turn right btn" tool_tip="Nach rechts (Rechts-Pfeil oder D drücken)"/>
+		<joystick_slide name="move right btn" tool_tip="Nach rechts fliegen (Umschalt + Rechts-Pfeil oder D drücken)"/>
 		<joystick_turn name="forward btn" tool_tip="Vorwärts gehen (Nach-oben-Pfeil oder W drücken)"/>
 		<joystick_turn name="backward btn" tool_tip="Rückwärts gehen (Nach-Unten-Pfeil oder S drücken)"/>
 	</panel>
diff --git a/indra/newview/skins/default/xui/de/floater_preview_notecard.xml b/indra/newview/skins/default/xui/de/floater_preview_notecard.xml
index 62f9e1e9e5..14e666fd22 100644
--- a/indra/newview/skins/default/xui/de/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/de/floater_preview_notecard.xml
@@ -9,9 +9,6 @@
 	<floater.string name="Title">
 		Notizkarte: [NAME]
 	</floater.string>
-	<floater.string label="Speichern" label_selected="Speichern" name="Save">
-		Speichern
-	</floater.string>
 	<text name="desc txt">
 		Beschreibung:
 	</text>
@@ -19,4 +16,5 @@
 		Wird geladen...
 	</text_editor>
 	<button label="Speichern" label_selected="Speichern" name="Save"/>
+	<button label="Löschen" label_selected="Löschen" name="Delete"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_tools.xml b/indra/newview/skins/default/xui/de/floater_tools.xml
index c5c11faf93..12ae9898c3 100644
--- a/indra/newview/skins/default/xui/de/floater_tools.xml
+++ b/indra/newview/skins/default/xui/de/floater_tools.xml
@@ -67,8 +67,8 @@
 	<text name="RenderingCost" tool_tip="Zeigt die errechneten Wiedergabekosten für dieses Objekt">
 		þ: [COUNT]
 	</text>
-	<check_box name="checkbox uniform"/>
-	<text name="checkbox uniform label">
+	<check_box label="" name="checkbox uniform"/>
+	<text label="Beide Seiten dehnen" name="checkbox uniform label">
 		Beide Seiten dehnen
 	</text>
 	<check_box initial_value="true" label="Texturen dehnen" name="checkbox stretch textures"/>
diff --git a/indra/newview/skins/default/xui/de/menu_attachment_self.xml b/indra/newview/skins/default/xui/de/menu_attachment_self.xml
index 3af69d2f31..85fc9ab74f 100644
--- a/indra/newview/skins/default/xui/de/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/de/menu_attachment_self.xml
@@ -5,7 +5,7 @@
 	<menu_item_call label="Abnehmen" name="Detach"/>
 	<menu_item_call label="Fallen lassen" name="Drop"/>
 	<menu_item_call label="Aufstehen" name="Stand Up"/>
-	<menu_item_call label="Mein Aussehen" name="Appearance..."/>
+	<menu_item_call label="Outfit ändern" name="Change Outfit"/>
 	<menu_item_call label="Meine Freunde" name="Friends..."/>
 	<menu_item_call label="Meine Gruppen" name="Groups..."/>
 	<menu_item_call label="Mein Profil" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/de/menu_avatar_self.xml b/indra/newview/skins/default/xui/de/menu_avatar_self.xml
index d310d10ea5..160703bcf3 100644
--- a/indra/newview/skins/default/xui/de/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/de/menu_avatar_self.xml
@@ -20,7 +20,9 @@
 		<context_menu label="Abnehmen ▶" name="Object Detach"/>
 		<menu_item_call label="Alles abnehmen" name="Detach All"/>
 	</context_menu>
-	<menu_item_call label="Mein Aussehen" name="Appearance..."/>
+	<menu_item_call label="Outfit ändern" name="Chenge Outfit"/>
+	<menu_item_call label="Mein Outfit bearbeiten" name="Edit Outfit"/>
+	<menu_item_call label="Meine Form bearbeiten" name="Edit My Shape"/>
 	<menu_item_call label="Meine Freunde" name="Friends..."/>
 	<menu_item_call label="Meine Gruppen" name="Groups..."/>
 	<menu_item_call label="Mein Profil" name="Profile..."/>
diff --git a/indra/newview/skins/default/xui/de/menu_bottomtray.xml b/indra/newview/skins/default/xui/de/menu_bottomtray.xml
index 3f12906adc..6c4308286a 100644
--- a/indra/newview/skins/default/xui/de/menu_bottomtray.xml
+++ b/indra/newview/skins/default/xui/de/menu_bottomtray.xml
@@ -4,6 +4,11 @@
 	<menu_item_check label="Schaltfläche Bewegungssteuerung" name="ShowMoveButton"/>
 	<menu_item_check label="Schaltfläche Ansicht" name="ShowCameraButton"/>
 	<menu_item_check label="Schaltfläche Foto" name="ShowSnapshotButton"/>
+	<menu_item_check label="Schaltfläche „Seitenleiste“" name="ShowSidebarButton"/>
+	<menu_item_check label="Schaltfläche „Bauen“" name="ShowBuildButton"/>
+	<menu_item_check label="Schaltfläche „Suchen“" name="ShowSearchButton"/>
+	<menu_item_check label="Schaltfläche „Karte“" name="ShowWorldMapButton"/>
+	<menu_item_check label="Schaltfläche „Minikarte“" name="ShowMiniMapButton"/>
 	<menu_item_call label="Ausschneiden" name="NearbyChatBar_Cut"/>
 	<menu_item_call label="Kopieren" name="NearbyChatBar_Copy"/>
 	<menu_item_call label="Einfügen" name="NearbyChatBar_Paste"/>
diff --git a/indra/newview/skins/default/xui/de/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/de/menu_inspect_self_gear.xml
index a74c41bb0c..b28e83c3e3 100644
--- a/indra/newview/skins/default/xui/de/menu_inspect_self_gear.xml
+++ b/indra/newview/skins/default/xui/de/menu_inspect_self_gear.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu name="Gear Menu">
 	<menu_item_call label="Aufstehen" name="stand_up"/>
-	<menu_item_call label="Mein Aussehen" name="my_appearance"/>
+	<menu_item_call label="Outfit ändern" name="change_outfit"/>
 	<menu_item_call label="Mein Profil" name="my_profile"/>
 	<menu_item_call label="Meine Freunde" name="my_friends"/>
 	<menu_item_call label="Meine Gruppen" name="my_groups"/>
diff --git a/indra/newview/skins/default/xui/de/menu_inventory.xml b/indra/newview/skins/default/xui/de/menu_inventory.xml
index f6139a0ea0..dd49ab1c7e 100644
--- a/indra/newview/skins/default/xui/de/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/de/menu_inventory.xml
@@ -54,6 +54,7 @@
 	<menu_item_call label="Objekt löschen" name="Purge Item"/>
 	<menu_item_call label="Objekt wiederherstellen" name="Restore Item"/>
 	<menu_item_call label="Öffnen" name="Open"/>
+	<menu_item_call label="Original öffnen" name="Open Original"/>
 	<menu_item_call label="Eigenschaften" name="Properties"/>
 	<menu_item_call label="Umbenennen" name="Rename"/>
 	<menu_item_call label="Asset-UUID kopieren" name="Copy Asset UUID"/>
diff --git a/indra/newview/skins/default/xui/de/menu_participant_list.xml b/indra/newview/skins/default/xui/de/menu_participant_list.xml
index ca0d9f8c2d..d5281f0cb2 100644
--- a/indra/newview/skins/default/xui/de/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/de/menu_participant_list.xml
@@ -14,8 +14,8 @@
 	<context_menu label="Moderator-Optionen &gt;" name="Moderator Options">
 		<menu_item_check label="Text-Chat zulassen" name="AllowTextChat"/>
 		<menu_item_call label="Diesen Teilnehmer stummschalten" name="ModerateVoiceMuteSelected"/>
-		<menu_item_call label="Alle anderen stummschalten" name="ModerateVoiceMuteOthers"/>
 		<menu_item_call label="Stummschaltung für diesen Teilnehmer aufheben" name="ModerateVoiceUnMuteSelected"/>
-		<menu_item_call label="Stummschaltung für alle anderen aufheben" name="ModerateVoiceUnMuteOthers"/>
+		<menu_item_call label="Alle stummschalten" name="ModerateVoiceMute"/>
+		<menu_item_call label="Alle freischalten" name="ModerateVoiceUnmute"/>
 	</context_menu>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml
index 38ef1b0421..0a2d5b472a 100644
--- a/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -7,6 +7,7 @@
 		</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="Outfit ändern" name="ChangeOutfit"/>
 		<menu_item_check label="Mein Inventar" name="Inventory"/>
 		<menu_item_check label="Mein Inventar" name="ShowSidetrayInventory"/>
 		<menu_item_check label="Meine Gesten" name="Gestures"/>
@@ -169,6 +170,7 @@
 			<menu_item_check label="Flexible Objekte" name="Flexible Objects"/>
 		</menu>
 		<menu_item_check label="Mehrere Threads ausführen" name="Run Multiple Threads"/>
+		<menu_item_check label="Plugin Read Thread verwenden" name="Use Plugin Read Thread"/>
 		<menu_item_call label="Gruppen-Cache löschen" name="ClearGroupCache"/>
 		<menu_item_check label="Weiche Mausbewegung" name="Mouse Smoothing"/>
 		<menu label="Tastaturkürzel" name="Shortcuts">
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index 408ece9690..8380992d79 100644
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -333,6 +333,9 @@ Sie benötigen ein Benutzerkonto, um [SECOND_LIFE] betreten zu können. Möchten
 		</url>
 		<usetemplate name="okcancelbuttons" notext="Erneut versuchen" yestext="Neues Benutzerkonto anlegen"/>
 	</notification>
+	<notification name="InvalidCredentialFormat">
+		Sie müssen den Vor- und Nachnamen Ihres Avatars in das Feld Benutzername eingeben, und sich dann erneut anmelden.
+	</notification>
 	<notification name="AddClassified">
 		Anzeigen werden im Suchverzeichnis im Abschnitt „Anzeigen&quot; und auf [http://secondlife.com/community/classifieds secondlife.com] für eine Woche angezeigt.
 Füllen Sie Ihre Anzeige aus und klicken Sie auf &apos;Veröffentlichen...&apos;, um sie zum Verzeichnis hinzuzufügen.
@@ -618,6 +621,11 @@ Erwartet wurde [VALIDS]
 	<notification name="CannotEncodeFile">
 		Datei konnte nicht kodiert werden: [FILE]
 	</notification>
+	<notification name="CorruptedProtectedDataStore">
+		Ihre geschützten Daten konnten nicht gelesen werden, aus diesem Grund werden diese zurückgesetzt.
+   Dies kann passieren, wenn Sie die Netzwerkeinstellungen ändern.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="CorruptResourceFile">
 		Ressourcendatei beschädigt: [FILE]
 	</notification>
@@ -1003,6 +1011,12 @@ auf ALLEN LÄNDERN in diesem Sim LÖSCHEN?
 
 Geben sie einen höheren Betrag ein.
 	</notification>
+	<notification name="ConfirmItemDeleteHasLinks">
+		Mindestens eines Ihrer ausgewählten Objekte verfügt über verknüpfte Objekte.  Wenn Sie dieses Objekt löschen, funktionieren die Verknüpfungen nicht mehr.  Wir empfehlen Ihnen daher, diese Verknüpfungen zuerst zu löschen.
+
+Möchten Sie diese Objekte wirklich löschen?
+		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmObjectDeleteLock">
 		Mindestens ein ausgewähltes Objekt ist gesperrt.
 
@@ -1153,6 +1167,42 @@ Bitte wählen Sie einen männlichen oder weiblichen Avatar.
 Sie können sich später noch umentscheiden.
 		<usetemplate name="okcancelbuttons" notext="Weiblich" yestext="Männlich"/>
 	</notification>
+	<notification name="CantTeleportToGrid">
+		Konnte nicht zu [SLURL] teleportieren, da dieser Standort sich auf einem anderen Grid ([GRID]) befindet. Sie befinden sich im Moment auf dem Grid ([CURRENT_GRID]).  Bitte schließen Sie Ihren Viewer und versuchen Sie es erneut.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="GeneralCertificateError">
+		Eine Verbindung zum Server konnte nicht hergestellt werden.
+[REASON]
+
+SubjektName: [SUBJECT_NAME_STRING]
+Herausgeber: [ISSUER_NAME_STRING]
+Gültig ab: [VALID_FROM]
+Gültig bis: [VALID_TO]
+MD5 Fingerabdruck: [SHA1_DIGEST]
+SHA1 Fingerabdruck: [MD5_DIGEST]
+Verwendung: [KEYUSAGE]
+Erweiterte Verwendung: [EXTENDEDKEYUSAGE]
+Identifikation: [SUBJECTKEYIDENTIFIER]
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="TrustCertificateError">
+		Die Zertifizierungsautorität für diesen Server ist unbekannt.
+
+Zertifikatsinformation:
+SubjektName: [SUBJECT_NAME_STRING]
+Herausgeber: [ISSUER_NAME_STRING]
+Gültig ab: [VALID_FROM]
+Gültig bis: [VALID_TO]
+MD5 Fingerabdruck: [SHA1_DIGEST]
+SHA1 Fingerabdruck: [MD5_DIGEST]
+Verwendung: [KEYUSAGE]
+Erweiterte Verwendung: [EXTENDEDKEYUSAGE]
+Identifikation: [SUBJECTKEYIDENTIFIER]
+
+Möchten Sie dieser Autorität vertrauen?
+		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="Vertrauen"/>
+	</notification>
 	<notification name="NotEnoughCurrency">
 		[NAME] [PRICE] L$  Sie haben nicht genügend L$, um diese Aktion auszuführen.
 	</notification>
@@ -2660,6 +2710,9 @@ Für folgende Einwohner:
 	<notification name="ItemsShared">
 		Objekte wurden erfolgreich freigegeben.
 	</notification>
+	<notification name="DeedToGroupFail">
+		Übertragung an Gruppe ist fehlgeschlagen.
+	</notification>
 	<notification name="AvatarRezNotification">
 		(Seit [EXISTENCE] Sekunden inworld )
 Avatar &apos;[NAME]&apos; wurde in [TIME] Sekunden gerezzt.
@@ -2672,6 +2725,26 @@ Ihr Outfit wurde in [TIME] Sekunden gebacken.
 		(Seit [EXISTENCE] Sekunden inworld )
 Nach [TIME] Sekunden wurde eine Aktualisierung Ihres Aussehens gesendet.
 [STATUS]
+	</notification>
+	<notification name="AvatarRezCloudNotification">
+		(Seit [EXISTENCE] Sekunden inworld )
+Avatar &apos;[NAME]&apos; wird als Wolke angezeigt.
+	</notification>
+	<notification name="AvatarRezArrivedNotification">
+		(Seit [EXISTENCE] Sekunden inworld )
+Avatar &apos;[NAME]&apos; wird angezeigt.
+	</notification>
+	<notification name="AvatarRezLeftCloudNotification">
+		(Seit [EXISTENCE] Sekunden inworld )
+Avatar &apos;[NAME]&apos; hat nach [TIME] Sekunden als Wolke die Welt verlassen.
+	</notification>
+	<notification name="AvatarRezEnteredAppearanceNotification">
+		(Seit [EXISTENCE] Sekunden inworld )
+Avatar &apos;[NAME]&apos; befindet sich im Modus „Aussehen bearbeiten&quot;.
+	</notification>
+	<notification name="AvatarRezLeftAppearanceNotification">
+		(Seit [EXISTENCE] Sekunden inworld )
+Avatar &apos;[NAME]&apos; hat Modus „Aussehen bearbeiten&quot; verlassen.
 	</notification>
 	<notification name="NoConnect">
 		Es gibt Probleme mit der Verbindung mit [PROTOCOL] [HOSTID].
@@ -2691,12 +2764,25 @@ Bitte überprüfen Sie Ihr Netzwerk- und Firewall-Setup.
 			<button name="OK" text="OK"/>
 		</form>
 	</notification>
+	<notification name="AvatarRezLeftNotification">
+		(Seit [EXISTENCE] Sekunden inworld )
+Avatar &apos;[NAME]&apos; hat als vollständig gerezzter Avatar die Welt verlassen.
+	</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="ConfirmLeaveCall">
+		Möchten Sie dieses Gespräch wirklich verlassen ?
+		<usetemplate ignoretext="Bestätigen, bevor ich den Anruf verlasse." name="okcancelignore" notext="Nein" yestext="Ja"/>
+	</notification>
 	<notification name="ConfirmMuteAll">
-		<usetemplate ignoretext="Confirm before I mute all participants in a group call" name="okcancelignore" notext="Abbrechen" yestext="OK"/>
+		Die von Ihnen ausgewählten Einstellungen werden alle Teilnehmer eines Gruppengespräches stummschalten.
+Dies bedeutet, dass alle Einwohner, die später dem Gespräch beitreten,
+auch dann stummgeschaltet werden, wenn Sie den Anruf verlassen haben.
+
+Alle stummschalten?
+		<usetemplate ignoretext="Bestätigen, bevor alle Teilnehmer in einem Gruppengespräch stummgeschaltet werden." 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_bottomtray.xml b/indra/newview/skins/default/xui/de/panel_bottomtray.xml
index 83f67344ca..ea15c88380 100644
--- a/indra/newview/skins/default/xui/de/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/de/panel_bottomtray.xml
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="bottom_tray">
-	<string name="SpeakBtnToolTip">
-		Schaltet Mikrofon ein/aus
-	</string>
-	<string name="VoiceControlBtnToolTip">
-		Voice-Chat-Steuerung anzeigen/ausblenden
-	</string>
+	<string name="SpeakBtnToolTip" value="Schaltet Mikrofon ein/aus"/>
+	<string name="VoiceControlBtnToolTip" value="Voice-Chat-Steuerung anzeigen/ausblenden"/>
 	<layout_stack name="toolbar_stack">
 		<layout_panel name="speak_panel">
 			<talk_button name="talk">
-				<speak_button label="Sprechen" label_selected="Sprechen" name="speak_btn" />
+				<speak_button label="Sprechen" label_selected="Sprechen" name="speak_btn"/>
 			</talk_button>
 		</layout_panel>
 		<layout_panel name="gesture_panel">
@@ -24,6 +20,21 @@
 		<layout_panel name="snapshot_panel">
 			<button label="" name="snapshots" tool_tip="Foto machen"/>
 		</layout_panel>
+		<layout_panel name="sidebar_btn_panel">
+			<button label="Seitenleiste" name="sidebar_btn" tool_tip="Seitenleiste anzeigen/ausblenden"/>
+		</layout_panel>
+		<layout_panel name="build_btn_panel">
+			<button label="Bauen" name="build_btn" tool_tip="Bauwerkzeuge ein-/ausblenden"/>
+		</layout_panel>
+		<layout_panel name="search_btn_panel">
+			<button label="Suche" name="search_btn" tool_tip="Suche anzeigen/ausblenden"/>
+		</layout_panel>
+		<layout_panel name="world_map_btn_panel">
+			<button label="Karte" name="world_map_btn" tool_tip="Karte ein-/ausblenden"/>
+		</layout_panel>
+		<layout_panel name="mini_map_btn_panel">
+			<button label="Minikarte" name="mini_map_btn" tool_tip="Minikarte ein-/ausblenden"/>
+		</layout_panel>
 		<layout_panel name="im_well_panel">
 			<chiclet_im_well name="im_well">
 				<button name="Unread IM messages" tool_tip="IMs"/>
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 d04dba7a3b..80d3b29cad 100644
--- a/indra/newview/skins/default/xui/de/panel_edit_shape.xml
+++ b/indra/newview/skins/default/xui/de/panel_edit_shape.xml
@@ -9,6 +9,7 @@
 	<string name="height">
 		Höhe:
 	</string>
+	<text name="avatar_height"/>
 	<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_tattoo.xml b/indra/newview/skins/default/xui/de/panel_edit_tattoo.xml
index 12649e9251..830c7b0bb8 100644
--- a/indra/newview/skins/default/xui/de/panel_edit_tattoo.xml
+++ b/indra/newview/skins/default/xui/de/panel_edit_tattoo.xml
@@ -4,5 +4,6 @@
 		<texture_picker label="Kopftattoo" name="Head Tattoo" tool_tip="Zum Auswählen eines Bildes hier klicken" width="80"/>
 		<texture_picker label="Obere Tattoos" name="Upper Tattoo" tool_tip="Zum Auswählen eines Bildes hier klicken" width="80"/>
 		<texture_picker label="Untere Tattoos" name="Lower Tattoo" tool_tip="Zum Auswählen eines Bildes hier klicken" width="80"/>
+		<color_swatch label="Farbe/Ton" name="Color/Tint" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/>
 	</panel>
 </panel>
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 7294a0b34f..f23244e14d 100644
--- a/indra/newview/skins/default/xui/de/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/de/panel_edit_wearable.xml
@@ -93,6 +93,12 @@
 	<text name="edit_wearable_title" value="Form bearbeiten"/>
 	<panel label="Hemd" name="wearable_type_panel">
 		<text name="description_text" value="Form:"/>
+		<radio_group name="sex_radio">
+			<radio_item label="" name="sex_male" tool_tip="Männlich" value="1"/>
+			<radio_item label="" name="sex_female" tool_tip="Weiblich" value="0"/>
+		</radio_group>
+		<icon name="male_icon" tool_tip="Männlich"/>
+		<icon name="female_icon" tool_tip="Weiblich"/>
 	</panel>
 	<panel name="button_panel">
 		<button label="Speichern unter" name="save_as_button"/>
diff --git a/indra/newview/skins/default/xui/de/panel_group_land_money.xml b/indra/newview/skins/default/xui/de/panel_group_land_money.xml
index 0c89946987..125bf1436e 100644
--- a/indra/newview/skins/default/xui/de/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_land_money.xml
@@ -6,6 +6,9 @@
 	<panel.string name="cant_view_group_land_text">
 		Sie sind nicht berechtigt, Landeigentum der Gruppe anzuzeigen.
 	</panel.string>
+	<panel.string name="epmty_view_group_land_text">
+		Keine Einträge
+	</panel.string>
 	<panel.string name="cant_view_group_accounting_text">
 		Sie sind nicht berechtigt, die Finanzinformationen der Gruppe anzuzeigen.
 	</panel.string>
diff --git a/indra/newview/skins/default/xui/de/panel_group_notices.xml b/indra/newview/skins/default/xui/de/panel_group_notices.xml
index cc5664bd97..f45b5ea7af 100644
--- a/indra/newview/skins/default/xui/de/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_notices.xml
@@ -39,6 +39,7 @@ Maximal 200 pro Gruppe täglich
 		<text name="string">
 			Das Objekt hierhin ziehen und ablegen, um es anzuhängen:
 		</text>
+		<button label="Inventar" name="open_inventory" tool_tip="Inventar öffnen"/>
 		<button label="Entfernen" label_selected="Anhang entfernen" name="remove_attachment" tool_tip="Anhang von Ihrer Benachrichtigung entfernen"/>
 		<button label="Senden" label_selected="Senden" name="send_notice"/>
 		<group_drop_target name="drop_target" tool_tip="Ziehen Sie ein Objekt aus Ihrem Inventar auf dieses Feld, um es mit dieser Mitteilung zu versenden. Um das Objekt anhängen zu können, müssen Sie die Erlaubnis zum Kopieren und Übertragen besitzen."/>
diff --git a/indra/newview/skins/default/xui/de/panel_login.xml b/indra/newview/skins/default/xui/de/panel_login.xml
index 2a6ea42c73..0f02de866b 100644
--- a/indra/newview/skins/default/xui/de/panel_login.xml
+++ b/indra/newview/skins/default/xui/de/panel_login.xml
@@ -8,18 +8,15 @@
 	</panel.string>
 	<layout_stack name="login_widgets">
 		<layout_panel name="login">
-			<text name="first_name_text">
-				Vorname:
+			<text name="username_text">
+				Benutzername:
 			</text>
-			<line_editor label="Vorname" name="first_name_edit" tool_tip="[SECOND_LIFE] Vorname"/>
-			<text name="last_name_text">
-				Nachname:
-			</text>
-			<line_editor label="Nachname" name="last_name_edit" tool_tip="[SECOND_LIFE] Nachname"/>
+			<line_editor label="Benutzername" name="username_edit" tool_tip="[SECOND_LIFE]-Benutzername"/>
 			<text name="password_text">
 				Kennwort:
 			</text>
 			<check_box label="Kennwort merken" name="remember_check"/>
+			<button label="Anmelden" name="connect_btn"/>
 			<text name="start_location_text">
 				Hier anfangen:
 			</text>
@@ -28,7 +25,6 @@
 				<combo_box.item label="Mein Zuhause" name="MyHome"/>
 				<combo_box.item label="&lt;Region eingeben&gt;" name="Typeregionname"/>
 			</combo_box>
-			<button label="Anmelden" name="connect_btn"/>
 		</layout_panel>
 		<layout_panel name="links">
 			<text name="create_new_account_text">
diff --git a/indra/newview/skins/default/xui/de/panel_main_inventory.xml b/indra/newview/skins/default/xui/de/panel_main_inventory.xml
index d3eb9ae04c..2f00782ef0 100644
--- a/indra/newview/skins/default/xui/de/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/de/panel_main_inventory.xml
@@ -9,62 +9,20 @@
 	<text name="ItemcountText">
 		Objekte:
 	</text>
-	<menu_bar name="Inventory Menu">
-		<menu label="Datei" name="File">
-			<menu_item_call label="Öffnen" name="Open"/>
-			<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_item_call label="Neues Fenster" name="New Window"/>
-			<menu_item_call label="Filter anzeigen" name="Show Filters"/>
-			<menu_item_call label="Filter zurücksetzen" name="Reset Current"/>
-			<menu_item_call label="Alle Ordner schließen" name="Close All Folders"/>
-			<menu_item_call label="Papierkorb ausleeren" name="Empty Trash"/>
-			<menu_item_call label="Fundstücke ausleeren" name="Empty Lost And Found"/>
-		</menu>
-		<menu label="Erstellen" name="Create">
-			<menu_item_call label="Neuer Ordner" name="New Folder"/>
-			<menu_item_call label="Neues Skript" name="New Script"/>
-			<menu_item_call label="Neue Notizkarte" name="New Note"/>
-			<menu_item_call label="Neue Geste" name="New Gesture"/>
-			<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/Gestalt" 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>
-		<menu label="Sortieren" name="Sort">
-			<menu_item_check label="Nach Name" name="By Name"/>
-			<menu_item_check label="Nach Datum" name="By Date"/>
-			<menu_item_check label="Ordner immer nach Namen" name="Folders Always By Name"/>
-			<menu_item_check label="Systemordner nach oben" name="System Folders To Top"/>
-		</menu>
-	</menu_bar>
 	<filter_editor label="Inventar filtern" name="inventory search editor"/>
 	<tab_container name="inventory filter tabs">
 		<inventory_panel label="MEIN INVENTAR" name="All Items"/>
-		<inventory_panel label="AKTUELL" name="Recent Items"/>
+		<recent_inventory_panel label="AKTUELL" name="Recent Items"/>
 	</tab_container>
-	<panel name="bottom_panel">
-		<button name="options_gear_btn" tool_tip="Zusätzliche Optionen anzeigen"/>
-		<button name="add_btn" tool_tip="Neues Objekt hinzufügen"/>
-		<dnd_button name="trash_btn" tool_tip="Auswahl löschen"/>
-	</panel>
+	<layout_stack name="bottom_panel">
+		<layout_panel name="options_gear_btn_panel">
+			<button name="options_gear_btn" tool_tip="Zusätzliche Optionen anzeigen"/>
+		</layout_panel>
+		<layout_panel name="add_btn_panel">
+			<button name="add_btn" tool_tip="Neues Objekt hinzufügen"/>
+		</layout_panel>
+		<layout_panel name="trash_btn_panel">
+			<dnd_button name="trash_btn" tool_tip="Auswahl löschen"/>
+		</layout_panel>
+	</layout_stack>
 </panel>
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 91ba94b3d6..60f8ad2331 100644
--- a/indra/newview/skins/default/xui/de/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/de/panel_outfit_edit.xml
@@ -2,6 +2,8 @@
 <!-- Side tray Outfit Edit panel -->
 <panel label="Outfit bearbeiten" name="outfit_edit">
 	<string name="No Outfit" value="Kein Outfit"/>
+	<string name="unsaved_changes" value="Ungespeicherte Änderungen"/>
+	<string name="now_editing" value="Wird bearbeitet"/>
 	<panel.string name="not_available">
 		k.A.
 	</panel.string>
diff --git a/indra/newview/skins/default/xui/de/panel_people.xml b/indra/newview/skins/default/xui/de/panel_people.xml
index 59cc3a8b70..6db4cf76f1 100644
--- a/indra/newview/skins/default/xui/de/panel_people.xml
+++ b/indra/newview/skins/default/xui/de/panel_people.xml
@@ -2,9 +2,9 @@
 <!-- Side tray panel -->
 <panel label="Leute" name="people_panel">
 	<string name="no_recent_people" value="Hier sind keine Leute. Sie suchen nach Leuten? Verwenden Sie die [secondlife:///app/search/people Suche] oder die [secondlife:///app/worldmap Karte]."/>
-	<string name="no_filtered_recent_people" value="Sie haben nicht das Richtige gefunden? Versuchen Sie es mit der [secondlife:///app/search/people Suche]."/>
+	<string name="no_filtered_recent_people" value="Sie haben nicht das Richtige gefunden? Versuchen Sie es mit der [secondlife:///app/search/people/[SEARCH_TERM] Suche]."/>
 	<string name="no_one_near" value="Es ist niemand in der Nähe. Sie suchen nach Leuten? Verwenden Sie die [secondlife:///app/search/people Suche] oder die [secondlife:///app/worldmap Karte]."/>
-	<string name="no_one_filtered_near" value="Sie haben nicht das Richtige gefunden? Versuchen Sie es mit der [secondlife:///app/search/people Suche]."/>
+	<string name="no_one_filtered_near" value="Sie haben nicht das Richtige gefunden? Versuchen Sie es mit der [secondlife:///app/search/people/[SEARCH_TERM] Suche]."/>
 	<string name="no_friends_online" value="Keine Freunde online"/>
 	<string name="no_friends" value="Keine Freunde"/>
 	<string name="no_friends_msg">
@@ -12,11 +12,11 @@
 Sie suchen nach Leuten? Verwenden Sie die [secondlife:///app/worldmap Karte].
 	</string>
 	<string name="no_filtered_friends_msg">
-		Sie haben nicht das Richtige gefunden? Versuchen Sie es mit der [secondlife:///app/search/people Suche].
+		Sie haben nicht das Richtige gefunden? Versuchen Sie es mit der [secondlife:///app/search/people/[SEARCH_TERM] Suche].
 	</string>
 	<string name="people_filter_label" value="Nach Leuten filtern"/>
 	<string name="groups_filter_label" value="Nach Gruppen filtern"/>
-	<string name="no_filtered_groups_msg" value="Sie haben nicht das Richtige gefunden? Versuchen Sie es mit der [secondlife:///app/search/groups Suche]."/>
+	<string name="no_filtered_groups_msg" value="Sie haben nicht das Richtige gefunden? Versuchen Sie es mit der [secondlife:///app/search/groups/[SEARCH_TERM] Suche]."/>
 	<string name="no_groups_msg" value="Suchen Sie nach Gruppen? Versuchen Sie es mit der [secondlife:///app/search/groups Suche]."/>
 	<filter_editor label="Filter" name="filter_input"/>
 	<tab_container name="tabs">
@@ -55,7 +55,7 @@ Sie suchen nach Leuten? Verwenden Sie die [secondlife:///app/worldmap Karte].
 		<button label="Profil" name="view_profile_btn" tool_tip="Bilder, Gruppen und andere Einwohner-Informationen anzeigen"/>
 		<button label="IM" name="im_btn" tool_tip="Instant Messenger öffnen"/>
 		<button label="Anrufen" name="call_btn" tool_tip="Diesen Einwohner anrufen"/>
-		<button label="Teilen" name="share_btn"/>
+		<button label="Teilen" name="share_btn" tool_tip="Inventarobjekt teilen"/>
 		<button label="Teleportieren" name="teleport_btn" tool_tip="Teleport anbieten"/>
 		<button label="Gruppenprofil" name="group_info_btn" tool_tip="Gruppeninformationen anzeigen"/>
 		<button label="Gruppen-Chat" name="chat_btn" tool_tip="Chat öffnen"/>
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 52e616a402..7b6918ae24 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml
@@ -13,7 +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 initial_value="true" label="Seitenleiste" name="appearance_sidebar_positioning" tool_tip="Automatische Kameraposition für Seitenleiste verwenden"/>
 	<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_preferences_chat.xml b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
index bf150daf87..5c91b34a21 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
@@ -45,7 +45,7 @@
 	</text>
 	<check_box initial_value="true" label="Beim Chatten Tippanimation abspielen" name="play_typing_animation"/>
 	<check_box label="IMs per Email zuschicken, wenn ich offline bin" name="send_im_to_email"/>
-	<check_box label="Kompakten Text-Chatverlauf aktivieren" name="plain_text_chat_history"/>
+	<check_box label="Kompakten IM- und Text-Chatverlauf aktivieren" name="plain_text_chat_history"/>
 	<text name="show_ims_in_label">
 		IMs anzeigen in:
 	</text>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
index 16b4598486..879262df9b 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
@@ -1,19 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Grafik" name="Display panel">
-	<text name="WindowSizeLabel">
-		Fenstergröße:
-	</text>
-	<check_box label="Vollbildmodus verwenden" name="windowed mode"/>
-	<combo_box left="115" name="windowsize combo">
-		<combo_box.item label="640x480" name="640x480"/>
-		<combo_box.item label="800x600" name="800x600"/>
-		<combo_box.item label="720x480 (NTSC)" name="720x480"/>
-		<combo_box.item label="768x576 (PAL)" name="768x576"/>
-		<combo_box.item label="1024x768" name="1024x768"/>
-	</combo_box>
-	<text name="UI Size:">
-		UI-Größe:
-	</text>
 	<text name="QualitySpeed">
 		Qualität und Geschwindigkeit:
 	</text>
@@ -63,6 +49,10 @@
 			m
 		</text>
 		<slider label="Max. Partikelzahl:" name="MaxParticleCount"/>
+		<slider label="Max. Avatarsichtweite:" name="MaxAvatarDrawDistance"/>
+		<text name="DrawDistanceMeterText3">
+			m
+		</text>
 		<slider label="Post-Processing-Qualität:" name="RenderPostProcess"/>
 		<text name="MeshDetailText">
 			Gitterdetails:
@@ -98,8 +88,8 @@
 			Beleuchtungsdetails:
 		</text>
 		<radio_group name="LightingDetailRadio">
-			<radio_item label="Nur Sonne und Mond" name="SunMoon"/>
-			<radio_item label="Lokale Lichtquellen" name="LocalLights"/>
+			<radio_item label="Nur Sonne und Mond" name="SunMoon" value="0"/>
+			<radio_item label="Lokale Lichtquellen" name="LocalLights" value="1"/>
 		</radio_group>
 		<text name="TerrainDetailText">
 			Terraindetails:
diff --git a/indra/newview/skins/default/xui/de/sidepanel_appearance.xml b/indra/newview/skins/default/xui/de/sidepanel_appearance.xml
index 7a280bd7ff..f8e3db341a 100644
--- a/indra/newview/skins/default/xui/de/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/de/sidepanel_appearance.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Outfits" name="appearance panel">
 	<string name="No Outfit" value="Kein Outfit"/>
+	<string name="Unsaved Changes" value="Ungespeicherte Änderungen"/>
+	<string name="Now Wearing" value="Aktuelles Outfit..."/>
 	<panel name="panel_currentlook">
-		<button label="Bearbeiten" name="editappearance_btn"/>
-		<text name="currentlook_title">
-			(nicht gespeichert)
+		<button label="B" name="editappearance_btn"/>
+		<button label="Ö" name="openoutfit_btn"/>
+		<text name="currentlook_status">
+			(Status)
 		</text>
 		<text name="currentlook_name">
 			MyOutfit With a really Long Name like MOOSE
 		</text>
 	</panel>
 	<filter_editor label="Outfits filtern" name="Filter"/>
-	<button label="Anziehen" name="wear_btn"/>
-	<button label="Neues Outfit" name="newlook_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/sidepanel_inventory.xml b/indra/newview/skins/default/xui/de/sidepanel_inventory.xml
index 96dd181854..f9bf2fe081 100644
--- a/indra/newview/skins/default/xui/de/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/de/sidepanel_inventory.xml
@@ -4,7 +4,7 @@
 		<panel name="button_panel">
 			<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="Einkaufen" 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" tool_tip="Zu ausgewähltem Standort teleportieren"/>
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index bc4f20df26..f5882adb79 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -100,9 +100,21 @@
 	<string name="LoginDownloadingClothing">
 		Kleidung wird geladen...
 	</string>
+	<string name="InvalidCertificate">
+		Der Server hat ein ungültiges oder korruptes Zertifikate zurückgegeben. Bitte kontaktieren Sie den Grid-Administrator.
+	</string>
+	<string name="CertInvalidHostname">
+		Ein ungültiger Hostname wurde verwendet, um auf den Server zuzugreifen. Bitte überprüfen Sie Ihre SLURL oder den Grid-Hostnamen.
+	</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="CertKeyUsage">
+		Das vom Server ausgegebene Zertifikat konnte nicht für SSL verwendet werden.  Bitte kontaktieren Sie Ihren Grid-Administrator.
+	</string>
+	<string name="CertBasicConstraints">
+		In der Zertifikatskette des Servers befanden sich zu viele Zertifikate.  Bitte 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>
@@ -852,6 +864,42 @@
 	<string name="invalid">
 		ungültig
 	</string>
+	<string name="shirt_not_worn">
+		Hemd nicht getragen
+	</string>
+	<string name="pants_not_worn">
+		Hosen nicht getragen
+	</string>
+	<string name="shoes_not_worn">
+		Schuhe nicht getragen
+	</string>
+	<string name="socks_not_worn">
+		Socken nicht getragen
+	</string>
+	<string name="jacket_not_worn">
+		Jacke nicht getragen
+	</string>
+	<string name="gloves_not_worn">
+		Handschuhe nicht getragen
+	</string>
+	<string name="undershirt_not_worn">
+		Unterhemd nicht getragen
+	</string>
+	<string name="underpants_not_worn">
+		Unterhose nicht getragen
+	</string>
+	<string name="skirt_not_worn">
+		Rock nicht getragen
+	</string>
+	<string name="alpha_not_worn">
+		Alpha nicht getragen
+	</string>
+	<string name="tattoo_not_worn">
+		Tätowierung nicht getragen
+	</string>
+	<string name="invalid_not_worn">
+		ungültig
+	</string>
 	<string name="NewWearable">
 		Neue/r/s [WEARABLE_ITEM]
 	</string>
@@ -925,7 +973,10 @@
 		ESC drücken, um zur Normalansicht zurückzukehren
 	</string>
 	<string name="InventoryNoMatchingItems">
-		Sie haben nicht das Richtige gefunden? Versuchen Sie es mit der [secondlife:///app/search/all Suche].
+		Sie haben nicht das Richtige gefunden? Versuchen Sie es mit der [secondlife:///app/search/all/[SEARCH_TERM] Suche].
+	</string>
+	<string name="PlacesNoMatchingItems">
+		Sie haben nicht das Richtige gefunden? Versuchen Sie es mit der [secondlife:///app/search/places/[SEARCH_TERM] Suche].
 	</string>
 	<string name="FavoritesNoMatchingItems">
 		Landmarke hier hin ziehen, um diese hinzuzufügen.
@@ -961,6 +1012,7 @@
 	<string name="Wave" value=" Winken"/>
 	<string name="HelloAvatar" value=" Hallo Avatar!"/>
 	<string name="ViewAllGestures" value="  Alle anzeigen &gt;&gt;"/>
+	<string name="GetMoreGestures" value="Mehr &gt;&gt;"/>
 	<string name="Animations" value=" Animationen,"/>
 	<string name="Calling Cards" value=" Visitenkarten,"/>
 	<string name="Clothing" value=" Kleidung,"/>
@@ -1579,7 +1631,7 @@
 		Der Einwohner/Die Einwohnerin ist „beschäftigt”, d.h. er/sie möchte im Moment nicht gestört werden.  Ihre Nachricht wird dem Einwohner/der Einwohnerin als IM angezeigt, und kann später beantwortet werden.
 	</string>
 	<string name="MuteByName">
-		(nach Namen)
+		(Nach Namen)
 	</string>
 	<string name="MuteAgent">
 		(Einwohner)
@@ -1590,6 +1642,9 @@
 	<string name="MuteGroup">
 		(Gruppe)
 	</string>
+	<string name="MuteExternal">
+		(Extern)
+	</string>
 	<string name="RegionNoCovenant">
 		Für diesen Grundbesitz liegt kein Vertrag vor.
 	</string>
@@ -3405,6 +3460,15 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="answered_call">
 		Ihr Anruf wurde entgegengenommen
 	</string>
+	<string name="you_started_call">
+		Sie haben einen Voice-Anruf begonnen
+	</string>
+	<string name="you_joined_call">
+		Sie sind dem Gespräch beigetreten
+	</string>
+	<string name="name_started_call">
+		[NAME] hat einen Voice-Anruf begonnen
+	</string>
 	<string name="ringing-im">
 		Verbindung wird hergestellt...
 	</string>
@@ -3617,6 +3681,57 @@ Missbrauchsbericht
 	<string name="Contents">
 		Inhalt
 	</string>
+	<string name="Gesture">
+		Gesten
+	</string>
+	<string name="Male Gestures">
+		Männliche Gesten
+	</string>
+	<string name="Female Gestures">
+		Weibliche Gesten
+	</string>
+	<string name="Other Gestures">
+		Andere Gesten
+	</string>
+	<string name="Speech Gestures">
+		Sprachgesten
+	</string>
+	<string name="Common Gestures">
+		Häufig verwendete Gesten
+	</string>
+	<string name="Male - Excuse me">
+		Männlich - Excuse me
+	</string>
+	<string name="Male - Get lost">
+		Männlich - Get lost
+	</string>
+	<string name="Male - Blow kiss">
+		Männlich - Kusshand
+	</string>
+	<string name="Male - Boo">
+		Männlich - Buh
+	</string>
+	<string name="Male - Bored">
+		Männlich - Gelangweilt
+	</string>
+	<string name="Male - Hey">
+		Männlich - Hey
+	</string>
+	<string name="Male - Laugh">
+		Männlich - Lachen
+	</string>
+	<string name="Male - Repulsed">
+		Männlich - Angewidert
+	</string>
+	<string name="Male - Shrug">
+		Männlich - Achselzucken
+	</string>
+	<string name="Male - Stick tougue out">
+		Männlich - Zunge herausstrecken
+	</string>
+	<string name="Male - Wow">
+		Männlich - Wow
+	</string>
 	<string name="Female - Excuse me">
 		Weiblich - Räuspern
 	</string>
@@ -3629,6 +3744,27 @@ Missbrauchsbericht
 	<string name="Female - Boo">
 		Weiblich  - Buh
 	</string>
+	<string name="Female - Bored">
+		Weiblich - Gelangweilt
+	</string>
+	<string name="Female - Hey">
+		Weiblich - Hey
+	</string>
+	<string name="Female - Laugh">
+		Weiblich - Lachen
+	</string>
+	<string name="Female - Repulsed">
+		Weiblich - Angewidert
+	</string>
+	<string name="Female - Shrug">
+		Weiblich - Achselzucken
+	</string>
+	<string name="Female - Stick tougue out">
+		Weiblich - Zunge herausstrecken
+	</string>
+	<string name="Female - Wow">
+		Weiblich - Wow
+	</string>
 	<string name="AvatarBirthDateFormat">
 		[mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt]
 	</string>
-- 
cgit v1.2.3


From 103849702b0fe7afaa5d6f7e175755d1ace60adc Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Thu, 24 Jun 2010 11:13:14 -0700
Subject: ND-47148 WIP DE translation for set 11, set 12 new files

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

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

diff --git a/indra/newview/skins/default/xui/de/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/de/floater_buy_currency_html.xml
new file mode 100644
index 0000000000..38d3bdd77f
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/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="WÄHRUNG KAUFEN"/>
diff --git a/indra/newview/skins/default/xui/de/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/de/panel_body_parts_list_item.xml
new file mode 100644
index 0000000000..de764d8025
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/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/de/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/de/panel_bodyparts_list_button_bar.xml
new file mode 100644
index 0000000000..4d7e65405a
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/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="Austauschen" name="switch_btn"/>
+	<button label="Einkaufen &gt;" name="bodyparts_shop_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/de/panel_clothing_list_button_bar.xml
new file mode 100644
index 0000000000..fc45c9ce79
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/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="Hinzufügen +" name="add_btn"/>
+	<button label="Einkaufen &gt;" name="clothing_shop_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/de/panel_clothing_list_item.xml
new file mode 100644
index 0000000000..de764d8025
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/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/de/panel_cof_wearables.xml b/indra/newview/skins/default/xui/de/panel_cof_wearables.xml
new file mode 100644
index 0000000000..12294a43ce
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/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="Anhänge"/>
+		<accordion_tab name="tab_clothing" title="Kleidung"/>
+		<accordion_tab name="tab_body_parts" title="Körperteile"/>
+	</accordion>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/de/panel_deletable_wearable_list_item.xml
new file mode 100644
index 0000000000..91d90a5660
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/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/de/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/de/panel_dummy_clothing_list_item.xml
new file mode 100644
index 0000000000..6af84de0c7
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/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 d42dd9a1c14bd9939644e1c87e65cac1d5b569db Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 24 Jun 2010 14:12:35 -0700
Subject: EXT-7046 FIX User profile using wrong placeholder/generic profile pic
 art

---
 indra/newview/skins/default/xui/en/floater_about_land.xml  | 1 +
 indra/newview/skins/default/xui/en/floater_buy_land.xml    | 1 +
 indra/newview/skins/default/xui/en/floater_tools.xml       | 1 +
 indra/newview/skins/default/xui/en/panel_edit_profile.xml  | 2 ++
 indra/newview/skins/default/xui/en/panel_landmark_info.xml | 3 ++-
 indra/newview/skins/default/xui/en/panel_my_profile.xml    | 1 +
 indra/newview/skins/default/xui/en/panel_place_profile.xml | 3 ++-
 indra/newview/skins/default/xui/en/panel_profile.xml       | 2 ++
 8 files changed, 12 insertions(+), 2 deletions(-)

(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 b9489895ae..14aacafa9f 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -1489,6 +1489,7 @@ Only large parcels can be listed in search.
              layout="topleft"
              left="14"
              name="snapshot_ctrl"
+             fallback_image="default_land_picture.j2c" 
              tool_tip="Click to choose a picture"
              width="195" />
             <text
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 acaa508792..0ad4fbc967 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_land.xml
@@ -380,6 +380,7 @@ supports [AMOUNT2] objects
      width="275" />
     <texture_picker
      enabled="false"
+     fallback_image="default_land_picture.j2c"
      follows="top|left"
      height="135"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 2ff832b27a..34c1b25f8c 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2298,6 +2298,7 @@ even though the user gets a free copy.
             <texture_picker
              can_apply_immediately="true"
              default_image_name="Default"
+             fallback_image="locked_image.j2c"
              follows="left|top"
              height="80"
              label="Texture"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
index dff2b9a214..3ffde20af0 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -118,6 +118,7 @@
              allow_no_texture="true"
              default_image_name="None"
              enabled="false"
+             fallback_image="default_profile_picture.j2c" 
              follows="top|left"
              height="124"
              layout="topleft"
@@ -174,6 +175,7 @@
              allow_no_texture="true"
              default_image_name="None"
              enabled="false"
+             fallback_image="Generic_Person_Large.png"
              follows="top|left"
              height="124"
              layout="topleft"
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 55fef5aaf7..a0a1e2963a 100644
--- a/indra/newview/skins/default/xui/en/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
@@ -103,7 +103,8 @@
          width="310">
             <texture_picker
              enabled="false"
-         follows="left|top|right"
+             fallback_image="default_land_picture.j2c"
+             follows="left|top|right"
              height="197"
              layout="topleft"
              left="11"
diff --git a/indra/newview/skins/default/xui/en/panel_my_profile.xml b/indra/newview/skins/default/xui/en/panel_my_profile.xml
index 841a4f5713..e657b57ab4 100644
--- a/indra/newview/skins/default/xui/en/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml
@@ -83,6 +83,7 @@
                allow_no_texture="true"
                default_image_name="None"
                enabled="false"
+               fallback_image="Generic_Person_Large.png" 
                follows="top|left"
                height="124"
                layout="topleft"
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 55e0184282..35e8075896 100644
--- a/indra/newview/skins/default/xui/en/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml
@@ -200,7 +200,8 @@
          width="310">
             <texture_picker
              enabled="false"
-         follows="left|top|right"
+             fallback_image="default_land_picture.j2c"
+             follows="left|top|right"
              height="197"
              layout="topleft"
              left="11"
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index d7a601d7a3..fc33836c79 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -83,6 +83,7 @@
                allow_no_texture="true"
                default_image_name="None"
                enabled="false"
+               fallback_image="Generic_Person_Large"
                follows="top|left"
                height="124"
                layout="topleft"
@@ -130,6 +131,7 @@
                allow_no_texture="true"
                default_image_name="None"
                enabled="false"
+               fallback_image="Generic_Person_Large"
                follows="top|left"
                height="124"
                layout="topleft"
-- 
cgit v1.2.3


From 1a98b7128ad08bafaabd3d1274059f0ae34b30a1 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 24 Jun 2010 14:13:39 -0700
Subject: EXT-7046 FIX User profile using wrong placeholder/generic profile pic
 art wrong image names

---
 indra/newview/skins/default/xui/en/panel_edit_profile.xml | 2 +-
 indra/newview/skins/default/xui/en/panel_my_profile.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/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
index 3ffde20af0..5072ec3a66 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -175,7 +175,7 @@
              allow_no_texture="true"
              default_image_name="None"
              enabled="false"
-             fallback_image="Generic_Person_Large.png"
+             fallback_image="Generic_Person_Large"
              follows="top|left"
              height="124"
              layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_my_profile.xml b/indra/newview/skins/default/xui/en/panel_my_profile.xml
index e657b57ab4..1083f4d467 100644
--- a/indra/newview/skins/default/xui/en/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml
@@ -83,7 +83,7 @@
                allow_no_texture="true"
                default_image_name="None"
                enabled="false"
-               fallback_image="Generic_Person_Large.png" 
+               fallback_image="Generic_Person_Large" 
                follows="top|left"
                height="124"
                layout="topleft"
-- 
cgit v1.2.3


From a77b0827c2189101de44801e003588881a75a79b Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Thu, 24 Jun 2010 22:52:01 +0100
Subject: fix xml glitch.

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

(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 2fbe4510e1..4998322d62 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
@@ -184,7 +184,6 @@ background_visible="true"
          top_pad="0"
    name="button_row"
    follows="bottom|left"
-   height="23"
    width="313">
    <button
     follows="bottom|left"
-- 
cgit v1.2.3


From 9f835b9bce6ac023a9f8b98cfb53015f5d416130 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Thu, 24 Jun 2010 19:03:20 -0400
Subject: EXT-7902 FIXED Corrupted context menu appears on "Add More" panel if
 both worn and not-worn items were selected

Added "no options" menu item instead of showing blank context menu.
---
 indra/newview/skins/default/xui/en/menu_wearable_list_item.xml | 6 ++++++
 1 file changed, 6 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 efea2ae3e8..23eb89e448 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
@@ -73,4 +73,10 @@
         <on_click
          function="Wearable.CreateNew" />
     </menu_item_call>
+    <menu_item_call
+     label="--no options--"
+     layout="topleft"
+     name="--no options--"
+     translate="false">
+    </menu_item_call>
 </context_menu>
-- 
cgit v1.2.3


From c6b80b47459711cc4c0b1971cb954ad6148517a0 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Thu, 24 Jun 2010 16:31:12 -0700
Subject: CT-575 WIP FR linguistic

---
 indra/newview/skins/default/xui/fr/floater_sell_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/fr/floater_sell_land.xml b/indra/newview/skins/default/xui/fr/floater_sell_land.xml
index d79726e8e2..b5ffc8f9c7 100644
--- a/indra/newview/skins/default/xui/fr/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/fr/floater_sell_land.xml
@@ -45,7 +45,7 @@
 			</combo_box>
 			<button label="Sélectionner" name="sell_to_select_agent" width="100"/>
 			<text name="sell_objects_label">
-				3. Vendez-vous les objets avec ce terrain ?
+				3. Vendre les objets avec ce terrain ?
 			</text>
 			<text name="sell_objects_text">
 				Les objets transférables se trouvant sur la parcelle changeront de propriétaire.
-- 
cgit v1.2.3


From a091e4a3f71743482bf48c095a8cc677b449aebe Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Fri, 25 Jun 2010 13:10:10 +0300
Subject: EXT-7703 FIXED Made text padding in accordion message in my outfits
 panel the same as in flat list view.

Also tuned Wearing tab a bit to match My Outfits (size/color/position).

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

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_outfits_inventory.xml | 5 +++--
 indra/newview/skins/default/xui/en/panel_outfits_list.xml      | 3 ++-
 2 files changed, 5 insertions(+), 3 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 b365540d1f..60a0095d5f 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
@@ -37,6 +37,7 @@
            width="312" />
          <panel
            background_visible="true"
+           bg_alpha_color="DkGray"
            class="panel_wearing"
            follows="all"
            height="490"          
@@ -50,13 +51,13 @@
              follows="all"
              height="490"
              keep_one_selected="true"
-             left="1"
+             left="3"
              multi_select="true"
              name="cof_items_list"
              standalone="false"
              top="0"
              translate="false"
-             width="310"
+             width="307"
              worn_indication_enabled="false"
             />
          </panel>
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 d0c44c4328..aea4e939df 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_list.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_list.xml
@@ -9,12 +9,13 @@
    layout="topleft"
    left="0"
    top="0"
-   width="313">
+   width="312">
     <accordion
      background_visible="true"
      bg_alpha_color="DkGray2"
      bg_opaque_color="DkGray2"
      no_matched_tabs_text.value="Didn't find what you're looking for? Try [secondlife:///app/search/all/[SEARCH_TERM] Search]."
+     no_matched_tabs_text.v_pad="10"
      no_visible_tabs_text.value="There are no any outfits. Try [secondlife:///app/search/all/ Search]."
      follows="all"
      height="400"
-- 
cgit v1.2.3


From 66ce337a321ce274520e3c18a1c0af3ad5bd2475 Mon Sep 17 00:00:00 2001
From: Andrew Polunin <apolunin@productengine.com>
Date: Fri, 25 Jun 2010 15:10:43 +0300
Subject: EXT-7914 FIXED (Update context menu for worn clothing in the Edit
 Outfit panel)

- Removed the following menu items: Move Up a Layer, Move Down a Layer.
- Added 'Replace' menu item.
- Implemented method replaceWearable() - handler for the 'Replace' menu item.

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

--HG--
branch : product-engine
---
 .../skins/default/xui/en/menu_cof_clothing.xml     | 26 +++++++---------------
 1 file changed, 8 insertions(+), 18 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_cof_clothing.xml b/indra/newview/skins/default/xui/en/menu_cof_clothing.xml
index 12ee9b045b..206d49e8c7 100644
--- a/indra/newview/skins/default/xui/en/menu_cof_clothing.xml
+++ b/indra/newview/skins/default/xui/en/menu_cof_clothing.xml
@@ -13,34 +13,24 @@
          parameter="take_off" />
     </menu_item_call>
     <menu_item_call
-     label="Move Up a Layer"
-     layout="topleft"
-     name="move_up">
-        <on_click
-         function="Clothing.MoveUp" />
-        <on_enable
-         function="Clothing.OnEnable"
-         parameter="move_up" />
-    </menu_item_call>
-    <menu_item_call
-     label="Move Down a Layer"
+     label="Edit"
      layout="topleft"
-     name="move_down">
+     name="edit">
         <on_click
-         function="Clothing.MoveDown" />
+         function="Clothing.Edit" />
         <on_enable
          function="Clothing.OnEnable"
-         parameter="move_down" />
+         parameter="edit" />
     </menu_item_call>
     <menu_item_call
-     label="Edit"
+     label="Replace"
      layout="topleft"
-     name="edit">
+     name="replace">
         <on_click
-         function="Clothing.Edit" />
+         function="Clothing.Replace" />
         <on_enable
          function="Clothing.OnEnable"
-         parameter="edit" />
+         parameter="replace" />
     </menu_item_call>
     <menu_item_call
      label="Create New"
-- 
cgit v1.2.3


From 9bc4e69c913225aa57b6f2009dd1f7cb65afddbc Mon Sep 17 00:00:00 2001
From: Andrew Polunin <apolunin@productengine.com>
Date: Fri, 25 Jun 2010 17:00:45 +0300
Subject: EXT-7972 FIXED (My Outfits: Add \"Add to current outfit\" menu item
 into gear menu)

- Added menu item 'Wear - Add to Current Outfit' (menu_outfit_gear.xml).
- Added menu item handler onAdd().

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

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

(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..c4c7a5034a 100644
--- a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
@@ -15,6 +15,16 @@
          function="Gear.OnVisible"
          parameter="wear" />
     </menu_item_call>
+    <menu_item_call
+     label="Wear - Add to Current Outfit"
+     layout="topleft"
+     name="wear_add">
+        <on_click
+         function="Gear.WearAdd" />
+        <on_enable
+         function="Gear.OnEnable"
+         parameter="wear_add" />
+    </menu_item_call>
     <menu_item_call
      label="Take Off - Remove from Current Outfit"
      layout="topleft"
-- 
cgit v1.2.3


From 6ad6e7fd6164e321e0c919e8d5a29f0e67795661 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Fri, 25 Jun 2010 11:33:46 -0700
Subject: EXT-7887 FIX mark URL string as non-translatable

---
 indra/newview/skins/default/xui/en/strings.xml | 3 ++-
 1 file changed, 2 insertions(+), 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 e30c081ba1..799d440292 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -136,7 +136,8 @@
 	<string name="RetrievingData">Retrieving...</string>
 
 	<string name="ReleaseNotes">Release Notes</string>
-	<string name="RELEASE_NOTES_BASE_URL">http://wiki.secondlife.com/wiki/Release_Notes/</string>
+	<!-- Always mark translate="false" for strings that are nothing but URLs, as they don't need translation. -->
+	<string name="RELEASE_NOTES_BASE_URL" translate="false">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 5226f23144df0893bd000a56b2378fda26488bc3 Mon Sep 17 00:00:00 2001
From: Richard Nelson <none@none>
Date: Fri, 25 Jun 2010 11:48:26 -0700
Subject: removed some parsing error spam due to invalid attributes

---
 .../skins/default/xui/en/floater_nearby_chat.xml   | 34 ++++++++++------------
 .../skins/default/xui/en/outfit_accordion_tab.xml  |  2 +-
 2 files changed, 17 insertions(+), 19 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
index 28616d503b..ec097a8e87 100644
--- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
  border_visible="false"
- border_drop_shadow_visible="false"
- drop_shadow_visible="false"
  border="false"
  bg_opaque_image="Window_Foreground" 
  bg_alpha_image="Window_Background" 
@@ -26,20 +24,20 @@
  save_visibility="true"
  single_instance="true"
  width="320">
-            <chat_history
-             allow_html="true"
-             bg_readonly_color="ChatHistoryBgColor"
-             bg_writeable_color="ChatHistoryBgColor"
-             follows="all"
-	     left="5"
-             top="20"
-             layout="topleft"
-	     height="275"
-             name="chat_history"
-             parse_highlights="true"
-             text_color="ChatHistoryTextColor"
-             text_readonly_color="ChatHistoryTextColor"
-             right_widget_pad="5"
-             left_widget_pad="0"
-             width="315" />
+  <chat_history
+    allow_html="true"
+    bg_readonly_color="ChatHistoryBgColor"
+    bg_writeable_color="ChatHistoryBgColor"
+    follows="all"
+    left="5"
+    top="20"
+    layout="topleft"
+    height="275"
+    name="chat_history"
+    parse_highlights="true"
+    text_color="ChatHistoryTextColor"
+    text_readonly_color="ChatHistoryTextColor"
+    right_widget_pad="5"
+    left_widget_pad="0"
+    width="315" />
 </floater>
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 bdfa928b1d..06bd1e9ff4 100644
--- a/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml
+++ b/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml
@@ -3,7 +3,7 @@
 <!-- All accordion tabs in the My Appearance/My Outfits panel will be created from this one at runtime-->
 <!-- Non of string values of controls below are visible to user. They are not need to be translated. -->
 <accordion_tab
- display_children="false"
+ expanded="false"
  follows="all"
  height="45"
  layout="topleft"
-- 
cgit v1.2.3


From c2e536480ec9579b263f1cb67c38fd3f4d661e3a Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Fri, 25 Jun 2010 12:04:48 -0700
Subject: ND-47583 WIP DE translation for set 13

---
 indra/newview/skins/default/xui/de/floater_map.xml |  3 +
 .../default/xui/de/floater_preview_gesture.xml     | 12 +--
 .../skins/default/xui/de/floater_snapshot.xml      | 86 +++++++++++++++++-----
 .../skins/default/xui/de/floater_voice_effect.xml  | 15 ++--
 .../skins/default/xui/de/menu_attachment_self.xml  |  4 +-
 .../skins/default/xui/de/menu_outfit_tab.xml       |  2 +-
 indra/newview/skins/default/xui/de/menu_viewer.xml |  1 +
 .../default/xui/de/menu_wearable_list_item.xml     |  2 +-
 .../newview/skins/default/xui/de/notifications.xml |  3 +-
 .../default/xui/de/panel_body_parts_list_item.xml  |  4 +
 .../default/xui/de/panel_clothing_list_item.xml    |  5 ++
 .../xui/de/panel_deletable_wearable_list_item.xml  |  1 +
 .../xui/de/panel_dummy_clothing_list_item.xml      |  3 +
 .../skins/default/xui/de/panel_edit_wearable.xml   |  3 +-
 .../skins/default/xui/de/panel_outfit_edit.xml     |  8 +-
 .../default/xui/de/panel_outfits_inventory.xml     |  2 +-
 .../default/xui/de/panel_preferences_graphics1.xml |  5 +-
 .../skins/default/xui/de/panel_voice_effect.xml    |  4 +-
 .../skins/default/xui/de/sidepanel_appearance.xml  |  2 +
 indra/newview/skins/default/xui/de/strings.xml     |  6 ++
 20 files changed, 125 insertions(+), 46 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/de/floater_map.xml b/indra/newview/skins/default/xui/de/floater_map.xml
index 130d3062d7..d4358fa8e9 100644
--- a/indra/newview/skins/default/xui/de/floater_map.xml
+++ b/indra/newview/skins/default/xui/de/floater_map.xml
@@ -27,6 +27,9 @@
 	<floater.string name="ToolTipMsg">
 		[AGENT][REGION](Karte mit Doppelklick öffnen)
 	</floater.string>
+	<floater.string name="mini_map_caption">
+		MINI-KARTE
+	</floater.string>
 	<text label="N" name="floater_map_north" text="N">
 		N
 	</text>
diff --git a/indra/newview/skins/default/xui/de/floater_preview_gesture.xml b/indra/newview/skins/default/xui/de/floater_preview_gesture.xml
index 48b1f1170c..3a036fc441 100644
--- a/indra/newview/skins/default/xui/de/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/de/floater_preview_gesture.xml
@@ -24,9 +24,6 @@
 	<floater.string name="Title">
 		Gesten: [NAME]
 	</floater.string>
-	<text name="name_text">
-		Name:
-	</text>
 	<text name="desc_label">
 		Beschreibung:
 	</text>
@@ -36,7 +33,7 @@
 	<text name="replace_text" tool_tip="Ersetzt den Auslösertext mit diesem Text. Wenn Sie zum Beispiel den Auslöser „hallo“ durch „wie geht&apos;s“ ersetzen, erscheint im Chat anstelle von „Ich wollte nur hallo sagen“ der Text „Ich wollte nur wie geht&apos;s sagen“ und die zugehörige Geste wird abgespielt.">
 		Ersetzen mit:
 	</text>
-	<line_editor name="replace_editor" tool_tip="Ersetzt den Auslösertext mit diesem Text. Wenn Sie zum Beispiel den Auslöser „hallo“ durch „wie geht&apos;s“ ersetzen, erscheint im Chat anstelle von „Ich wollte nur hallo sagen“ der Text „Ich wollte nur wie geht&apos;s sagen“ und die zugehörige Geste wird abgespielt." left_delta="94" width="160"/>
+	<line_editor left_delta="94" name="replace_editor" tool_tip="Ersetzt den Auslösertext mit diesem Text. Wenn Sie zum Beispiel den Auslöser „hallo“ durch „wie geht&apos;s“ ersetzen, erscheint im Chat anstelle von „Ich wollte nur hallo sagen“ der Text „Ich wollte nur wie geht&apos;s sagen“ und die zugehörige Geste wird abgespielt." width="160"/>
 	<text name="key_label">
 		Tastenkürzel:
 	</text>
@@ -46,19 +43,22 @@
 		Bibliothek:
 	</text>
 	<scroll_list name="library_list" width="166"/>
-	<button label="Hinzufügen &gt;&gt;" name="add_btn" left_pad="6" width="94"/>
+	<button label="Hinzufügen &gt;&gt;" left_pad="6" name="add_btn" width="94"/>
 	<text name="steps_label">
 		Schritte:
 	</text>
 	<button label="Nach oben" name="up_btn"/>
 	<button label="Nach unten" name="down_btn"/>
 	<button label="Entfernen" name="delete_btn"/>
+	<text name="options_text">
+		(Optionen)
+	</text>
 	<radio_group name="animation_trigger_type">
 		<radio_item label="Start" name="start"/>
 		<radio_item label="Stopp" name="stop"/>
 	</radio_group>
 	<check_box label="bis alle Animationen beendet sind" name="wait_anim_check"/>
-	<check_box label="Zeit in Sekunden" name="wait_time_check"/>
+	<check_box label="Zeit in Sekunden:" name="wait_time_check"/>
 	<text name="help_label">
 		Alle Schritte werden gleichzeitig ausgeführt, wenn keine Pausen hinzugefügt wurden.
 	</text>
diff --git a/indra/newview/skins/default/xui/de/floater_snapshot.xml b/indra/newview/skins/default/xui/de/floater_snapshot.xml
index a656ffb894..c014b8e040 100644
--- a/indra/newview/skins/default/xui/de/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/de/floater_snapshot.xml
@@ -1,23 +1,75 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Snapshot" title="Foto">
+<floater name="Snapshot" title="FOTO-ANZEIGE">
 	<floater.string name="unknown">
 		unbekannt
 	</floater.string>
+	<radio_group label="Fototyp" name="snapshot_type_radio">
+		<radio_item label="Email" name="postcard"/>
+		<radio_item label="Mein Inventar ([AMOUNT] L$)" name="texture"/>
+		<radio_item label="Auf meinem Computer speichern" name="local"/>
+	</radio_group>
+	<text name="file_size_label">
+		[SIZE] KB
+	</text>
 	<button label="Foto aktualisieren" name="new_snapshot_btn"/>
-	<line_editor label="Beschreibung" name="description"/>
-	<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>
+	<button label="Senden" name="send_btn"/>
+	<button label="Speichern ([AMOUNT] L$)" name="upload_btn"/>
+	<flyout_button label="Speichern" name="save_btn" tool_tip="Bild als Datei speichern">
+		<flyout_button.item label="Speichern" name="save_item"/>
+		<flyout_button.item label="Speichern unter..." name="saveas_item"/>
+	</flyout_button>
+	<button label="Mehr" name="more_btn" tool_tip="Erweiterte Optionen"/>
+	<button label="Weniger" name="less_btn" tool_tip="Erweiterte Optionen"/>
+	<button label="Abbrechen" name="discard_btn"/>
+	<text name="type_label2">
+		Größe
+	</text>
+	<text name="format_label">
+		Format
+	</text>
+	<combo_box label="Auflösung" name="postcard_size_combo">
+		<combo_box.item label="Aktuelles Fenster" name="CurrentWindow"/>
+		<combo_box.item label="640x480" name="640x480"/>
+		<combo_box.item label="800x600" name="800x600"/>
+		<combo_box.item label="1024x768" name="1024x768"/>
+		<combo_box.item label="Benutzerdefiniert" name="Custom"/>
+	</combo_box>
+	<combo_box label="Auflösung" name="texture_size_combo">
+		<combo_box.item label="Aktuelles Fenster" name="CurrentWindow"/>
+		<combo_box.item label="Klein (128x128)" name="Small(128x128)"/>
+		<combo_box.item label="Mittel (256x256)" name="Medium(256x256)"/>
+		<combo_box.item label="Groß (512x512)" name="Large(512x512)"/>
+		<combo_box.item label="Benutzerdefiniert" name="Custom"/>
+	</combo_box>
+	<combo_box label="Auflösung" name="local_size_combo">
+		<combo_box.item label="Aktuelles Fenster" name="CurrentWindow"/>
+		<combo_box.item label="320x240" name="320x240"/>
+		<combo_box.item label="640x480" name="640x480"/>
+		<combo_box.item label="800x600" name="800x600"/>
+		<combo_box.item label="1024x768" name="1024x768"/>
+		<combo_box.item label="1280x1024" name="1280x1024"/>
+		<combo_box.item label="1600x1200" name="1600x1200"/>
+		<combo_box.item label="Benutzerdefiniert" name="Custom"/>
+	</combo_box>
+	<combo_box label="Format" name="local_format_combo">
+		<combo_box.item label="PNG" name="PNG"/>
+		<combo_box.item label="JPEG" name="JPEG"/>
+		<combo_box.item label="BMP" name="BMP"/>
+	</combo_box>
+	<spinner label="Breite" name="snapshot_width"/>
+	<spinner label="Größe" name="snapshot_height"/>
+	<check_box label="Seitenverhältnis beibehalten" name="keep_aspect_check"/>
+	<slider label="Bildqualität" name="image_quality_slider"/>
+	<text name="layer_type_label">
+		Aufnehmen:
+	</text>
+	<combo_box label="Bildlayer" name="layer_types">
+		<combo_box.item label="Farben" name="Colors"/>
+		<combo_box.item label="Tiefe" name="Depth"/>
+	</combo_box>
+	<check_box label="Schnittstelle" name="ui_check"/>
+	<check_box label="HUDs" name="hud_check"/>
+	<check_box label="Nach dem Speichern offen lassen" name="keep_open_check"/>
+	<check_box label="Frame einfrieren (Vollbild)" name="freeze_frame_check"/>
+	<check_box label="Automatisch aktualisieren" name="auto_snapshot_check"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_voice_effect.xml b/indra/newview/skins/default/xui/de/floater_voice_effect.xml
index 8de0133ead..21d49a32fe 100644
--- a/indra/newview/skins/default/xui/de/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/de/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Orte" name="voice_effects" title="VOICE-MORPHING AUSPROBIEREN">
+<floater label="Orte" name="voice_effects" title="VOICE MORPHING">
 	<string name="no_voice_effect">
 		(Kein Voice-Morphing)
 	</string>
@@ -12,18 +12,19 @@
 	<string name="new_voice_effect">
 		(Neu!)
 	</string>
+	<text name="preview_text">
+		Zur Vorschau
+	</text>
 	<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.
+		Nehmen Sie Ihre Stimme auf, klicken Sie dann auf einen Effekt, um den Effekt auf Ihre Stimme anzuwenden.
 	</text>
-	<button label="Aufnahme" name="record_btn" tool_tip="Nehmen Sie Ihre Stimme auf."/>
+	<button label="Aufnehmen" 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]
+		[[URL] Jetzt 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="Bezeichnung" name="name"/>
 		<scroll_list.columns label="Gültig bis" name="expires"/>
 	</scroll_list>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/menu_attachment_self.xml b/indra/newview/skins/default/xui/de/menu_attachment_self.xml
index 85fc9ab74f..a47c633d57 100644
--- a/indra/newview/skins/default/xui/de/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/de/menu_attachment_self.xml
@@ -3,11 +3,13 @@
 	<menu_item_call label="Berühren" name="Attachment Object Touch"/>
 	<menu_item_call label="Bearbeiten" name="Edit..."/>
 	<menu_item_call label="Abnehmen" name="Detach"/>
-	<menu_item_call label="Fallen lassen" name="Drop"/>
 	<menu_item_call label="Aufstehen" name="Stand Up"/>
 	<menu_item_call label="Outfit ändern" name="Change Outfit"/>
+	<menu_item_call label="Mein Outfit bearbeiten" name="Edit Outfit"/>
+	<menu_item_call label="Meine Form bearbeiten" name="Edit My Shape"/>
 	<menu_item_call label="Meine Freunde" name="Friends..."/>
 	<menu_item_call label="Meine Gruppen" name="Groups..."/>
 	<menu_item_call label="Mein Profil" name="Profile..."/>
 	<menu_item_call label="Fehler in Texturen beseitigen" name="Debug..."/>
+	<menu_item_call label="Fallen lassen" name="Drop"/>
 </context_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
index 605dee9b33..32a65c96fc 100644
--- a/indra/newview/skins/default/xui/de/menu_outfit_tab.xml
+++ b/indra/newview/skins/default/xui/de/menu_outfit_tab.xml
@@ -4,6 +4,6 @@
 	<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 neu benennen" name="rename"/>
 	<menu_item_call label="Outfit löschen" name="delete"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml
index 0a2d5b472a..b9b6a8ed50 100644
--- a/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -178,6 +178,7 @@
 			<menu_item_check label="Suchen" name="Search"/>
 			<menu_item_call label="Tasten freigeben" name="Release Keys"/>
 			<menu_item_call label="UI-Größe auf Standard setzen" name="Set UI Size to Default"/>
+			<menu_item_check label="Erweitert-Menü anzeigen - veraltetet" name="Show Advanced Menu - legacy shortcut"/>
 			<menu_item_check label="Immer rennen" name="Always Run"/>
 			<menu_item_check label="Fliegen" name="Fly"/>
 			<menu_item_call label="Fenster schließen" name="Close Window"/>
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
index a4bf75a497..027a68e72e 100644
--- a/indra/newview/skins/default/xui/de/menu_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/de/menu_wearable_list_item.xml
@@ -1,6 +1,6 @@
 <?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="Ersetzen" 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"/>
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index 8380992d79..fb75f62988 100644
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -622,8 +622,7 @@ Erwartet wurde [VALIDS]
 		Datei konnte nicht kodiert werden: [FILE]
 	</notification>
 	<notification name="CorruptedProtectedDataStore">
-		Ihre geschützten Daten konnten nicht gelesen werden, aus diesem Grund werden diese zurückgesetzt.
-   Dies kann passieren, wenn Sie die Netzwerkeinstellungen ändern.
+		Wir können Ihren Benutzernamen und Ihr Kennwort nicht automatisch ausfüllen.  Dies kann passieren, wenn Sie die Netzwerkeinstellungen ändern.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="CorruptResourceFile">
diff --git a/indra/newview/skins/default/xui/de/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/de/panel_body_parts_list_item.xml
index de764d8025..799586f021 100644
--- a/indra/newview/skins/default/xui/de/panel_body_parts_list_item.xml
+++ b/indra/newview/skins/default/xui/de/panel_body_parts_list_item.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="wearable_item">
 	<text name="item_name" value="..."/>
+	<panel name="btn_lock" tool_tip="Ihnen fehlt die Berechtigung zum Bearbeiten."/>
+	<panel name="btn_edit_panel">
+		<button name="btn_edit" tool_tip="Diese Form bearbeiten"/>
+	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/de/panel_clothing_list_item.xml
index de764d8025..945acb02d7 100644
--- a/indra/newview/skins/default/xui/de/panel_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/de/panel_clothing_list_item.xml
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="wearable_item">
+	<button name="btn_delete" tool_tip="Von Outfit entfernen"/>
 	<text name="item_name" value="..."/>
+	<panel name="btn_lock" tool_tip="Ihnen fehlt die Berechtigung zum Bearbeiten."/>
+	<panel name="btn_edit_panel">
+		<button name="btn_edit" tool_tip="Dieses tragbare Objekt bearbeiten"/>
+	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/de/panel_deletable_wearable_list_item.xml
index 91d90a5660..a27252e23e 100644
--- a/indra/newview/skins/default/xui/de/panel_deletable_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/de/panel_deletable_wearable_list_item.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="deletable_wearable_item">
+	<button name="btn_delete" tool_tip="Von Outfit entfernen"/>
 	<text name="item_name" value="..."/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/de/panel_dummy_clothing_list_item.xml
index 6af84de0c7..b7ad1bdc1b 100644
--- a/indra/newview/skins/default/xui/de/panel_dummy_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/de/panel_dummy_clothing_list_item.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="dummy_clothing_item">
 	<text name="item_name" value="..."/>
+	<panel name="btn_add_panel">
+		<button name="btn_add" tool_tip="Weitere Artikel dieser Art hinzufügen"/>
+	</panel>
 </panel>
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 f23244e14d..faeea3a5de 100644
--- a/indra/newview/skins/default/xui/de/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/de/panel_edit_wearable.xml
@@ -90,6 +90,7 @@
 	<string name="tattoo_desc_text">
 		Tätowierung:
 	</string>
+	<labeled_back_button label="Speichern" name="back_btn" tool_tip="Zurück zu Outfit bearbeiten"/>
 	<text name="edit_wearable_title" value="Form bearbeiten"/>
 	<panel label="Hemd" name="wearable_type_panel">
 		<text name="description_text" value="Form:"/>
@@ -102,6 +103,6 @@
 	</panel>
 	<panel name="button_panel">
 		<button label="Speichern unter" name="save_as_button"/>
-		<button label="Zurücksetzen" name="revert_button"/>
+		<button label="Änderungen rückgängig machen" name="revert_button"/>
 	</panel>
 </panel>
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 60f8ad2331..00a79e6bb3 100644
--- a/indra/newview/skins/default/xui/de/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/de/panel_outfit_edit.xml
@@ -13,7 +13,9 @@
 	<string name="Filter.All" value="Alle"/>
 	<string name="Filter.Clothes/Body" value="Kleider/Körper"/>
 	<string name="Filter.Objects" value="Objekte"/>
-	<string name="Filter.Custom" value="Benutzerspezifischer Filter"/>
+	<string name="Filter.Clothing" value="Kleidung"/>
+	<string name="Filter.Bodyparts" value="Körperteile"/>
+	<string name="replace_body_part" value="Klicken, um Ihre aktuelle Form zu ersetzen"/>
 	<text name="title" value="Outfit bearbeiten"/>
 	<panel label="bottom_panel" name="header_panel">
 		<panel label="bottom_panel" name="outfit_name_and_status">
@@ -25,7 +27,7 @@
 		<layout_panel label="IM Steuerkonsole" name="outfit_wearables_panel">
 			<layout_stack name="filter_panels">
 				<layout_panel name="add_button_and_combobox">
-					<button label="Mehr hinzufügen" name="show_add_wearables_btn"/>
+					<button label="Mehr hinzufügen" name="show_add_wearables_btn" tool_tip="Öffnen/Schließen"/>
 				</layout_panel>
 				<layout_panel name="filter_panel">
 					<filter_editor label="Tragbare Inventarobjekte filtern" name="look_item_filter"/>
@@ -36,6 +38,6 @@
 	</layout_stack>
 	<panel name="save_revert_button_bar">
 		<button label="Speichern" name="save_btn"/>
-		<button label="Zurücksetzen" name="revert_btn"/>
+		<button label="Änderungen rückgängig machen" name="revert_btn" tool_tip="Zur zuletzt gespeicherten Version zurücksetzen"/>
 	</panel>
 </panel>
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 8b04cecd68..852efe41d7 100644
--- a/indra/newview/skins/default/xui/de/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/de/panel_outfits_inventory.xml
@@ -6,7 +6,7 @@
 	</tab_container>
 	<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"/>
+		<dnd_button name="trash_btn" tool_tip="Ausgewähltes Outfit löschen"/>
 		<button label="Speichern unter" name="save_btn"/>
 		<button label="Anziehen" name="wear_btn" tool_tip="Ausgewähltes Outfit tragen"/>
 	</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
index 879262df9b..7077534719 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
@@ -49,10 +49,7 @@
 			m
 		</text>
 		<slider label="Max. Partikelzahl:" name="MaxParticleCount"/>
-		<slider label="Max. Avatarsichtweite:" name="MaxAvatarDrawDistance"/>
-		<text name="DrawDistanceMeterText3">
-			m
-		</text>
+		<slider label="Max. Anzahl an voll dargestellten Avataren:" name="MaxNumberAvatarDrawn"/>
 		<slider label="Post-Processing-Qualität:" name="RenderPostProcess"/>
 		<text name="MeshDetailText">
 			Gitterdetails:
diff --git a/indra/newview/skins/default/xui/de/panel_voice_effect.xml b/indra/newview/skins/default/xui/de/panel_voice_effect.xml
index 363ee013e3..533deb8597 100644
--- a/indra/newview/skins/default/xui/de/panel_voice_effect.xml
+++ b/indra/newview/skins/default/xui/de/panel_voice_effect.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_voice_effect">
 	<string name="no_voice_effect">
-		Kein Voice-Morphing
+		Voice-Morphing Aus
 	</string>
 	<string name="preview_voice_effects">
 		Voice-Morphing ausprobieren ▶
@@ -10,6 +10,6 @@
 		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.item label="Voice-Morphing Aus" name="no_voice_effect"/>
 	</combo_box>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/sidepanel_appearance.xml b/indra/newview/skins/default/xui/de/sidepanel_appearance.xml
index f8e3db341a..b43067fb95 100644
--- a/indra/newview/skins/default/xui/de/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/de/sidepanel_appearance.xml
@@ -3,6 +3,7 @@
 	<string name="No Outfit" value="Kein Outfit"/>
 	<string name="Unsaved Changes" value="Ungespeicherte Änderungen"/>
 	<string name="Now Wearing" value="Aktuelles Outfit..."/>
+	<string name="Changing outfits" value="Outfits ändern"/>
 	<panel name="panel_currentlook">
 		<button label="B" name="editappearance_btn"/>
 		<button label="Ö" name="openoutfit_btn"/>
@@ -12,6 +13,7 @@
 		<text name="currentlook_name">
 			MyOutfit With a really Long Name like MOOSE
 		</text>
+		<button label="" name="edit_outfit_btn" tool_tip="Diese Outfit bearbeiten"/>
 	</panel>
 	<filter_editor label="Outfits filtern" name="Filter"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index f5882adb79..67b7d6c1d2 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -309,6 +309,9 @@
 	<string name="ReleaseNotes">
 		Versionshinweise
 	</string>
+	<string name="RELEASE_NOTES_BASE_URL">
+		http://wiki.secondlife.com/wiki/Release_Notes/
+	</string>
 	<string name="LoadingData">
 		Wird geladen...
 	</string>
@@ -864,6 +867,9 @@
 	<string name="invalid">
 		ungültig
 	</string>
+	<string name="none">
+		keine
+	</string>
 	<string name="shirt_not_worn">
 		Hemd nicht getragen
 	</string>
-- 
cgit v1.2.3


From aa208257dc7ed9760732429484f31fcdf7aa5975 Mon Sep 17 00:00:00 2001
From: Eli Linden <eli@lindenlab.com>
Date: Fri, 25 Jun 2010 12:04:55 -0700
Subject: ND-47583 WIP DE translation for set 13

---
 indra/newview/skins/default/xui/de/menu_topinfobar.xml   | 7 +++++++
 indra/newview/skins/default/xui/de/menu_wearing_gear.xml | 4 ++++
 indra/newview/skins/default/xui/de/menu_wearing_tab.xml  | 4 ++++
 3 files changed, 15 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/de/menu_topinfobar.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_wearing_gear.xml
 create mode 100644 indra/newview/skins/default/xui/de/menu_wearing_tab.xml

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

diff --git a/indra/newview/skins/default/xui/de/menu_topinfobar.xml b/indra/newview/skins/default/xui/de/menu_topinfobar.xml
new file mode 100644
index 0000000000..5b0a724244
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_topinfobar.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="menu_topinfobar">
+	<menu_item_check label="Koordinaten anzeigen" name="Show Coordinates"/>
+	<menu_item_check label="Parzellen-Eigenschaften anzeigen" name="Show Parcel Properties"/>
+	<menu_item_call label="Landmarke" name="Landmark"/>
+	<menu_item_call label="Kopieren" name="Copy"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/de/menu_wearing_gear.xml b/indra/newview/skins/default/xui/de/menu_wearing_gear.xml
new file mode 100644
index 0000000000..d994571f01
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_wearing_gear.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="Gear Wearing">
+	<menu_item_call label="Outfit bearbeiten" name="edit"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/de/menu_wearing_tab.xml b/indra/newview/skins/default/xui/de/menu_wearing_tab.xml
new file mode 100644
index 0000000000..d690572c8e
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_wearing_tab.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Wearing">
+	<menu_item_call label="Outfit bearbeiten" name="edit"/>
+</context_menu>
-- 
cgit v1.2.3